RollbarSwift: addressing PR comments

rollbar · Mar 16, 2021 · e9736c9 · e9736c9
1 parent 68099be
commit e9736c9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 28 deletions.
diff --git a/Demos/macosAppSwift/macosAppSwift/ContentView.swift b/Demos/macosAppSwift/macosAppSwift/ContentView.swift
@@ -83,7 +83,7 @@ func handleSwiftError() {
             self.generateObjCException();
         }
 
-        print("Guearded execution succeeded: \(success).")
+        print("Guarded execution succeeded: \(success).")
     }
 
     func createGuard() -> RollbarExceptionGuard {

diff --git a/RollbarSwift/Sources/RollbarSwift/RollbarExceptionGuard.m b/RollbarSwift/Sources/RollbarSwift/RollbarExceptionGuard.m
@@ -8,51 +8,52 @@
 #import "RollbarExceptionGuard.h"
 #import "RollbarTryCatch.h"
 
-@implementation RollbarExceptionGuard {
+@implementation RollbarExceptionGuard {    
 @private
     RollbarLogger *logger;
 }
 
 -(BOOL)tryExecute:(nonnull void(NS_NOESCAPE^)(void))block {
+
     NSError *error = nil;
     return [self execute:block error:&error];
 }
 
 -(BOOL)execute:(nonnull void(NS_NOESCAPE^)(void))tryBlock
-            error:(__autoreleasing NSError * _Nullable * _Nullable)error {
+         error:(__autoreleasing NSError * _Nullable * _Nullable)error {
 
     __block BOOL success = NO;
     __block NSError* exceptionError = nil;
 
     [RollbarTryCatch try:^(void) {
+
+        tryBlock();
+        success = YES;
+    }
+                   catch:^(NSException *exception) {
+
+        exceptionError = [self convertException:exception];
+
+        if (nil != self->logger) {
 
-            tryBlock();
-            success = YES;
-        }
-                       catch:^(NSException *exception) {
-
-            exceptionError = [self convertException:exception];
-
-            if (nil != self->logger) {
-
-                [self->logger log:RollbarLevel_Critical
-                        exception:exception
-                             data:nil
-                          context:RollbarExceptionGuard.className
-                 ];
-
-                [self->logger log:RollbarLevel_Critical
-                            error:exceptionError
-                             data:nil
-                          context:RollbarExceptionGuard.className
-                 ];
-            }
-
-            success = NO;
-        }
-                     finally:^{
+            [self->logger log:RollbarLevel_Critical
+                    exception:exception
+                         data:nil
+                      context:RollbarExceptionGuard.className
+             ];
 
+            [self->logger log:RollbarLevel_Critical
+                        error:exceptionError
+                         data:nil
+                      context:RollbarExceptionGuard.className
+             ];
         }
+
+        success = NO;
+    }
+                 finally:^{
+
+    }
      ];
 
     *error = exceptionError;