diff --git a/packages/react-native/React/Base/RCTBundleURLProvider.mm b/packages/react-native/React/Base/RCTBundleURLProvider.mm index 906012b06b26..1cc42d71d3bc 100644 --- a/packages/react-native/React/Base/RCTBundleURLProvider.mm +++ b/packages/react-native/React/Base/RCTBundleURLProvider.mm @@ -39,8 +39,7 @@ @implementation RCTBundleURLProvider - (instancetype)init { - self = [super init]; - if (self) { + if (self = [super init]) { [self _setDefaults]; } return self; diff --git a/packages/react-native/React/Base/RCTErrorInfo.m b/packages/react-native/React/Base/RCTErrorInfo.m index 1eb41fe4caed..c4afccd61cb1 100644 --- a/packages/react-native/React/Base/RCTErrorInfo.m +++ b/packages/react-native/React/Base/RCTErrorInfo.m @@ -13,8 +13,7 @@ @implementation RCTErrorInfo - (instancetype)initWithErrorMessage:(NSString *)errorMessage stack:(NSArray *)stack { - self = [super init]; - if (self) { + if (self = [super init]) { _errorMessage = [errorMessage copy]; _stack = [stack copy]; } diff --git a/packages/react-native/React/CoreModules/RCTActionSheetManager.mm b/packages/react-native/React/CoreModules/RCTActionSheetManager.mm index 41150ac877b0..104e0491fc22 100644 --- a/packages/react-native/React/CoreModules/RCTActionSheetManager.mm +++ b/packages/react-native/React/CoreModules/RCTActionSheetManager.mm @@ -33,8 +33,7 @@ @implementation RCTActionSheetManager - (instancetype)init { - self = [super init]; - if (self != nullptr) { + if (self = [super init]) { _alertControllers = [NSMutableArray new]; } return self; diff --git a/packages/react-native/React/CoreModules/RCTRedBox2Controller.mm b/packages/react-native/React/CoreModules/RCTRedBox2Controller.mm index 04a10a67219c..7940b3c48e5f 100644 --- a/packages/react-native/React/CoreModules/RCTRedBox2Controller.mm +++ b/packages/react-native/React/CoreModules/RCTRedBox2Controller.mm @@ -72,8 +72,7 @@ @implementation RCTRedBox2Controller { - (instancetype)initWithCustomButtonTitles:(NSArray *)customButtonTitles customButtonHandlers:(NSArray *)customButtonHandlers { - self = [super init]; - if (self != nullptr) { + if (self = [super init]) { _lastErrorCookie = -1; _customButtonTitles = customButtonTitles; _customButtonHandlers = customButtonHandlers; diff --git a/packages/react-native/React/DevSupport/RCTFrameTimingsObserver.mm b/packages/react-native/React/DevSupport/RCTFrameTimingsObserver.mm index 51087cfd5d52..aa3c57043d0d 100644 --- a/packages/react-native/React/DevSupport/RCTFrameTimingsObserver.mm +++ b/packages/react-native/React/DevSupport/RCTFrameTimingsObserver.mm @@ -294,7 +294,7 @@ - (UIWindow *)_getKeyWindow if (scene.activationState == UISceneActivationStateForegroundActive && [scene isKindOfClass:[UIWindowScene class]]) { auto windowScene = (UIWindowScene *)scene; - for (UIWindow *window = nullptr in windowScene.windows) { + for (UIWindow *window in windowScene.windows) { if (window.isKeyWindow) { return window; } diff --git a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm index f0fa55333445..225a87af2d38 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm +++ b/packages/react-native/React/DevSupport/RCTInspectorNetworkHelper.mm @@ -21,8 +21,7 @@ @implementation RCTInspectorNetworkHelper - (instancetype)init { - self = [super init]; - if (self != nullptr) { + if (self = [super init]) { NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; self.session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil]; self.executorsByTaskId = [NSMutableDictionary new]; diff --git a/packages/react-native/React/Fabric/AppleEventBeat.mm b/packages/react-native/React/Fabric/AppleEventBeat.mm index 66f93729aee8..313231919627 100644 --- a/packages/react-native/React/Fabric/AppleEventBeat.mm +++ b/packages/react-native/React/Fabric/AppleEventBeat.mm @@ -29,8 +29,7 @@ @implementation RCTEventBeatFlusherLayer { - (instancetype)initWithOnDisplay:(void (^)(void))onDisplay { - self = [super init]; - if (self != nil) { + if (self = [super init]) { _onDisplay = [onDisplay copy]; self.frame = CGRectZero; } @@ -84,11 +83,8 @@ - (void)display // before it executes is made safe by the owner check above. NSMapTable *layers = layers_; RCTExecuteOnMainQueue(^{ - NSEnumerator *enumerator = layers.objectEnumerator; - RCTEventBeatFlusherLayer *layer = enumerator.nextObject; - while (layer != nil) { + for (RCTEventBeatFlusherLayer *layer in layers.objectEnumerator) { [layer removeFromSuperlayer]; - layer = enumerator.nextObject; } }); } diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm index 8cbc43f8cb70..1ee1d14a047f 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTVirtualViewContainerState.mm @@ -78,8 +78,7 @@ @implementation RCTVirtualViewContainerState - (instancetype)initWithScrollView:(RCTScrollViewComponentView *)scrollView { - self = [super init]; - if (self != nil) { + if (self = [super init]) { _virtualViews = [NSMutableSet set]; _emptyRect = CGRectZero; _prerenderRect = CGRectZero; @@ -143,7 +142,7 @@ - (void)_updateModes:(id)virtualView NSArray> *virtualViewsIt = (virtualView != nullptr) ? @[ virtualView ] : [_virtualViews allObjects]; - for (id vv = nullptr in virtualViewsIt) { + for (id vv in virtualViewsIt) { CGRect rect = [vv containerRelativeRect:scrollView]; RCTVirtualViewMode mode = RCTVirtualViewModeHidden; 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 37db047e8b25..61ef98f921cd 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -757,7 +757,7 @@ - (void)prepareForRecycle // Clean up box shadow layers to prevent cross-component contamination if (_boxShadowLayers != nullptr) { - for (CALayer *boxShadowLayer = nullptr in _boxShadowLayers) { + for (CALayer *boxShadowLayer in _boxShadowLayers) { [boxShadowLayer removeFromSuperlayer]; } [_boxShadowLayers removeAllObjects]; @@ -817,7 +817,7 @@ - (UIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event return nil; } - for (UIView *subview = nullptr in [currentContainerView.subviews reverseObjectEnumerator]) { + for (UIView *subview in [currentContainerView.subviews reverseObjectEnumerator]) { UIView *hitView = [subview hitTest:[subview convertPoint:point fromView:currentContainerView] withEvent:event]; if (hitView) { return hitView; @@ -975,7 +975,7 @@ - (UIView *)effectiveContentView if (_swiftUIWrapper == nullptr) { _swiftUIWrapper = [RCTSwiftUIContainerViewWrapper new]; UIView *swiftUIContentView = [[UIView alloc] init]; - for (UIView *subview = nullptr in self.subviews) { + for (UIView *subview in self.subviews) { [swiftUIContentView addSubview:subview]; } swiftUIContentView.clipsToBounds = self.clipsToBounds; @@ -993,7 +993,7 @@ - (UIView *)effectiveContentView } else { if (_swiftUIWrapper != nullptr) { UIView *swiftUIContentView = _swiftUIWrapper.contentView; - for (UIView *subview = nullptr in swiftUIContentView.subviews) { + for (UIView *subview in swiftUIContentView.subviews) { [self addSubview:subview]; } self.clipsToBounds = swiftUIContentView.clipsToBounds; @@ -1019,7 +1019,7 @@ - (UIView *)currentContainerView if (_useCustomContainerView) { if (!_containerView) { _containerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height)]; - for (UIView *subview = nullptr in effectiveContentView.subviews) { + for (UIView *subview in effectiveContentView.subviews) { [_containerView addSubview:subview]; } _containerView.clipsToBounds = effectiveContentView.clipsToBounds; @@ -1805,10 +1805,10 @@ - (void)transferVisualPropertiesFromView:(UIView *)sourceView toView:(UIView *)d if (_filterLayer != nullptr) { [destinationView.layer addSublayer:_filterLayer]; } - for (CALayer *layer = nullptr in _backgroundImageLayers) { + for (CALayer *layer in _backgroundImageLayers) { [destinationView.layer addSublayer:layer]; } - for (CALayer *layer = nullptr in _boxShadowLayers) { + for (CALayer *layer in _boxShadowLayers) { [destinationView.layer addSublayer:layer]; } } diff --git a/packages/react-native/React/Modules/RCTUIManager.mm b/packages/react-native/React/Modules/RCTUIManager.mm index af16e8b0c06d..3764fffef7c4 100644 --- a/packages/react-native/React/Modules/RCTUIManager.mm +++ b/packages/react-native/React/Modules/RCTUIManager.mm @@ -246,8 +246,7 @@ @implementation RCTComposedViewRegistry { - (instancetype)initWithUIManager:(RCTUIManager *)uiManager andRegistry:(NSDictionary *)registry { - self = [super init]; - if (self) { + if (self = [super init]) { _uiManager = uiManager; _registry = registry; } diff --git a/packages/react-native/React/Views/RCTDebuggingOverlay.m b/packages/react-native/React/Views/RCTDebuggingOverlay.m index 0c56b948712d..23076423db04 100644 --- a/packages/react-native/React/Views/RCTDebuggingOverlay.m +++ b/packages/react-native/React/Views/RCTDebuggingOverlay.m @@ -32,8 +32,7 @@ @implementation RCTDebuggingOverlay { - (instancetype)initWithFrame:(CGRect)frame { - self = [super initWithFrame:frame]; - if (self) { + if (self = [super initWithFrame:frame]) { _idToTraceUpdateMap = [NSMutableDictionary new]; } return self; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm index 58a9879af9d5..af5b225e8e7e 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm @@ -234,7 +234,6 @@ - (void)drawAttributedString:(AttributedString)attributedString CGFloat baseline = lineRect.origin.y + font.ascender + frame.origin.y; - // NOLINTNEXTLINE(cppcoreguidelines-init-variables) for (NSString *line in lines) { CGFloat y = 0.0f; if ([line isEqualToString:@"underline"]) { diff --git a/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm b/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm index 2d593b88eb97..d022bcf74855 100644 --- a/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm +++ b/packages/rn-tester/RNTester/NativeExampleViews/UpdatePropertiesExampleView.mm @@ -54,8 +54,7 @@ - (instancetype)initWithFrame:(CGRect)frame - (instancetype)initWithFrame:(CGRect)frame rootViewFactory:(RCTRootViewFactory *)rootViewFactory { - self = [super initWithFrame:frame]; - if (self) { + if (self = [super initWithFrame:frame]) { _beige = YES; _rootView = (RCTRootView *)[rootViewFactory viewWithModuleName:@"SetPropertiesExampleApp" diff --git a/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m index bfcbfbfb2339..b932b1992219 100644 --- a/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m +++ b/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m @@ -25,8 +25,7 @@ @implementation RCTFakeDisplayLink { - (instancetype)init { - self = [super init]; - if (self) { + if (self = [super init]) { _timestamp = 1124.1234143251; // Random } return self; @@ -50,8 +49,7 @@ @implementation RCTFakeValueObserver - (instancetype)init { - self = [super init]; - if (self) { + if (self = [super init]) { _calls = [NSMutableArray new]; } return self; @@ -78,8 +76,7 @@ @implementation RCTFakeEvent { - (instancetype)initWithName:(NSString *)name viewTag:(NSNumber *)viewTag arguments:(NSArray *)arguments { - self = [super init]; - if (self) { + if (self = [super init]) { _eventName = name; _viewTag = viewTag; _arguments = arguments;