Apply clang-format 18

Summary: Previously this code conformed from clang-format 12. Reviewed By: igorsugak Differential Revision: D56065247 fbshipit-source-id: f5a985dd8f8b84f2f9e1818b3719b43c5a1b05b3
robhogan · Apr 14, 2024 · a5eeea8 · a5eeea8
1 parent 314a919
commit a5eeea8
Show file tree

Hide file tree

Showing 42 changed files with 212 additions and 206 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -260,13 +260,11 @@ - (RCTRootViewFactory *)createRCTRootViewFactory
                                                    turboModuleEnabled:self.turboModuleEnabled
                                                     bridgelessEnabled:self.bridgelessEnabled];
 
-  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps)
-  {
+  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps) {
     return [weakSelf createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
   };
 
-  configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions)
-  {
+  configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions) {
     return [weakSelf createBridgeWithDelegate:delegate launchOptions:launchOptions];
   };
 

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm
@@ -62,32 +62,31 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
 {
   // private block used to filter out modules depending on protocol conformance
   NSArray * (^extractModuleConformingToProtocol)(RCTModuleRegistry *, Protocol *) =
-      ^NSArray *(RCTModuleRegistry *moduleRegistry, Protocol *protocol)
-  {
-    NSArray<NSString *> *classNames = @[];
+      ^NSArray *(RCTModuleRegistry *moduleRegistry, Protocol *protocol) {
+        NSArray<NSString *> *classNames = @[];
 
 #if USE_OSS_CODEGEN
-    if (protocol == @protocol(RCTImageURLLoader)) {
-      classNames = [RCTModulesConformingToProtocolsProvider imageURLLoaderClassNames];
-    } else if (protocol == @protocol(RCTImageDataDecoder)) {
-      classNames = [RCTModulesConformingToProtocolsProvider imageDataDecoderClassNames];
-    } else if (protocol == @protocol(RCTURLRequestHandler)) {
-      classNames = [RCTModulesConformingToProtocolsProvider URLRequestHandlerClassNames];
-    }
+        if (protocol == @protocol(RCTImageURLLoader)) {
+          classNames = [RCTModulesConformingToProtocolsProvider imageURLLoaderClassNames];
+        } else if (protocol == @protocol(RCTImageDataDecoder)) {
+          classNames = [RCTModulesConformingToProtocolsProvider imageDataDecoderClassNames];
+        } else if (protocol == @protocol(RCTURLRequestHandler)) {
+          classNames = [RCTModulesConformingToProtocolsProvider URLRequestHandlerClassNames];
+        }
 #endif
 
-    NSMutableArray *modules = [NSMutableArray new];
-
-    for (NSString *className in classNames) {
-      const char *cModuleName = [className cStringUsingEncoding:NSUTF8StringEncoding];
-      id moduleFromLibrary = [moduleRegistry moduleForName:cModuleName];
-      if (![moduleFromLibrary conformsToProtocol:protocol]) {
-        continue;
-      }
-      [modules addObject:moduleFromLibrary];
-    }
-    return modules;
-  };
+        NSMutableArray *modules = [NSMutableArray new];
+
+        for (NSString *className in classNames) {
+          const char *cModuleName = [className cStringUsingEncoding:NSUTF8StringEncoding];
+          id moduleFromLibrary = [moduleRegistry moduleForName:cModuleName];
+          if (![moduleFromLibrary conformsToProtocol:protocol]) {
+            continue;
+          }
+          [modules addObject:moduleFromLibrary];
+        }
+        return modules;
+      };
 
   // Set up the default RCTImageLoader and RCTNetworking modules.
   if (moduleClass == RCTImageLoader.class) {

diff --git a/packages/react-native/React/Base/RCTBridgeModule.h b/packages/react-native/React/Base/RCTBridgeModule.h
@@ -283,12 +283,10 @@ RCT_EXTERN_C_END
 /**
  * Like RCT_EXTERN_MODULE, but allows setting a custom JavaScript name.
  */
-#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername) \
-  objc_name:                                                        \
-  objc_supername @                                                  \
-  end @interface objc_name(RCTExternModule)<RCTBridgeModule>        \
-  @end                                                              \
-  @implementation objc_name (RCTExternModule)                       \
+#define RCT_EXTERN_REMAP_MODULE(js_name, objc_name, objc_supername)                      \
+  objc_name : objc_supername @end @interface objc_name(RCTExternModule)<RCTBridgeModule> \
+  @end                                                                                   \
+  @implementation objc_name (RCTExternModule)                                            \
   RCT_EXPORT_MODULE_NO_LOAD(js_name, objc_name)
 
 /**

diff --git a/packages/react-native/React/Base/RCTModuleData.mm b/packages/react-native/React/Base/RCTModuleData.mm
@@ -31,7 +31,7 @@ int32_t getUniqueId()
   static std::atomic<int32_t> counter{0};
   return counter++;
 }
-}
+} // namespace
 
 @implementation RCTModuleData {
   NSDictionary<NSString *, id> *_constantsToExport;

diff --git a/packages/react-native/React/Base/RCTModuleRegistry.m b/packages/react-native/React/Base/RCTModuleRegistry.m
@@ -36,7 +36,7 @@ - (id)moduleForName:(const char *)moduleName lazilyLoadIfNecessary:(BOOL)lazilyL
 
   RCTBridge *bridge = _bridge;
   if (bridge) {
-    module = [bridge moduleForName:[NSString stringWithUTF8String:moduleName] lazilyLoadIfNecessary:lazilyLoad];
+    module = [bridge moduleForName: [NSString stringWithUTF8String:moduleName] lazilyLoadIfNecessary:lazilyLoad];
   }
 
   id<RCTTurboModuleRegistry> turboModuleRegistry = _turboModuleRegistry;

diff --git a/packages/react-native/React/Base/RCTRootView.h b/packages/react-native/React/Base/RCTRootView.h
@@ -40,7 +40,7 @@ extern
 
     NS_ASSUME_NONNULL_BEGIN
 
-        NSString *const RCTContentDidAppearNotification;
+    NSString *const RCTContentDidAppearNotification;
 
 /**
  * Native view used to host React-managed views within the app. Can be used just

diff --git a/packages/react-native/React/Base/RCTUtils.h b/packages/react-native/React/Base/RCTUtils.h
@@ -71,13 +71,13 @@ RCT_EXTERN BOOL RCTClassOverridesClassMethod(Class cls, SEL selector);
 RCT_EXTERN BOOL RCTClassOverridesInstanceMethod(Class cls, SEL selector);
 
 // Creates a standardized error object to return in callbacks
-RCT_EXTERN NSDictionary<NSString *, id>
-    *RCTMakeError(NSString *message, id __nullable toStringify, NSDictionary<NSString *, id> *__nullable extraData);
+RCT_EXTERN NSDictionary<NSString *, id> *
+RCTMakeError(NSString *message, id __nullable toStringify, NSDictionary<NSString *, id> *__nullable extraData);
 RCT_EXTERN NSDictionary<NSString *, id> *
 RCTMakeAndLogError(NSString *message, id __nullable toStringify, NSDictionary<NSString *, id> *__nullable extraData);
 RCT_EXTERN NSDictionary<NSString *, id> *RCTJSErrorFromNSError(NSError *error);
-RCT_EXTERN NSDictionary<NSString *, id>
-    *RCTJSErrorFromCodeMessageAndNSError(NSString *code, NSString *message, NSError *__nullable error);
+RCT_EXTERN NSDictionary<NSString *, id> *
+RCTJSErrorFromCodeMessageAndNSError(NSString *code, NSString *message, NSError *__nullable error);
 
 // The default error code to use as the `code` property for callback error objects
 RCT_EXTERN NSString *const RCTErrorUnspecified;

diff --git a/packages/react-native/React/Base/RCTUtils.m b/packages/react-native/React/Base/RCTUtils.m
@@ -468,8 +468,8 @@ BOOL RCTClassOverridesInstanceMethod(Class cls, SEL selector)
   return NO;
 }
 
-NSDictionary<NSString *, id>
-    *RCTMakeError(NSString *message, id __nullable toStringify, NSDictionary<NSString *, id> *__nullable extraData)
+NSDictionary<NSString *, id> *
+RCTMakeError(NSString *message, id __nullable toStringify, NSDictionary<NSString *, id> *__nullable extraData)
 {
   if (toStringify) {
     message = [message stringByAppendingString:[toStringify description]];
@@ -496,8 +496,8 @@ BOOL RCTClassOverridesInstanceMethod(Class cls, SEL selector)
 }
 
 // TODO: Can we just replace RCTMakeError with this function instead?
-NSDictionary<NSString *, id>
-    *RCTJSErrorFromCodeMessageAndNSError(NSString *code, NSString *message, NSError *__nullable error)
+NSDictionary<NSString *, id> *
+RCTJSErrorFromCodeMessageAndNSError(NSString *code, NSString *message, NSError *__nullable error)
 {
   NSString *errorMessage;
   NSArray<NSString *> *stackTrace = [NSThread callStackSymbols];

diff --git a/...ages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/...ages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -112,8 +112,7 @@ - (UIView *)loadingView
 
 - (void)setLoadingView:(UIView *)loadingView
 {
-  super.activityIndicatorViewFactory = ^UIView *(void)
-  {
+  super.activityIndicatorViewFactory = ^UIView *(void) {
     return loadingView;
   };
 }

diff --git a/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h b/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h
@@ -16,7 +16,7 @@ RCT_EXTERN_C_BEGIN
 // Only to be used for testing and internal tooling. Do not use this in
 // production.
 void RCTAccessibilityManagerSetIsVoiceOverEnabled(
-    RCTAccessibilityManager* accessibilityManager,
+    RCTAccessibilityManager *accessibilityManager,
     BOOL isVoiceOverEnabled);
 
 RCT_EXTERN_C_END

diff --git a/packages/react-native/React/CoreModules/RCTPlatform.mm b/packages/react-native/React/CoreModules/RCTPlatform.mm
@@ -69,18 +69,20 @@ - (dispatch_queue_t)methodQueue
     UIDevice *device = [UIDevice currentDevice];
     auto versions = RCTGetReactNativeVersion();
     constants = typedConstants<JS::NativePlatformConstantsIOS::Constants>({
-      .forceTouchAvailable = RCTForceTouchAvailable() ? true : false, .osVersion = [device systemVersion],
-      .systemName = [device systemName], .interfaceIdiom = interfaceIdiom([device userInterfaceIdiom]),
-      .isTesting = RCTRunningInTestEnvironment() ? true : false,
-      .reactNativeVersion = JS::NativePlatformConstantsIOS::ConstantsReactNativeVersion::Builder(
-          {.minor = [versions[@"minor"] doubleValue],
-           .major = [versions[@"major"] doubleValue],
-           .patch = [versions[@"patch"] doubleValue],
-           .prerelease = [versions[@"prerelease"] isKindOfClass:[NSNull class]]
-               ? std::optional<double>{}
-               : [versions[@"prerelease"] doubleValue]}),
+        .forceTouchAvailable = RCTForceTouchAvailable() ? true : false,
+        .osVersion = [device systemVersion],
+        .systemName = [device systemName],
+        .interfaceIdiom = interfaceIdiom([device userInterfaceIdiom]),
+        .isTesting = RCTRunningInTestEnvironment() ? true : false,
+        .reactNativeVersion = JS::NativePlatformConstantsIOS::ConstantsReactNativeVersion::Builder(
+            {.minor = [versions[@"minor"] doubleValue],
+             .major = [versions[@"major"] doubleValue],
+             .patch = [versions[@"patch"] doubleValue],
+             .prerelease = [versions[@"prerelease"] isKindOfClass:[NSNull class]]
+                 ? std::optional<double>{}
+                 : [versions[@"prerelease"] doubleValue]}),
 #if TARGET_OS_MACCATALYST
-      .isMacCatalyst = true,
+        .isMacCatalyst = true,
 #else
         .isMacCatalyst = false,
 #endif

diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm
@@ -107,7 +107,7 @@ int32_t getUniqueId()
   std::shared_ptr<JSExecutorFactory> factory_;
 };
 
-}
+} // namespace
 
 static void mapReactMarkerToPerformanceLogger(
     const ReactMarker::ReactMarkerId markerId,

diff --git a/packages/react-native/React/CxxBridge/RCTObjcExecutor.mm b/packages/react-native/React/CxxBridge/RCTObjcExecutor.mm
@@ -129,7 +129,7 @@ virtual void setGlobalVariable(std::string propName, std::unique_ptr<const JSBig
   RCTJavaScriptCallback m_jsCallback;
 };
 
-}
+} // namespace
 
 RCTObjcExecutorFactory::RCTObjcExecutorFactory(id<RCTJavaScriptExecutor> jse, RCTJavaScriptCompleteBlock errorBlock)
     : m_jse(jse), m_errorBlock(errorBlock)

diff --git a/packages/react-native/React/CxxModule/RCTCxxModule.h b/packages/react-native/React/CxxModule/RCTCxxModule.h
@@ -13,7 +13,7 @@
 
 namespace facebook::xplat::module {
 class CxxModule;
-} // namespace facebook::react::module
+} // namespace facebook::xplat::module
 
 /**
  * Subclass RCTCxxModule to use cross-platform CxxModule on iOS.

diff --git a/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h b/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h
@@ -19,7 +19,7 @@ class RCTImageResponseObserverProxy final : public ImageResponseObserver {
  public:
   RCTImageResponseObserverProxy(id<RCTImageResponseDelegate> delegate = nil);
 
-  void didReceiveImage(const ImageResponse& imageResponse) const override;
+  void didReceiveImage(const ImageResponse &imageResponse) const override;
   void didReceiveProgress(float progress) const override;
   void didReceiveFailure() const override;
 

diff --git a/packages/react-native/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm b/packages/react-native/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm
@@ -24,7 +24,7 @@
 {
   return [[NSString alloc] initWithBytes:(const char *)view.data() length:view.size() encoding:NSUTF8StringEncoding];
 }
-}
+} // namespace
 @interface RCTCxxInspectorWebSocketAdapter () <SRWebSocketDelegate> {
   std::weak_ptr<IWebSocketDelegate> _delegate;
   SRWebSocket *_webSocket;