Skip to content

Commit 08365b9

Browse files
krystofwoldrichantonis
krystofwoldrich
and
antonis
authored
chore(tooling): Add clang-format (#4229)
Co-authored-by: Antonis Lilis <[email protected]>
1 parent 2a32d81 commit 08365b9

File tree

61 files changed

+1763
-1547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1763
-1547
lines changed

‎.clang-format

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
BasedOnStyle: WebKit
2+
IndentWidth: 4
3+
IndentPPDirectives: AfterHash
4+
ColumnLimit: 100
5+
AlwaysBreakAfterDefinitionReturnType: All
6+
PointerAlignment: Right

‎package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@
77
"clean": "lerna run clean",
88
"circularDepCheck": "lerna run circularDepCheck",
99
"test": "lerna run test",
10-
"fix": "run-s fix:lerna fix:android",
10+
"fix": "run-s fix:lerna fix:android fix:clang",
1111
"fix:lerna": "lerna run fix",
1212
"fix:android": "run-s 'java:format fix' java:pmd",
13-
"lint": "run-s lint:lerna lint:android",
13+
"fix:clang": "run-s 'clang:format fix'",
14+
"lint": "run-s lint:lerna lint:android lint:clang",
1415
"lint:lerna": "lerna run lint",
1516
"lint:android": "run-s 'java:format lint' java:pmd",
17+
"lint:clang": "run-s 'clang:format lint'",
1618
"java:format": "./scripts/google-java-format.sh",
1719
"java:pmd": "./scripts/pmd.sh",
20+
"clang:format": "./scripts/clang-format.sh",
1821
"run-ios": "cd samples/react-native && yarn react-native run-ios",
1922
"run-android": "cd samples/react-native && yarn react-native run-android",
2023
"set-version-samples": "lerna run set-version"
2124
},
2225
"devDependencies": {
2326
"@sentry/cli": "2.38.1",
27+
"clang-format": "^1.8.0",
2428
"downlevel-dts": "^0.11.0",
2529
"google-java-format": "^1.4.0",
2630
"lerna": "^8.1.8",

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryCocoaTesterTests-Bridging-Header.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
// Use this file to import your target's public headers that you would like to expose to Swift.
33
//
44

5-
#import "RNSentryReplayBreadcrumbConverter.h"
65
#import "RNSentryBreadcrumb.h"
6+
#import "RNSentryReplayBreadcrumbConverter.h"

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#import "SentryFramesTracker.h"
12
#import <Foundation/Foundation.h>
23
#import <RNSentry/RNSentry.h>
3-
#import "SentryFramesTracker.h"
44

55
@interface
66
SentrySDK (PrivateTests)
7-
- (nullable SentryOptions *) options;
7+
- (nullable SentryOptions *)options;
88
@end
99

1010
@interface SentryDependencyContainer : NSObject

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#import "RNSentryDependencyContainerTests.h"
2+
#import "RNSentryDependencyContainer.h"
23
#import <OCMock/OCMock.h>
34
#import <UIKit/UIKit.h>
45
#import <XCTest/XCTest.h>
5-
#import "RNSentryDependencyContainer.h"
66

77
@interface RNSentryDependencyContainerTests : XCTestCase
88

@@ -12,17 +12,20 @@ @implementation RNSentryDependencyContainerTests
1212

1313
- (void)testRNSentryDependencyContainerInitializesFrameTracker
1414
{
15-
XCTAssertNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
15+
XCTAssertNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
1616

17-
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
18-
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
17+
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
18+
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
19+
.andReturn(sentryDependencyContainerMock);
1920

20-
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
21-
OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
21+
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
22+
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
23+
.andReturn(frameTrackerMock);
2224

23-
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
24-
[[RNSentryDependencyContainer sharedInstance] initializeFramesTrackerListenerWith: emitNewFrameEvent];
25-
XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
25+
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
26+
[[RNSentryDependencyContainer sharedInstance]
27+
initializeFramesTrackerListenerWith:emitNewFrameEvent];
28+
XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);
2629
}
2730

2831
@end

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
#import "SentryFramesTracker.h"
12
#import <Foundation/Foundation.h>
23
#import <RNSentry/RNSentry.h>
3-
#import "SentryFramesTracker.h"
44

55
@interface
66
SentrySDK (PrivateTests)
7-
- (nullable SentryOptions *) options;
7+
- (nullable SentryOptions *)options;
88
@end
99

1010
@interface SentryDependencyContainer : NSObject

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m

+42-32
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#import "RNSentryFramesTrackerListenerTests.h"
2+
#import "RNSentryDependencyContainer.h"
23
#import <OCMock/OCMock.h>
34
#import <UIKit/UIKit.h>
45
#import <XCTest/XCTest.h>
5-
#import "RNSentryDependencyContainer.h"
66

77
@interface RNSentryFramesTrackerListenerTests : XCTestCase
88

@@ -12,58 +12,68 @@ @implementation RNSentryFramesTrackerListenerTests
1212

1313
- (void)testRNSentryFramesTrackerCallsGivenEventEmitterOnNewFrame
1414
{
15-
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
16-
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
15+
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
16+
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
17+
.andReturn(sentryDependencyContainerMock);
1718

18-
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
19-
OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
19+
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
20+
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
21+
.andReturn(frameTrackerMock);
2022

21-
XCTestExpectation *blockExpectation = [self expectationWithDescription:@"Block Expectation"];
23+
XCTestExpectation *blockExpectation = [self expectationWithDescription:@"Block Expectation"];
2224

23-
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {
24-
XCTAssertTrue([newFrameTimestampInSeconds isKindOfClass:[NSNumber class]], @"The variable should be of type NSNumber.");
25-
[blockExpectation fulfill];
26-
};
25+
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {
26+
XCTAssertTrue([newFrameTimestampInSeconds isKindOfClass:[NSNumber class]],
27+
@"The variable should be of type NSNumber.");
28+
[blockExpectation fulfill];
29+
};
2730

28-
RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
29-
andEventEmitter: mockEventEmitter];
31+
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
32+
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
33+
andEventEmitter:mockEventEmitter];
3034

31-
[actualListener framesTrackerHasNewFrame: [NSDate date]];
32-
[self waitForExpectationsWithTimeout:1.0 handler:nil];
35+
[actualListener framesTrackerHasNewFrame:[NSDate date]];
36+
[self waitForExpectationsWithTimeout:1.0 handler:nil];
3337
}
3438

3539
- (void)testRNSentryFramesTrackerIsOneTimeListener
3640
{
37-
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
38-
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
41+
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
42+
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
43+
.andReturn(sentryDependencyContainerMock);
3944

40-
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
41-
OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
45+
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
46+
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
47+
.andReturn(frameTrackerMock);
4248

43-
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
49+
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
4450

45-
RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
46-
andEventEmitter: mockEventEmitter];
51+
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
52+
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
53+
andEventEmitter:mockEventEmitter];
4754

48-
[actualListener framesTrackerHasNewFrame: [NSDate date]];
49-
OCMVerify([frameTrackerMock removeListener:actualListener]);
55+
[actualListener framesTrackerHasNewFrame:[NSDate date]];
56+
OCMVerify([frameTrackerMock removeListener:actualListener]);
5057
}
5158

5259
- (void)testRNSentryFramesTrackerAddsItselfAsListener
5360
{
54-
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
55-
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance])).andReturn(sentryDependencyContainerMock);
61+
id sentryDependencyContainerMock = OCMClassMock([SentryDependencyContainer class]);
62+
OCMStub(ClassMethod([sentryDependencyContainerMock sharedInstance]))
63+
.andReturn(sentryDependencyContainerMock);
5664

57-
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
58-
OCMStub([(SentryDependencyContainer*) sentryDependencyContainerMock framesTracker]).andReturn(frameTrackerMock);
65+
id frameTrackerMock = OCMClassMock([SentryFramesTracker class]);
66+
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
67+
.andReturn(frameTrackerMock);
5968

60-
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
69+
RNSentryEmitNewFrameEvent mockEventEmitter = ^(NSNumber *newFrameTimestampInSeconds) {};
6170

62-
RNSentryFramesTrackerListener* actualListener = [[RNSentryFramesTrackerListener alloc] initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
63-
andEventEmitter: mockEventEmitter];
71+
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
72+
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
73+
andEventEmitter:mockEventEmitter];
6474

65-
[actualListener startListening];
66-
OCMVerify([frameTrackerMock addListener:actualListener]);
75+
[actualListener startListening];
76+
OCMVerify([frameTrackerMock addListener:actualListener]);
6777
}
6878

6979
@end

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#import <XCTest/XCTest.h>
21
#import "RNSentryOnDrawReporter.h"
2+
#import <XCTest/XCTest.h>
33

44
@interface RNSentryOnDrawReporterTests : XCTestCase
55

@@ -9,8 +9,8 @@ @implementation RNSentryOnDrawReporterTests
99

1010
- (void)testRNSentryOnDrawReporterViewIsAvailableWhenUIKitIs
1111
{
12-
RNSentryOnDrawReporterView* view = [[RNSentryOnDrawReporterView alloc] init];
13-
XCTAssertNotNil(view);
12+
RNSentryOnDrawReporterView *view = [[RNSentryOnDrawReporterView alloc] init];
13+
XCTAssertNotNil(view);
1414
}
1515

1616
@end

‎packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
@interface
55
SentrySDK (PrivateTests)
6-
- (nullable SentryOptions *) options;
6+
- (nullable SentryOptions *)options;
77
@end
88

99
@interface SentryBinaryImageInfo : NSObject

0 commit comments

Comments
 (0)