Skip to content

Commit 331e6ca

Browse files
patch clang-format and run it
1 parent dbad33e commit 331e6ca

20 files changed

Lines changed: 98 additions & 114 deletions

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentry+Test.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#import <RNSentry/RNSentry.h>
22

3-
@interface
4-
RNSentry (RNSentryInternal)
3+
@interface RNSentry (RNSentryInternal)
54

65
+ (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
76
otherUserKeys:(NSDictionary *)userDataKeys;

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryDependencyContainerTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ - (void)testRNSentryDependencyContainerInitializesFrameTracker
2222
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
2323
.andReturn(frameTrackerMock);
2424

25-
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {};
25+
RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) { };
2626
[[RNSentryDependencyContainer sharedInstance]
2727
initializeFramesTrackerListenerWith:emitNewFrameEvent];
2828
XCTAssertNotNil([[RNSentryDependencyContainer sharedInstance] framesTrackerListener]);

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryFramesTrackerListenerTests.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ - (void)testRNSentryFramesTrackerIsOneTimeListener
4646
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
4747
.andReturn(frameTrackerMock);
4848

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

5151
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
5252
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]
@@ -66,7 +66,7 @@ - (void)testRNSentryFramesTrackerAddsItselfAsListener
6666
OCMStub([(SentryDependencyContainer *)sentryDependencyContainerMock framesTracker])
6767
.andReturn(frameTrackerMock);
6868

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

7171
RNSentryFramesTrackerListener *actualListener = [[RNSentryFramesTrackerListener alloc]
7272
initWithSentryFramesTracker:[[SentryDependencyContainer sharedInstance] framesTracker]

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporter+Test.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#import "RNSentryOnDrawReporter.h"
22
#import <Foundation/Foundation.h>
33

4-
@interface
5-
RNSentryOnDrawReporterView (Testing)
4+
@interface RNSentryOnDrawReporterView (Testing)
65

76
+ (instancetype)createWithMockedListener;
87
- (RNSentryEmitNewFrameEvent)createEmitNewFrameEvent;

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporter+Test.mm

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ - (void)framesTrackerHasNewFrame:(nonnull NSDate *)newFrameDate
2828

2929
@end
3030

31-
@implementation
32-
RNSentryOnDrawReporterView (Testing)
31+
@implementation RNSentryOnDrawReporterView (Testing)
3332

3433
+ (instancetype)createWithMockedListener
3534
{

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
@class SentryOptions;
55

6-
@interface
7-
SentrySDKInternal (PrivateTests)
6+
@interface SentrySDKInternal (PrivateTests)
87

98
+ (nullable SentryOptions *)options;
109
@end

packages/core/ios/RNSentry+fetchNativeStack.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
// This method was moved to a new category so we can use `@import Sentry` to use Sentry's Swift
1818
// classes
19-
@implementation
20-
RNSentry (fetchNativeStack)
19+
@implementation RNSentry (fetchNativeStack)
2120

2221
- (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
2322
symbolicate:(SymbolicateCallbackType)symbolicate

packages/core/ios/RNSentry.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ typedef int (*SymbolicateCallbackType)(const void *, Dl_info *);
2828

2929
@end
3030

31-
@interface
32-
RNSentry (fetchNativeStack)
31+
@interface RNSentry (fetchNativeStack)
3332

3433
- (NSDictionary *_Nonnull)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAddr
3534
symbolicate:(SymbolicateCallbackType)symbolicate;

packages/core/ios/RNSentry.mm

Lines changed: 42 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ - (instancetype)init
8787
}
8888

8989
RCT_EXPORT_MODULE()
90-
RCT_EXPORT_METHOD(initNativeSdk
91-
: (NSDictionary *_Nonnull)options resolve
92-
: (RCTPromiseResolveBlock)resolve rejecter
93-
: (RCTPromiseRejectBlock)reject)
90+
RCT_EXPORT_METHOD(initNativeSdk : (NSDictionary *_Nonnull)options resolve : (
91+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
9492
{
9593
NSError *error = nil;
9694
SentryOptions *sentryOptions = [self createOptionsWithDictionary:options error:&error];
@@ -200,8 +198,7 @@ - (BOOL)shouldIgnoreError:(NSString *)message
200198
- (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)options
201199
error:(NSError *_Nonnull *_Nonnull)errorPointer
202200
{
203-
SentryBeforeSendEventCallback beforeSend = ^SentryEvent *(SentryEvent *event)
204-
{
201+
SentryBeforeSendEventCallback beforeSend = ^SentryEvent *(SentryEvent *event) {
205202
// We don't want to send an event after startup that came from a Unhandled JS Exception of
206203
// React Native because we sent it already before the app crashed.
207204
if (nil != event.exceptions.firstObject.type &&
@@ -292,7 +289,7 @@ - (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
292289
id enableLogsValue = [mutableOptions valueForKey:@"enableLogs"];
293290
if ([enableLogsValue isKindOfClass:[NSNumber class]]) {
294291
[RNSentryExperimentalOptions setEnableLogs:[enableLogsValue boolValue]
295-
sentryOptions:sentryOptions];
292+
sentryOptions:sentryOptions];
296293
}
297294
}
298295
[self trySetIgnoreErrors:mutableOptions];
@@ -362,9 +359,8 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
362359
event.tags = newTags;
363360
}
364361

365-
RCT_EXPORT_METHOD(initNativeReactNavigationNewFrameTracking
366-
: (RCTPromiseResolveBlock)resolve rejecter
367-
: (RCTPromiseRejectBlock)reject)
362+
RCT_EXPORT_METHOD(initNativeReactNavigationNewFrameTracking : (
363+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
368364
{
369365
#if SENTRY_HAS_UIKIT
370366
if ([[NSThread currentThread] isMainThread]) {
@@ -406,19 +402,17 @@ - (void)stopObserving
406402
return @[ RNSentryNewFrameEvent ];
407403
}
408404

409-
RCT_EXPORT_METHOD(fetchNativeSdkInfo
410-
: (RCTPromiseResolveBlock)resolve rejecter
411-
: (RCTPromiseRejectBlock)reject)
405+
RCT_EXPORT_METHOD(
406+
fetchNativeSdkInfo : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
412407
{
413408
resolve(@ {
414409
@"name" : PrivateSentrySDKOnly.getSdkName,
415410
@"version" : PrivateSentrySDKOnly.getSdkVersionString
416411
});
417412
}
418413

419-
RCT_EXPORT_METHOD(fetchModules
420-
: (RCTPromiseResolveBlock)resolve rejecter
421-
: (RCTPromiseRejectBlock)reject)
414+
RCT_EXPORT_METHOD(
415+
fetchModules : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
422416
{
423417
NSString *filePath = [[NSBundle mainBundle] pathForResource:@"modules" ofType:@"json"];
424418
NSString *modulesString = [NSString stringWithContentsOfFile:filePath
@@ -433,15 +427,14 @@ - (void)stopObserving
433427
return packageName;
434428
}
435429

436-
RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, fetchNativeStackFramesBy
437-
: (NSArray *)instructionsAddr)
430+
RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(
431+
NSDictionary *, fetchNativeStackFramesBy : (NSArray *)instructionsAddr)
438432
{
439433
return [self fetchNativeStackFramesBy:instructionsAddr symbolicate:dladdr];
440434
}
441435

442-
RCT_EXPORT_METHOD(fetchNativeLogAttributes
443-
: (RCTPromiseResolveBlock)resolve rejecter
444-
: (RCTPromiseRejectBlock)reject)
436+
RCT_EXPORT_METHOD(fetchNativeLogAttributes : (RCTPromiseResolveBlock)resolve rejecter : (
437+
RCTPromiseRejectBlock)reject)
445438
{
446439
__block NSMutableDictionary<NSString *, id> *result = [NSMutableDictionary new];
447440

@@ -491,9 +484,8 @@ - (void)stopObserving
491484
resolve(result);
492485
}
493486

494-
RCT_EXPORT_METHOD(fetchNativeDeviceContexts
495-
: (RCTPromiseResolveBlock)resolve rejecter
496-
: (RCTPromiseRejectBlock)reject)
487+
RCT_EXPORT_METHOD(fetchNativeDeviceContexts : (RCTPromiseResolveBlock)resolve rejecter : (
488+
RCTPromiseRejectBlock)reject)
497489
{
498490
if (PrivateSentrySDKOnly.options.debug) {
499491
NSLog(@"Bridge call to: deviceContexts");
@@ -553,9 +545,8 @@ - (void)stopObserving
553545
resolve(serializedScope);
554546
}
555547

556-
RCT_EXPORT_METHOD(fetchNativeAppStart
557-
: (RCTPromiseResolveBlock)resolve rejecter
558-
: (RCTPromiseRejectBlock)reject)
548+
RCT_EXPORT_METHOD(
549+
fetchNativeAppStart : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
559550
{
560551
#if SENTRY_HAS_UIKIT
561552
NSDictionary<NSString *, id> *measurements =
@@ -580,9 +571,8 @@ - (void)stopObserving
580571
#endif
581572
}
582573

583-
RCT_EXPORT_METHOD(fetchNativeFrames
584-
: (RCTPromiseResolveBlock)resolve rejecter
585-
: (RCTPromiseRejectBlock)reject)
574+
RCT_EXPORT_METHOD(
575+
fetchNativeFrames : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
586576
{
587577

588578
#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
@@ -611,9 +601,8 @@ - (void)stopObserving
611601
#endif
612602
}
613603

614-
RCT_EXPORT_METHOD(fetchNativeRelease
615-
: (RCTPromiseResolveBlock)resolve rejecter
616-
: (RCTPromiseRejectBlock)reject)
604+
RCT_EXPORT_METHOD(
605+
fetchNativeRelease : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
617606
{
618607
NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
619608
resolve(@ {
@@ -623,11 +612,8 @@ - (void)stopObserving
623612
});
624613
}
625614

626-
RCT_EXPORT_METHOD(captureEnvelope
627-
: (NSString *_Nonnull)rawBytes options
628-
: (NSDictionary *_Nonnull)options resolve
629-
: (RCTPromiseResolveBlock)resolve rejecter
630-
: (RCTPromiseRejectBlock)reject)
615+
RCT_EXPORT_METHOD(captureEnvelope : (NSString *_Nonnull)rawBytes options : (NSDictionary *_Nonnull)
616+
options resolve : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
631617
{
632618
NSData *data = [[NSData alloc] initWithBase64EncodedString:rawBytes options:0];
633619

@@ -650,9 +636,8 @@ - (void)stopObserving
650636
resolve(@YES);
651637
}
652638

653-
RCT_EXPORT_METHOD(captureScreenshot
654-
: (RCTPromiseResolveBlock)resolve rejecter
655-
: (RCTPromiseRejectBlock)reject)
639+
RCT_EXPORT_METHOD(
640+
captureScreenshot : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
656641
{
657642
#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
658643
NSArray<NSData *> *rawScreenshots = [PrivateSentrySDKOnly captureScreenshots];
@@ -684,9 +669,8 @@ - (void)stopObserving
684669
#endif
685670
}
686671

687-
RCT_EXPORT_METHOD(fetchViewHierarchy
688-
: (RCTPromiseResolveBlock)resolve rejecter
689-
: (RCTPromiseRejectBlock)reject)
672+
RCT_EXPORT_METHOD(
673+
fetchViewHierarchy : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
690674
{
691675
#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
692676
NSData *rawViewHierarchy = [PrivateSentrySDKOnly captureViewHierarchy];
@@ -800,9 +784,8 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
800784

801785
RCT_EXPORT_METHOD(crash) { [SentrySDKWrapper crash]; }
802786

803-
RCT_EXPORT_METHOD(closeNativeSdk
804-
: (RCTPromiseResolveBlock)resolve rejecter
805-
: (RCTPromiseRejectBlock)reject)
787+
RCT_EXPORT_METHOD(
788+
closeNativeSdk : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
806789
{
807790
[SentrySDKWrapper close];
808791
resolve(@YES);
@@ -821,10 +804,8 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
821804
// the 'tracesSampleRate' or 'tracesSampler' option.
822805
}
823806

824-
RCT_EXPORT_METHOD(captureReplay
825-
: (BOOL)isHardCrash resolver
826-
: (RCTPromiseResolveBlock)resolve rejecter
827-
: (RCTPromiseRejectBlock)reject)
807+
RCT_EXPORT_METHOD(captureReplay : (BOOL)isHardCrash resolver : (
808+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
828809
{
829810
#if SENTRY_TARGET_REPLAY_SUPPORTED
830811
[PrivateSentrySDKOnly captureReplay];
@@ -834,10 +815,8 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
834815
#endif
835816
}
836817

837-
RCT_EXPORT_METHOD(getDataFromUri
838-
: (NSString *_Nonnull)uri resolve
839-
: (RCTPromiseResolveBlock)resolve rejecter
840-
: (RCTPromiseRejectBlock)reject)
818+
RCT_EXPORT_METHOD(getDataFromUri : (NSString *_Nonnull)uri resolve : (
819+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
841820
{
842821
#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
843822
NSURL *fileURL = [NSURL URLWithString:uri];
@@ -1020,9 +999,8 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
1020999
#endif
10211000
}
10221001

1023-
RCT_EXPORT_METHOD(crashedLastRun
1024-
: (RCTPromiseResolveBlock)resolve rejecter
1025-
: (RCTPromiseRejectBlock)reject)
1002+
RCT_EXPORT_METHOD(
1003+
crashedLastRun : (RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
10261004
{
10271005
resolve(@([SentrySDKWrapper crashedLastRun]));
10281006
}
@@ -1036,17 +1014,14 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
10361014
}
10371015
#endif
10381016

1039-
RCT_EXPORT_METHOD(getNewScreenTimeToDisplay
1040-
: (RCTPromiseResolveBlock)resolve rejecter
1041-
: (RCTPromiseRejectBlock)reject)
1017+
RCT_EXPORT_METHOD(getNewScreenTimeToDisplay : (RCTPromiseResolveBlock)resolve rejecter : (
1018+
RCTPromiseRejectBlock)reject)
10421019
{
10431020
[_timeToDisplay getTimeToDisplay:resolve];
10441021
}
10451022

1046-
RCT_EXPORT_METHOD(popTimeToDisplayFor
1047-
: (NSString *)key resolver
1048-
: (RCTPromiseResolveBlock)resolve rejecter
1049-
: (RCTPromiseRejectBlock)reject)
1023+
RCT_EXPORT_METHOD(popTimeToDisplayFor : (NSString *)key resolver : (
1024+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
10501025
{
10511026
resolve([RNSentryTimeToDisplay popTimeToDisplayFor:key]);
10521027
}
@@ -1057,10 +1032,8 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
10571032
return @YES; // The return ensures that the method is synchronous
10581033
}
10591034

1060-
RCT_EXPORT_METHOD(encodeToBase64
1061-
: (NSArray *)array resolver
1062-
: (RCTPromiseResolveBlock)resolve rejecter
1063-
: (RCTPromiseRejectBlock)reject)
1035+
RCT_EXPORT_METHOD(encodeToBase64 : (NSArray *)array resolver : (
1036+
RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject)
10641037
{
10651038
NSUInteger count = array.count;
10661039
uint8_t *bytes = (uint8_t *)malloc(count);

packages/core/ios/RNSentryExperimentalOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
2626
* @param sentryOptions The SentryOptions instance to configure
2727
* @param enabled Whether logs from sentry Cocoa should be enabled
2828
*/
29-
+ (void)setEnableLogs:(BOOL)enabled sentryOptions:(SentryOptions *)sentryOptions;
29+
+ (void)setEnableLogs:(BOOL)enabled sentryOptions:(SentryOptions *)sentryOptions;
3030

3131
@end
3232

0 commit comments

Comments
 (0)