From d1e8328f7e5b0da0d135ee9c5b92db6d9def1295 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Mon, 15 Apr 2024 16:03:26 -0700 Subject: [PATCH] Add QualifierAlignment to Clang Format Config (#44098) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/44098 This sets `QualiferAlignment` so that code is automatically formatted to west const. I did a pass at this before, but now that we are on new Clang Format, we can enforce it automatically, and I think a couple more cases not previously changed now are. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D56143678 fbshipit-source-id: 8f12b288476ea6019fd7d7a93a39b4fe2e75af14 --- .clang-format | 1 + .../AppDelegate/RCTRootViewFactory.mm | 4 ++-- .../Image/RCTImageComponentView.mm | 6 +++--- .../RCTInputAccessoryComponentView.mm | 2 +- ...CTLegacyViewManagerInteropComponentView.mm | 4 ++-- .../RCTSafeAreaViewComponentView.mm | 4 ++-- .../ScrollView/RCTScrollViewComponentView.mm | 6 +++--- .../Text/RCTParagraphComponentView.mm | 2 +- .../TextInput/RCTTextInputComponentView.mm | 2 +- .../View/RCTViewComponentView.mm | 2 +- .../Mounting/RCTComponentViewFactory.mm | 4 ++-- .../React/Fabric/RCTSurfacePresenter.mm | 2 +- .../Text/RCTParagraphComponentViewTests.mm | 2 +- .../ReactCommon/cxxreact/MoveWrapper.h | 2 +- .../ReactCommon/cxxreact/SystraceSection.h | 2 +- .../tests/FollyDynamicMatchers.cpp | 2 +- .../tests/FollyDynamicMatchers.h | 2 +- .../ComponentDescriptorProviderRegistry.h | 2 +- ...cyViewManagerInteropComponentDescriptor.mm | 2 +- .../LegacyViewManagerInteropViewProps.h | 2 +- .../components/text/ParagraphShadowNode.h | 2 +- .../renderer/components/text/ParagraphState.h | 8 ++++---- .../components/iostextinput/TextInputProps.h | 2 +- .../components/view/BaseViewProps.cpp | 2 +- .../components/view/tests/ViewTest.cpp | 4 ++-- .../react/renderer/core/ConcreteState.h | 4 ++-- .../renderer/core/LayoutableShadowNode.cpp | 2 +- .../react/renderer/core/RawProps.cpp | 2 +- .../react/renderer/core/RawProps.h | 2 +- .../react/renderer/core/RawPropsParser.cpp | 2 +- .../react/renderer/core/RawPropsParser.h | 2 +- .../react/renderer/core/ShadowNode.cpp | 2 +- .../react/renderer/core/ShadowNode.h | 2 +- .../react/renderer/core/ShadowNodeFamily.h | 4 ++-- .../react/renderer/core/propsConversions.h | 4 ++-- .../renderer/core/tests/ShadowNodeTest.cpp | 8 ++++---- .../renderer/debug/DebugStringConvertible.h | 16 +++++++-------- .../react/renderer/debug/SystraceSection.h | 2 +- .../ReactCommon/react/renderer/dom/DOM.cpp | 4 ++-- .../renderer/element/ComponentBuilder.cpp | 2 +- .../react/renderer/element/Element.h | 8 ++++---- .../react/renderer/mounting/ShadowTree.cpp | 6 +++--- .../react/renderer/mounting/StubViewTree.cpp | 2 +- .../mounting/tests/OrderIndexTest.cpp | 2 +- .../mounting/tests/StackingContextTest.cpp | 2 +- .../tests/RuntimeSchedulerTest.cpp | 4 ++-- .../react/renderer/scheduler/Scheduler.cpp | 2 +- .../renderer/scheduler/SurfaceManager.cpp | 2 +- .../react/renderer/scheduler/SurfaceManager.h | 2 +- .../textlayoutmanager/TextLayoutContext.h | 8 ++++---- .../react/renderer/uimanager/UIManager.cpp | 20 +++++++++---------- .../react/renderer/uimanager/UIManager.h | 2 +- .../react/test_utils/shadowTreeGeneration.h | 4 ++-- .../react/utils/ContextContainer.h | 2 +- .../ReactCommon/react/utils/fnv1a.h | 2 +- 55 files changed, 100 insertions(+), 99 deletions(-) diff --git a/.clang-format b/.clang-format index a52018f3914eb4..9ed1eff12cf1f4 100644 --- a/.clang-format +++ b/.clang-format @@ -84,6 +84,7 @@ SpacesInSquareBrackets: false Standard: Cpp11 TabWidth: 8 UseTab: Never +QualifierAlignment: Left --- Language: ObjC ColumnLimit: 120 diff --git a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm index f76877a519a8c8..3c5c0389140173 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm @@ -105,8 +105,8 @@ - (instancetype)initWithConfiguration:(RCTRootViewFactoryConfiguration *)configu { if (self = [super init]) { _configuration = configuration; - _contextContainer = std::make_shared(); - _reactNativeConfig = std::make_shared(); + _contextContainer = std::make_shared(); + _reactNativeConfig = std::make_shared(); _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); _turboModuleManagerDelegate = turboModuleManagerDelegate; } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm index afbe4f822843f8..33909cf9469dc3 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm @@ -74,11 +74,11 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared & { RCTAssert(state, @"`state` must not be null."); RCTAssert( - std::dynamic_pointer_cast(state), + std::dynamic_pointer_cast(state), @"`state` must be a pointer to `ImageShadowNode::ConcreteState`."); - auto oldImageState = std::static_pointer_cast(_state); - auto newImageState = std::static_pointer_cast(state); + auto oldImageState = std::static_pointer_cast(_state); + auto newImageState = std::static_pointer_cast(state); [self _setStateAndResubscribeImageResponseObserver:newImageState]; diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm index 6ace11ce5ab012..f152dabf3b9f4a 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm @@ -120,7 +120,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & - (void)updateState:(const facebook::react::State::Shared &)state oldState:(const facebook::react::State::Shared &)oldState { - _state = std::static_pointer_cast(state); + _state = std::static_pointer_cast(state); CGSize oldScreenSize = RCTCGSizeFromSize(_state->getData().viewportSize); CGSize viewportSize = RCTViewportSize(); viewportSize.height = std::nan(""); diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm index 719d9b595f4dce..b6b55c96afa544 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm @@ -193,7 +193,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState { - _state = std::static_pointer_cast(state); + _state = std::static_pointer_cast(state); } - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask @@ -217,7 +217,7 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask if (weakSelf) { __typeof(self) strongSelf = weakSelf; const auto &eventEmitter = - static_cast(*strongSelf->_eventEmitter); + static_cast(*strongSelf->_eventEmitter); eventEmitter.dispatchEvent(eventName, event); } }; diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm index 709e378ad49d83..4c05633d8cbb04 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm @@ -63,7 +63,7 @@ - (void)_updateStateIfNecessary auto newData = oldData; newData.padding = newPadding; - return std::make_shared(newData); + return std::make_shared(newData); }); } @@ -77,7 +77,7 @@ + (ComponentDescriptorProvider)componentDescriptorProvider - (void)updateState:(const facebook::react::State::Shared &)state oldState:(const facebook::react::State::Shared &)oldState { - _state = std::static_pointer_cast(state); + _state = std::static_pointer_cast(state); } - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm index 3839c1c72faeed..f08bde9ff265b1 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm @@ -308,8 +308,8 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState { - assert(std::dynamic_pointer_cast(state)); - _state = std::static_pointer_cast(state); + assert(std::dynamic_pointer_cast(state)); + _state = std::static_pointer_cast(state); auto &data = _state->getData(); auto contentOffset = RCTCGPointFromPoint(data.contentOffset); @@ -412,7 +412,7 @@ - (void)_updateStateWithContentOffset _state->updateState([contentOffset](const ScrollViewShadowNode::ConcreteState::Data &data) { auto newData = data; newData.contentOffset = contentOffset; - return std::make_shared(newData); + return std::make_shared(newData); }); } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm index aafd3d44f2d564..2b81ef7db29184 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm @@ -105,7 +105,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState { - _state = std::static_pointer_cast(state); + _state = std::static_pointer_cast(state); [self setNeedsDisplay]; } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm index 691d2f8f222677..2216d0e96b2dbd 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm @@ -216,7 +216,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState { - _state = std::static_pointer_cast(state); + _state = std::static_pointer_cast(state); if (!_state) { assert(false && "State is `null` for component."); diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index 5fcfd86215c3cc..aeaad4acedb31a 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -195,7 +195,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared & RCTAssert( propsRawPtr && ([self class] == [RCTViewComponentView class] || - typeid(*propsRawPtr).hash_code() != typeid(ViewProps const).hash_code()), + typeid(*propsRawPtr).hash_code() != typeid(const ViewProps).hash_code()), @"`RCTViewComponentView` subclasses (and `%@` particularly) must setup `_props`" " instance variable with a default value in the constructor.", NSStringFromClass([self class])); diff --git a/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm b/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm index 1f4d7488ba3dd4..97bf3b3b42cfd7 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm +++ b/packages/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm @@ -145,7 +145,7 @@ - (BOOL)registerComponentIfPossible:(const std::string &)name @"Legacy ViewManagers should be migrated to Fabric ComponentViews in the new architecture to reduce risk. Component using interop layer: %@", componentNameString]); - auto flavor = std::make_shared(name); + auto flavor = std::make_shared(name); auto componentName = ComponentName{flavor->c_str()}; auto componentHandle = reinterpret_cast(componentName); auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor; @@ -159,7 +159,7 @@ - (BOOL)registerComponentIfPossible:(const std::string &)name } // Fallback 4: use if component doesn't exist. - auto flavor = std::make_shared(name); + auto flavor = std::make_shared(name); auto componentName = ComponentName{flavor->c_str()}; auto componentHandle = reinterpret_cast(componentName); auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor; diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm index c1c19cb191ceac..39530b19e89d37 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm @@ -295,7 +295,7 @@ - (RCTScheduler *)_createScheduler toolbox.asynchronousEventBeatFactory = [runtimeExecutor](const EventBeat::SharedOwnerBox &ownerBox) -> std::unique_ptr { auto runLoopObserver = - std::make_unique(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner); + std::make_unique(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner); return std::make_unique(std::move(runLoopObserver), runtimeExecutor); }; diff --git a/packages/react-native/React/Tests/Text/RCTParagraphComponentViewTests.mm b/packages/react-native/React/Tests/Text/RCTParagraphComponentViewTests.mm index 0a595eddf8272f..760d1601616caa 100644 --- a/packages/react-native/React/Tests/Text/RCTParagraphComponentViewTests.mm +++ b/packages/react-native/React/Tests/Text/RCTParagraphComponentViewTests.mm @@ -316,7 +316,7 @@ - (void)setUp std::shared_ptr paragraphShadowNode) { auto sharedState = - std::static_pointer_cast(paragraphShadowNode->getState()); + std::static_pointer_cast(paragraphShadowNode->getState()); return sharedState; } diff --git a/packages/react-native/ReactCommon/cxxreact/MoveWrapper.h b/packages/react-native/ReactCommon/cxxreact/MoveWrapper.h index 40000c3ad0411d..51e6696befb90d 100644 --- a/packages/react-native/ReactCommon/cxxreact/MoveWrapper.h +++ b/packages/react-native/ReactCommon/cxxreact/MoveWrapper.h @@ -107,7 +107,7 @@ class MoveWrapper { // If you want these you're probably doing it wrong, though they'd be // easy enough to implement - MoveWrapper& operator=(MoveWrapper const&) = delete; + MoveWrapper& operator=(const MoveWrapper&) = delete; MoveWrapper& operator=(MoveWrapper&&) = delete; private: diff --git a/packages/react-native/ReactCommon/cxxreact/SystraceSection.h b/packages/react-native/ReactCommon/cxxreact/SystraceSection.h index 1208e3df6e5223..34a31792e42eae 100644 --- a/packages/react-native/ReactCommon/cxxreact/SystraceSection.h +++ b/packages/react-native/ReactCommon/cxxreact/SystraceSection.h @@ -50,7 +50,7 @@ struct DummySystraceSection { public: template explicit DummySystraceSection( - __unused const char* name, + const __unused char* name, __unused ConvertsToStringPiece&&... args) {} }; using SystraceSection = DummySystraceSection; diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.cpp index 77aea744bf7466..943a057bc2cd9e 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.cpp @@ -22,7 +22,7 @@ std::string as_string(folly::dynamic value) { } std::string explain_error( - folly::dynamic::json_pointer_resolution_error error) { + folly::dynamic::json_pointer_resolution_error error) { using err_code = folly::dynamic::json_pointer_resolution_error_code; switch (error.error_code) { diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h b/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h index d311a80dfd1246..ddc290cfb36816 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tests/FollyDynamicMatchers.h @@ -19,7 +19,7 @@ namespace folly_dynamic_matchers_utils { std::string as_string(std::string value); std::string as_string(folly::dynamic value); std::string explain_error( - folly::dynamic::json_pointer_resolution_error error); + folly::dynamic::json_pointer_resolution_error error); } // namespace folly_dynamic_matchers_utils diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h index 042280af54fc9d..1a23997add05af 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h @@ -61,7 +61,7 @@ class ComponentDescriptorProviderRegistry final { mutable std::shared_mutex mutex_; mutable std::vector> componentDescriptorRegistries_; - mutable std::unordered_map + mutable std::unordered_map componentDescriptorProviders_; mutable ComponentDescriptorProviderRequest componentDescriptorProviderRequest_{}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm index 5ecfdce4ee0bc0..f7c895ee2aa5ad 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm @@ -109,7 +109,7 @@ static Class getViewManagerClass(const std::string &componentName, RCTBridge *br bridgeProxy = unwrapManagedObjectWeakly(optionalBridgeProxy.value()); } - auto componentName = *std::static_pointer_cast(flavor); + auto componentName = *std::static_pointer_cast(flavor); Class viewManagerClass = getViewManagerClass(componentName, bridge, bridgeProxy); assert(viewManagerClass); diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h index a490bad78b602f..4decba7e80230e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h @@ -22,7 +22,7 @@ class LegacyViewManagerInteropViewProps final : public ViewProps { #pragma mark - Props - folly::dynamic const otherProps; + const folly::dynamic otherProps; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h index e0df8ee2437662..8366155cec45b1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h @@ -97,7 +97,7 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode< */ void updateStateIfNeeded(const Content& content); - std::shared_ptr textLayoutManager_; + std::shared_ptr textLayoutManager_; /* * Cached content of the subtree started from the node. diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h index 5ed723f3b1cdea..f80448ed25a648 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h @@ -52,13 +52,13 @@ class ParagraphState final { * This is not on every platform. This is not used on Android, but is * used on the iOS mounting layer. */ - std::weak_ptr layoutManager; + std::weak_ptr layoutManager; #ifdef ANDROID ParagraphState( - AttributedString const& attributedString, - ParagraphAttributes const& paragraphAttributes, - std::weak_ptr const& layoutManager) + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, + const std::weak_ptr& layoutManager) : attributedString(attributedString), paragraphAttributes(paragraphAttributes), layoutManager(layoutManager) {} diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.h index ea1583c917136c..449429efc8574c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputProps.h @@ -36,7 +36,7 @@ class TextInputProps final : public BaseTextInputProps { */ std::optional selection{}; - std::string const inputAccessoryViewID{}; + const std::string inputAccessoryViewID{}; bool onKeyPressSync{false}; bool onChangeSync{false}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp index 358fb3773ebf99..0db0b084263c00 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp @@ -398,7 +398,7 @@ BorderMetrics BaseViewProps::resolveBorderMetrics( } Transform BaseViewProps::resolveTransform( - LayoutMetrics const& layoutMetrics) const { + const LayoutMetrics& layoutMetrics) const { float viewWidth = layoutMetrics.frame.size.width; float viewHeight = layoutMetrics.frame.size.height; if (!transformOrigin.isSet() || (viewWidth == 0 && viewHeight == 0)) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp index f0302ffc06f9bd..cbfc92f4979ada 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp @@ -174,7 +174,7 @@ TEST_F(YogaDirtyFlagTest, removingLastChildMustDirtyYogaNode) { return oldShadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), - std::make_shared(children)}); + std::make_shared(children)}); }); EXPECT_TRUE( @@ -193,7 +193,7 @@ TEST_F(YogaDirtyFlagTest, reversingListOfChildrenMustDirtyYogaNode) { return oldShadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), - std::make_shared(children)}); + std::make_shared(children)}); }); EXPECT_TRUE( diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h index 4755dc875c7c02..ffe6d77f6297cd 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h @@ -60,7 +60,7 @@ class ConcreteState : public State { */ void updateState(Data&& newData) const { updateState([data{std::move(newData)}](const Data& oldData) -> SharedData { - return std::make_shared(data); + return std::make_shared(data); }); } @@ -85,7 +85,7 @@ class ConcreteState : public State { auto stateUpdate = StateUpdate{ family, [=](const StateData::Shared& oldData) -> StateData::Shared { react_native_assert(oldData); - return callback(*static_cast(oldData.get())); + return callback(*static_cast(oldData.get())); }}; family->dispatchRawState(std::move(stateUpdate)); diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp index e0bbf1491f4f23..8ea6f8f822368c 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp @@ -20,7 +20,7 @@ template using LayoutableSmallVector = std::vector; static LayoutableSmallVector calculateTransformedFrames( - const LayoutableSmallVector& shadowNodeList, + const LayoutableSmallVector& shadowNodeList, LayoutableShadowNode::LayoutInspectingPolicy policy) { auto size = shadowNodeList.size(); auto transformedFrames = LayoutableSmallVector{size}; diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp index 3e630dcd0d042a..05535e3cc138b7 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp @@ -211,7 +211,7 @@ const RawValue* RawProps::at( void RawProps::iterateOverValues( const std::function< - void(RawPropsPropNameHash, const char*, RawValue const&)>& fn) const { + void(RawPropsPropNameHash, const char*, const RawValue&)>& fn) const { return parser_->iterateOverValues(*this, fn); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h index 73d693443f3a86..ab628513002e73 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h @@ -101,7 +101,7 @@ class RawProps final { */ void iterateOverValues( const std::function< - void(RawPropsPropNameHash, const char*, RawValue const&)>& fn) const; + void(RawPropsPropNameHash, const char*, const RawValue&)>& fn) const; private: friend class RawPropsParser; diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp index 413d885798037d..04cf1d91e5a529 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp @@ -174,7 +174,7 @@ void RawPropsParser::preparse(const RawProps& rawProps) const noexcept { void RawPropsParser::iterateOverValues( const RawProps& rawProps, const std::function< - void(RawPropsPropNameHash, const char*, RawValue const&)>& visit) + void(RawPropsPropNameHash, const char*, const RawValue&)>& visit) const { switch (rawProps.mode_) { case RawProps::Mode::Empty: diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h index de0b1c7fcfabcc..6ffb38bf546464 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h @@ -79,7 +79,7 @@ class RawPropsParser final { void iterateOverValues( const RawProps& rawProps, const std::function< - void(RawPropsPropNameHash, const char*, RawValue const&)>& visit) + void(RawPropsPropNameHash, const char*, const RawValue&)>& visit) const; mutable std::vector keys_{}; diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp index e6f58b78b845a1..b3bad185c0f9b5 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp @@ -313,7 +313,7 @@ const ShadowNodeFamily& ShadowNode::getFamily() const { ShadowNode::Unshared ShadowNode::cloneTree( const ShadowNodeFamily& shadowNodeFamily, - const std::function& + const std::function& callback, ShadowNodeTraits traits) const { auto ancestors = shadowNodeFamily.getAncestors(*this); diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h index b05831575f40ce..fdbdab0a9185f9 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h @@ -101,7 +101,7 @@ class ShadowNode : public Sealable, */ Unshared cloneTree( const ShadowNodeFamily& shadowNodeFamily, - const std::function& callback, + const std::function& callback, ShadowNodeTraits traits = {}) const; #pragma mark - Getters diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h index 92f79cfb532e2b..faa44d74443efb 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h @@ -91,7 +91,7 @@ class ShadowNodeFamily final { * Sets and gets the most recent state. */ std::shared_ptr getMostRecentState() const; - void setMostRecentState(const std::shared_ptr& state) const; + void setMostRecentState(const std::shared_ptr& state) const; /* * Dispatches a state update with given priority. @@ -134,7 +134,7 @@ class ShadowNodeFamily final { /* * Weak reference to the React instance handle */ - InstanceHandle::Shared const instanceHandle_; + const InstanceHandle::Shared instanceHandle_; /* * `EventEmitter` associated with all nodes of the family. diff --git a/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h index 920621c7519229..31cad74f10c61d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h @@ -110,8 +110,8 @@ T convertRawProp( const PropsParserContext& context, const RawProps& rawProps, const char* name, - T const& sourceValue, - U const& defaultValue, + const T& sourceValue, + const U& defaultValue, const char* namePrefix = nullptr, const char* nameSuffix = nullptr) { const auto* rawValue = rawProps.at(name, namePrefix, nameSuffix); diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp index 44411abc24f178..59c9d53d9547dc 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/ShadowNodeTest.cpp @@ -269,7 +269,7 @@ TEST_F(ShadowNodeTest, handleState) { traits); TestShadowNode::ConcreteState::Shared _state = - std::static_pointer_cast( + std::static_pointer_cast( initialState); _state->updateState(TestState()); @@ -293,7 +293,7 @@ TEST_F(ShadowNodeTest, testCloneTree) { newTraits.set(ShadowNodeTraits::Trait::ClonedByNativeStateUpdate); auto rootNode = nodeA_->cloneTree( family, - [newTraits](ShadowNode const& oldShadowNode) { + [newTraits](const ShadowNode& oldShadowNode) { return oldShadowNode.clone({.traits = newTraits}); }, newTraits); @@ -304,7 +304,7 @@ TEST_F(ShadowNodeTest, testCloneTree) { EXPECT_FALSE(rootNode->getChildren()[0]->getTraits().check( ShadowNodeTraits::Trait::ClonedByNativeStateUpdate)); - auto const& firstLevelChild = *rootNode->getChildren()[1]; + const auto& firstLevelChild = *rootNode->getChildren()[1]; EXPECT_TRUE(firstLevelChild.getTraits().check( ShadowNodeTraits::Trait::ClonedByNativeStateUpdate)); @@ -312,7 +312,7 @@ TEST_F(ShadowNodeTest, testCloneTree) { EXPECT_FALSE(firstLevelChild.getChildren()[1]->getTraits().check( ShadowNodeTraits::Trait::ClonedByNativeStateUpdate)); - auto const& secondLevelchild = *firstLevelChild.getChildren()[0]; + const auto& secondLevelchild = *firstLevelChild.getChildren()[0]; EXPECT_TRUE(secondLevelchild.getTraits().check( ShadowNodeTraits::Trait::ClonedByNativeStateUpdate)); diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h index b7d494fe053c3b..80bf22fbc4d983 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h @@ -140,32 +140,32 @@ std::string toString(const std::optional& value) { * types. */ template -std::string getDebugName(T const& object) { +std::string getDebugName(const T& object) { return "Node"; } template -std::string getDebugValue(T const& object) { +std::string getDebugValue(const T& object) { return ""; } template std::vector getDebugChildren( - T const& object, + const T& object, DebugStringConvertibleOptions options) { return {}; } template std::vector getDebugProps( - T const& object, + const T& object, DebugStringConvertibleOptions options) { return {}; } template std::string getDebugPropsDescription( - T const& object, + const T& object, DebugStringConvertibleOptions options) { if (options.depth >= options.maximumDepth) { return ""; @@ -195,7 +195,7 @@ std::string getDebugPropsDescription( template std::string getDebugChildrenDescription( - T const& object, + const T& object, DebugStringConvertibleOptions options) { if (options.depth >= options.maximumDepth) { return ""; @@ -219,7 +219,7 @@ std::string getDebugChildrenDescription( template std::string getDebugDescription( - T const& object, + const T& object, DebugStringConvertibleOptions options) { auto nameString = getDebugName(object); auto valueString = getDebugValue(object); @@ -360,7 +360,7 @@ inline std::string getDebugDescription( // `std::unique_ptr` template inline std::string getDebugDescription( - const std::unique_ptr& pointer, + const std::unique_ptr& pointer, DebugStringConvertibleOptions options) { return getDebugDescription((void*)pointer.get(), options) + "(unique)"; } diff --git a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h b/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h index 1208e3df6e5223..34a31792e42eae 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h @@ -50,7 +50,7 @@ struct DummySystraceSection { public: template explicit DummySystraceSection( - __unused const char* name, + const __unused char* name, __unused ConvertsToStringPiece&&... args) {} }; using SystraceSection = DummySystraceSection; diff --git a/packages/react-native/ReactCommon/react/renderer/dom/DOM.cpp b/packages/react-native/ReactCommon/react/renderer/dom/DOM.cpp index f97bceb6e8ccc7..417e19ce2df4bc 100644 --- a/packages/react-native/ReactCommon/react/renderer/dom/DOM.cpp +++ b/packages/react-native/ReactCommon/react/renderer/dom/DOM.cpp @@ -350,7 +350,7 @@ DOMPoint getScrollPosition( return DOMPoint{}; } - auto layoutableShadowNode = dynamic_cast( + auto layoutableShadowNode = dynamic_cast( shadowNodeInCurrentRevision.get()); // This should never happen if (layoutableShadowNode == nullptr) { @@ -385,7 +385,7 @@ DOMSizeRounded getScrollSize( return DOMSizeRounded{}; } - auto layoutableShadowNode = dynamic_cast( + auto layoutableShadowNode = dynamic_cast( shadowNodeInCurrentRevision.get()); // This should never happen if (layoutableShadowNode == nullptr) { diff --git a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp index 165b1cae778871..bf127d58b0e29c 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp +++ b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp @@ -35,7 +35,7 @@ ShadowNode::Unshared ComponentBuilder::build( auto constShadowNode = componentDescriptor.createShadowNode( ShadowNodeFragment{ elementFragment.props, - std::make_shared(children), + std::make_shared(children), initialState}, family); diff --git a/packages/react-native/ReactCommon/react/renderer/element/Element.h b/packages/react-native/ReactCommon/react/renderer/element/Element.h index 71e1bdf5511a41..cc41fa4d56ba11 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/Element.h +++ b/packages/react-native/ReactCommon/react/renderer/element/Element.h @@ -38,7 +38,7 @@ class Element final { using ConcreteUnsharedShadowNode = std::shared_ptr; using ConcreteReferenceCallback = - std::function& shadowNode)>; + std::function& shadowNode)>; /* * Constructs an `Element`. @@ -96,7 +96,7 @@ class Element final { [callback = std::move(callback)]( const State::Shared& state) -> StateData::Shared { auto stateData = - static_cast(state.get())->getData(); + static_cast(state.get())->getData(); callback(stateData); return std::make_shared(stateData); }; @@ -126,7 +126,7 @@ class Element final { fragment_.referenceCallback = [callback = std::move(callback)](const ShadowNode::Shared& shadowNode) { callback(std::const_pointer_cast( - std::static_pointer_cast(shadowNode))); + std::static_pointer_cast(shadowNode))); }; return *this; } @@ -138,7 +138,7 @@ class Element final { Element& reference(ConcreteUnsharedShadowNode& outShadowNode) { fragment_.referenceCallback = [&](const ShadowNode::Shared& shadowNode) { outShadowNode = std::const_pointer_cast( - std::static_pointer_cast(shadowNode)); + std::static_pointer_cast(shadowNode)); }; return *this; } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index eadd5cff364962..f97bd43e5de1e9 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -121,7 +121,7 @@ static void progressStateIfNecessary( continue; } - auto const& baseChildNode = *(*baseChildNodeIterator); + const auto& baseChildNode = *(*baseChildNodeIterator); if (!baseChildNode.getTraits().check( ShadowNodeTraits::Trait::ClonedByNativeStateUpdate)) { @@ -176,7 +176,7 @@ static ShadowNode::Unshared progressState(const ShadowNode& shadowNode) { return shadowNode.clone({ ShadowNodeFragment::propsPlaceholder(), - areChildrenChanged ? std::make_shared( + areChildrenChanged ? std::make_shared( std::move(newChildren)) : ShadowNodeFragment::childrenPlaceholder(), isStateChanged ? newState : ShadowNodeFragment::statePlaceholder(), @@ -263,7 +263,7 @@ static ShadowNode::Unshared progressState( return shadowNode.clone({ ShadowNodeFragment::propsPlaceholder(), - areChildrenChanged ? std::make_shared( + areChildrenChanged ? std::make_shared( std::move(newChildren)) : ShadowNodeFragment::childrenPlaceholder(), isStateChanged ? newState : ShadowNodeFragment::statePlaceholder(), diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp index 2e12a01b0f8e36..63eccf58e4d2c1 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp @@ -182,7 +182,7 @@ void StubViewTree::mutate(const ShadowViewMutationList& mutations) { STUB_VIEW_LOG({ std::string strChildList = ""; int i = 0; - for (auto const& child : parentStubView->children) { + for (const auto& child : parentStubView->children) { strChildList.append(std::to_string(i)); strChildList.append(":"); strChildList.append(std::to_string(child->tag)); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/OrderIndexTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/OrderIndexTest.cpp index 804287cc133648..52cb51f16db937 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/OrderIndexTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/OrderIndexTest.cpp @@ -88,7 +88,7 @@ class OrderIndexTest : public ::testing::Test { } void testViewTree_( - const std::function& callback) { + const std::function& callback) { rootShadowNode_->layoutIfNeeded(); callback(buildStubViewTreeUsingDifferentiator(*rootShadowNode_)); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp index 2d1ff7c1cb0627..eaab69b7546d72 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp @@ -164,7 +164,7 @@ class StackingContextTest : public ::testing::Test { } void testViewTree_( - const std::function& callback) { + const std::function& callback) { rootShadowNode_->layoutIfNeeded(); callback(buildStubViewTreeUsingDifferentiator(*rootShadowNode_)); diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp index bff617dc5adc93..0744e6a8aa938b 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp @@ -364,8 +364,8 @@ TEST_P(RuntimeSchedulerTest, continuationTask) { jsi::PropNameID::forUtf8(*runtime_, ""), 1, [&](jsi::Runtime& /*runtime*/, - jsi::Value const& /*unused*/, - jsi::Value const* /*arguments*/, + const jsi::Value& /*unused*/, + const jsi::Value* /*arguments*/, size_t /*unused*/) noexcept -> jsi::Value { didContinuationTask = true; return jsi::Value::undefined(); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index 502f8997f84966..bf7aefaafd6978 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -75,7 +75,7 @@ Scheduler::Scheduler( ReactEventPriority priority, const EventPayload& payload) { uiManager->visitBinding( - [&](UIManagerBinding const& uiManagerBinding) { + [&](const UIManagerBinding& uiManagerBinding) { uiManagerBinding.dispatchEvent( runtime, eventTarget, type, priority, payload); }, diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp index 45e6d6924b55cc..9020a8d406c7bd 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp @@ -86,7 +86,7 @@ void SurfaceManager::constraintSurfaceLayout( void SurfaceManager::visit( SurfaceId surfaceId, - const std::function& callback) + const std::function& callback) const noexcept { std::shared_lock lock(mutex_); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h index 2d656bcfaba1d0..a5526e176a3040 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h @@ -55,7 +55,7 @@ class SurfaceManager final { private: void visit( SurfaceId surfaceId, - const std::function& callback) + const std::function& callback) const noexcept; const Scheduler& scheduler_; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h index 304cefde8074ad..6dd5a204b6b3b4 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h @@ -26,14 +26,14 @@ struct TextLayoutContext { }; inline bool operator==( - TextLayoutContext const& lhs, - TextLayoutContext const& rhs) { + const TextLayoutContext& lhs, + const TextLayoutContext& rhs) { return std::tie(lhs.pointScaleFactor) == std::tie(rhs.pointScaleFactor); } inline bool operator!=( - TextLayoutContext const& lhs, - TextLayoutContext const& rhs) { + const TextLayoutContext& lhs, + const TextLayoutContext& rhs) { return !(lhs == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 2ca77a3ba3fa1d..54673f0902d8cc 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -176,7 +176,7 @@ void UIManager::completeSurface( shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree& shadowTree) { auto result = shadowTree.commit( - [&](RootShadowNode const& oldRootShadowNode) { + [&](const RootShadowNode& oldRootShadowNode) { return std::make_shared( oldRootShadowNode, ShadowNodeFragment{ @@ -367,11 +367,11 @@ void UIManager::updateState(const StateUpdate& stateUpdate) const { shadowTreeRegistry_.visit( family->getSurfaceId(), [&](const ShadowTree& shadowTree) { shadowTree.commit( - [&](RootShadowNode const& oldRootShadowNode) { + [&](const RootShadowNode& oldRootShadowNode) { auto isValid = true; auto rootNode = oldRootShadowNode.cloneTree( - *family, [&](ShadowNode const& oldShadowNode) { + *family, [&](const ShadowNode& oldShadowNode) { auto newData = callback(oldShadowNode.getState()->getDataPointer()); @@ -435,9 +435,9 @@ void UIManager::setNativeProps_DEPRECATED( auto ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode; shadowTree.commit( - [&](RootShadowNode const& oldRootShadowNode) { + [&](const RootShadowNode& oldRootShadowNode) { auto rootNode = oldRootShadowNode.cloneTree( - family, [&](ShadowNode const& oldShadowNode) { + family, [&](const ShadowNode& oldShadowNode) { auto& componentDescriptor = componentDescriptorRegistry_->at( shadowNode->getComponentHandle()); @@ -501,7 +501,7 @@ ShadowNode::Shared UIManager::findShadowNodeByTag_DEPRECATED(Tag tag) const { auto shadowNode = ShadowNode::Shared{}; shadowTreeRegistry_.enumerate([&](const ShadowTree& shadowTree, bool& stop) { - RootShadowNode const* rootShadowNode; + const RootShadowNode* rootShadowNode; // The public interface of `ShadowTree` discourages accessing a stored // pointer to a root node because of the possible data race. // To work around this, we ask for a commit and immediately cancel it @@ -510,16 +510,16 @@ ShadowNode::Shared UIManager::findShadowNodeByTag_DEPRECATED(Tag tag) const { // because this `findShadowNodeByTag` is deprecated. It is only added // to make migration to the new architecture easier. shadowTree.tryCommit( - [&](RootShadowNode const& oldRootShadowNode) { + [&](const RootShadowNode& oldRootShadowNode) { rootShadowNode = &oldRootShadowNode; return nullptr; }, {/* default commit options */}); if (rootShadowNode != nullptr) { - auto const& children = rootShadowNode->getChildren(); + const auto& children = rootShadowNode->getChildren(); if (!children.empty()) { - auto const& child = children.front(); + const auto& child = children.front(); shadowNode = findShadowNodeByTagRecursively(child, tag); if (shadowNode) { stop = true; @@ -545,7 +545,7 @@ UIManagerDelegate* UIManager::getDelegate() { } void UIManager::visitBinding( - const std::function& + const std::function& callback, jsi::Runtime& runtime) const { auto uiManagerBinding = UIManagerBinding::getBinding(runtime); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h index 9bca4be51fd5a1..09b940a90407a8 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h @@ -78,7 +78,7 @@ class UIManager final : public ShadowTreeDelegate { * The callback is called synchronously on the same thread. */ void visitBinding( - const std::function& + const std::function& callback, jsi::Runtime& runtime) const; diff --git a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h index ba334fe49025c9..a3e67d332e7085 100644 --- a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h +++ b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h @@ -40,7 +40,7 @@ class ShadowTreeEdge final { static bool traverseShadowTree( const ShadowNode::Shared& parentShadowNode, - const std::function& + const std::function& callback) { auto index = int{0}; for (const auto& childNode : parentShadowNode->getChildren()) { @@ -115,7 +115,7 @@ static inline ShadowNode::Unshared messWithChildren( entropy.shuffle(children); return shadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), - std::make_shared(children)}); + std::make_shared(children)}); } static inline ShadowNode::Unshared messWithLayoutableOnlyFlag( diff --git a/packages/react-native/ReactCommon/react/utils/ContextContainer.h b/packages/react-native/ReactCommon/react/utils/ContextContainer.h index ae22bf77d3bccf..8c724490dfce81 100644 --- a/packages/react-native/ReactCommon/react/utils/ContextContainer.h +++ b/packages/react-native/ReactCommon/react/utils/ContextContainer.h @@ -39,7 +39,7 @@ class ContextContainer final { *`ReactNativeConfig`. */ template - void insert(const std::string& key, T const& instance) const { + void insert(const std::string& key, const T& instance) const { std::unique_lock lock(mutex_); instances_.insert({key, std::make_shared(instance)}); diff --git a/packages/react-native/ReactCommon/react/utils/fnv1a.h b/packages/react-native/ReactCommon/react/utils/fnv1a.h index 20c5b341e18880..4f6bf4a16ecbc1 100644 --- a/packages/react-native/ReactCommon/react/utils/fnv1a.h +++ b/packages/react-native/ReactCommon/react/utils/fnv1a.h @@ -27,7 +27,7 @@ constexpr uint32_t fnv1a(std::string_view string) noexcept { uint32_t hash = offset_basis; - for (auto const& c : string) { + for (const auto& c : string) { hash ^= static_cast(CharTransformT{}(c)); // Using shifts and adds instead of multiplication with a prime number. // This is faster when compiled with optimizations.