chore(tooling): Add clang-format (#4229)

Co-authored-by: Antonis Lilis <[email protected]>
getsentry · Nov 5, 2024 · 08365b9 · 08365b9
1 parent 2a32d81
commit 08365b9
Show file tree

Hide file tree

Showing 61 changed files with 1,763 additions and 1,547 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,6 @@
+BasedOnStyle: WebKit
+IndentWidth: 4
+IndentPPDirectives: AfterHash
+ColumnLimit: 100
+AlwaysBreakAfterDefinitionReturnType: All
+PointerAlignment: Right
diff --git a/package.json b/package.json
@@ -7,20 +7,24 @@
     "clean": "lerna run clean",
     "circularDepCheck": "lerna run circularDepCheck",
     "test": "lerna run test",
-    "fix": "run-s fix:lerna fix:android",
+    "fix": "run-s fix:lerna fix:android fix:clang",
     "fix:lerna": "lerna run fix",
     "fix:android": "run-s 'java:format fix' java:pmd",
-    "lint": "run-s lint:lerna lint:android",
+    "fix:clang": "run-s 'clang:format fix'",
+    "lint": "run-s lint:lerna lint:android lint:clang",
     "lint:lerna": "lerna run lint",
     "lint:android": "run-s 'java:format lint' java:pmd",
+    "lint:clang": "run-s 'clang:format lint'",
     "java:format": "./scripts/google-java-format.sh",
     "java:pmd": "./scripts/pmd.sh",
+    "clang:format": "./scripts/clang-format.sh",
     "run-ios": "cd samples/react-native && yarn react-native run-ios",
     "run-android": "cd samples/react-native && yarn react-native run-android",
     "set-version-samples": "lerna run set-version"
   },
   "devDependencies": {
     "@sentry/cli": "2.38.1",
+    "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",
     "lerna": "^8.1.8",

diff --git a/...e/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryCocoaTesterTests-Bridging-Header.h b/...e/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryCocoaTesterTests-Bridging-Header.h
@@ -2,5 +2,5 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "RNSentryReplayBreadcrumbConverter.h"
 #import "RNSentryBreadcrumb.h"
+#import "RNSentryReplayBreadcrumbConverter.h"
diff --git a/...ages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.h b/...ages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.h
@@ -1,10 +1,10 @@
+#import "SentryFramesTracker.h"
 #import <Foundation/Foundation.h>
 #import <RNSentry/RNSentry.h>
-#import "SentryFramesTracker.h"
 
 @interface
 SentrySDK (PrivateTests)
-- (nullable SentryOptions *) options;
+- (nullable SentryOptions *)options;
 @end
 
 @interface SentryDependencyContainer : NSObject

diff --git a/...ages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m b/...ages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m
@@ -1,8 +1,8 @@
 #import "RNSentryDependencyContainerTests.h"
+#import "RNSentryDependencyContainer.h"
 #import <OCMock/OCMock.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-#import "RNSentryDependencyContainer.h"
 
 @interface RNSentryDependencyContainerTests : XCTestCase
 
@@ -12,17 +12,20 @@ @implementation RNSentryDependencyContainerTests
 
 - (void)testRNSentryDependencyContainerInitializesFrameTracker
 {
-  XCTAssertNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
+    XCTAssertNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
 
-  id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
-  OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
+    id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
+    OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
+        .andReturn(sentryDependencyContainerMock);
 
-  id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
-  OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
+    id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
+    OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
+        .andReturn(frameTrackerMock);
 
-  RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
-  [[RNSentryDependencyContainer sharedInstance] initializeFramesTrackerListenerWith: emitNewFrameEvent];
-  XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
+    RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
+    [[RNSentryDependencyContainer sharedInstance]
+        initializeFramesTrackerListenerWith:emitNewFrameEvent];
+    XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
 }
 
 @end
diff --git a/...es/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.h b/...es/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.h
@@ -1,10 +1,10 @@
+#import "SentryFramesTracker.h"
 #import <Foundation/Foundation.h>
 #import <RNSentry/RNSentry.h>
-#import "SentryFramesTracker.h"
 
 @interface
 SentrySDK (PrivateTests)
-- (nullable SentryOptions *) options;
+- (nullable SentryOptions *)options;
 @end
 
 @interface SentryDependencyContainer : NSObject

diff --git a/...es/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m b/...es/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m
@@ -1,8 +1,8 @@
 #import "RNSentryFramesTrackerListenerTests.h"
+#import "RNSentryDependencyContainer.h"
 #import <OCMock/OCMock.h>
 #import <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
-#import "RNSentryDependencyContainer.h"
 
 @interface RNSentryFramesTrackerListenerTests : XCTestCase
 
@@ -12,58 +12,68 @@ @implementation RNSentryFramesTrackerListenerTests
 
 - (void)testRNSentryFramesTrackerCallsGivenEventEmitterOnNewFrame
 {
-  id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
-  OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
+    id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
+    OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
+        .andReturn(sentryDependencyContainerMock);
 
-  id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
-  OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
+    id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
+    OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
+        .andReturn(frameTrackerMock);
 
-  XCTestExpectation *blockExpectation = [self expectationWithDescription:@"Block Expectation"];
+    XCTestExpectation *blockExpectation = [self expectationWithDescription:@"Block Expectation"];
 
-  RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {
-    XCTAssertTrue([newFrameTimestampInSeconds isKindOfClass:[NSNumber class]], @"The variable should be of type NSNumber.");
-    [blockExpectation fulfill];
-  };
+    RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {
+        XCTAssertTrue([newFrameTimestampInSeconds isKindOfClass:[NSNumber class]],
+            @"The variable should be of type NSNumber.");
+        [blockExpectation fulfill];
+    };
 
-  RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
-                                                                                                     andEventEmitter: mockEventEmitter];
+    RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
+        initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
+                    andEventEmitter:mockEventEmitter];
 
-  [actualListener framesTrackerHasNewFrame: [NSDate date]];
-  [self waitForExpectationsWithTimeout:1.0 handler:nil];
+    [actualListener framesTrackerHasNewFrame:[NSDate date]];
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
 }
 
 - (void)testRNSentryFramesTrackerIsOneTimeListener
 {
-  id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
-  OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
+    id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
+    OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
+        .andReturn(sentryDependencyContainerMock);
 
-  id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
-  OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
+    id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
+    OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
+        .andReturn(frameTrackerMock);
 
-  RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
+    RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
 
-  RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
-                                                                                                     andEventEmitter: mockEventEmitter];
+    RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
+        initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
+                    andEventEmitter:mockEventEmitter];
 
-  [actualListener framesTrackerHasNewFrame: [NSDate date]];
-  OCMVerify([frameTrackerMock removeListener:actualListener]);
+    [actualListener framesTrackerHasNewFrame:[NSDate date]];
+    OCMVerify([frameTrackerMock removeListener:actualListener]);
 }
 
 - (void)testRNSentryFramesTrackerAddsItselfAsListener
 {
-  id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
-  OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
+    id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
+    OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
+        .andReturn(sentryDependencyContainerMock);
 
-  id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
-  OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
+    id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
+    OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
+        .andReturn(frameTrackerMock);
 
-  RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
+    RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
 
-  RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
-                                                                                                     andEventEmitter: mockEventEmitter];
+    RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
+        initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
+                    andEventEmitter:mockEventEmitter];
 
-  [actualListener startListening];
-  OCMVerify([frameTrackerMock addListener:actualListener]);
+    [actualListener startListening];
+    OCMVerify([frameTrackerMock addListener:actualListener]);
 }
 
 @end
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m
@@ -1,5 +1,5 @@
-#import <XCTest/XCTest.h>
 #import "RNSentryOnDrawReporter.h"
+#import <XCTest/XCTest.h>
 
 @interface RNSentryOnDrawReporterTests : XCTestCase
 
@@ -9,8 +9,8 @@ @implementation RNSentryOnDrawReporterTests
 
 - (void)testRNSentryOnDrawReporterViewIsAvailableWhenUIKitIs
 {
-  RNSentryOnDrawReporterView* view = [[RNSentryOnDrawReporterView alloc] init];
-  XCTAssertNotNil(view);
+    RNSentryOnDrawReporterView *view = [[RNSentryOnDrawReporterView alloc] init];
+    XCTAssertNotNil(view);
 }
 
 @end
diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h
@@ -3,7 +3,7 @@
 
 @interface
 SentrySDK (PrivateTests)
-- (nullable SentryOptions *) options;
+- (nullable SentryOptions *)options;
 @end
 
 @interface SentryBinaryImageInfo : NSObject