Source format

Author: lucasderraugh

GitUp/Application/AppDelegate.m

@@ -110,7 +110,7 @@ + (void)initialize {
   // Without this line, GitUp would instead immediately exit, with no crash log.
   // libgit2 has what looks like a built-in solution (`disable_signals()`), but it doesn't seem to work for us.
   signal(SIGPIPE, SIG_IGN);
-  
+
   NSDictionary* defaults = @{
     GICommitMessageViewUserDefaultKey_ShowInvisibleCharacters : @(YES),
     GICommitMessageViewUserDefaultKey_ShowMargins : @(YES),
@@ -178,20 +178,20 @@ - (void)handleDocumentCountChanged {
 }
 
 - (void)_showNotificationWithTitle:(NSString*)title action:(SEL)action message:(NSString*)format, ... NS_FORMAT_FUNCTION(3, 4) {
-    va_list arguments;
-    va_start(arguments, format);
-    NSString *string = [[NSString alloc] initWithFormat:format arguments:arguments];
-    va_end(arguments);
-
-    UNMutableNotificationContent *content = [[UNMutableNotificationContent alloc] init];
-    content.title = title;
-    content.body = string;
-    if (action) {
-      content.userInfo = @{kNotificationUserInfoKey_Action : NSStringFromSelector(action)};
-    }
+  va_list arguments;
+  va_start(arguments, format);
+  NSString* string = [[NSString alloc] initWithFormat:format arguments:arguments];
+  va_end(arguments);
+
+  UNMutableNotificationContent* content = [[UNMutableNotificationContent alloc] init];
+  content.title = title;
+  content.body = string;
+  if (action) {
+    content.userInfo = @{kNotificationUserInfoKey_Action : NSStringFromSelector(action)};
+  }
 
-    UNNotificationRequest *request = [UNNotificationRequest requestWithIdentifier:[[NSUUID UUID] UUIDString] content:content trigger:nil];
-    [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:request withCompletionHandler:nil];
+  UNNotificationRequest* request = [UNNotificationRequest requestWithIdentifier:[[NSUUID UUID] UUIDString] content:content trigger:nil];
+  [[UNUserNotificationCenter currentNotificationCenter] addNotificationRequest:request withCompletionHandler:nil];
 }
 
 #pragma mark - NSApplicationDelegate
@@ -219,15 +219,15 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification {
   [GILaunchServicesLocator setup];
 
   // Initialize user notification center
-  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+  UNUserNotificationCenter* center = [UNUserNotificationCenter currentNotificationCenter];
   [center setDelegate:self];
-  
+
   [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionSound | UNAuthorizationOptionBadge)
-    completionHandler:^(BOOL granted, NSError * _Nullable error) {
-      if (!granted) {
-        XLOG_INFO(@"User denied notification permissions");
-      }
-    }];
+                        completionHandler:^(BOOL granted, NSError* _Nullable error) {
+                          if (!granted) {
+                            XLOG_INFO(@"User denied notification permissions");
+                          }
+                        }];
 
   // Register finder context menu services.
   [NSApplication sharedApplication].servicesProvider = [ServicesProvider new];
@@ -575,8 +575,8 @@ - (void)updater:(SUUpdater*)updater willInstallUpdateOnQuit:(SUAppcastItem*)item
 
 #pragma mark - UNUserNotificationCenterDelegate
 
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler {
-  NSString *action = response.notification.request.content.userInfo[kNotificationUserInfoKey_Action];
+- (void)userNotificationCenter:(UNUserNotificationCenter*)center didReceiveNotificationResponse:(UNNotificationResponse*)response withCompletionHandler:(void (^)(void))completionHandler {
+  NSString* action = response.notification.request.content.userInfo[kNotificationUserInfoKey_Action];
   if (action) {
     [NSApp sendAction:NSSelectorFromString(action) to:self from:nil];
   }

GitUp/Application/Document.m

@@ -746,9 +746,9 @@ - (void)_updateStatusBar {
 // NSToolbar automatic validation fires very often and at unpredictable times so we just do everything by hand
 - (void)_updateToolBar {
   [_mainWindow.toolbar validateVisibleItems];
-  
-  NSSegmentedControl *segmentedControl = self.modeAndNavigationSegmentedControl;
-  NSString *windowMode = self.windowMode;
+
+  NSSegmentedControl* segmentedControl = self.modeAndNavigationSegmentedControl;
+  NSString* windowMode = self.windowMode;
   WindowModeID windowModeID = _WindowModeIDFromString(windowMode);
   if (_WindowModeIsPrimary(windowMode)) {
     [segmentedControl setImage:[NSImage imageNamed:@"circle.2.line.diagonal"] forSegment:kWindowModeID_Map];
@@ -761,20 +761,20 @@ - (void)_updateToolBar {
     [segmentedControl setSelectedSegment:windowModeID];
     segmentedControl.action = @selector(switchMode:);
   } else {
-    [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"arrow.down.forward.and.arrow.up.backward" accessibilityDescription: nil] forSegment:kNavigationAction_Exit];
+    [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"arrow.down.forward.and.arrow.up.backward" accessibilityDescription:nil] forSegment:kNavigationAction_Exit];
     [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"chevron.up" accessibilityDescription:nil] forSegment:kNavigationAction_Next];
     [segmentedControl setImage:[NSImage imageWithSystemSymbolName:@"chevron.down" accessibilityDescription:nil] forSegment:kNavigationAction_Previous];
     segmentedControl.trackingMode = NSSegmentSwitchTrackingMomentary;
     segmentedControl.action = @selector(navigate:);
   }
 }
 
-- (NSSegmentedControl *)modeAndNavigationSegmentedControl {
-  return (NSSegmentedControl *)self.navigateItem.primaryControl;
+- (NSSegmentedControl*)modeAndNavigationSegmentedControl {
+  return (NSSegmentedControl*)self.navigateItem.primaryControl;
 }
 
 - (void)_didBecomeActive:(NSNotification*)notification {
-  /** 
+  /**
    async dispatch on the main queue so we don't block
    NSApplicationDidBecomeActiveNotification while updating the repos
    */

GitUpKit/Components/GIDiffContentsViewController.m

@@ -551,7 +551,7 @@ - (NSView*)tableView:(NSTableView*)tableView viewForTableColumn:(NSTableColumn*)
           break;
       }
       if (data.conflict.ancestorFileMode == kGCFileMode_Commit) {
-        // Submodule conflict
+        //  Submodule conflict
         GISubmoduleConflictDiffCellView* view = [_tableView makeViewWithIdentifier:@"submodule_conflict" owner:self];
         view.statusTextField.stringValue = [NSString stringWithFormat:NSLocalizedString(@"This submodule has conflicts (%@)", nil), status];
         view.oursTextField.stringValue = data.conflict.ourBlobSHA1;
@@ -758,7 +758,7 @@ - (IBAction)markAsResolved:(id)sender {
 
 - (IBAction)chooseOurs:(id)sender {
   GIDiffContentData* data = (__bridge GIDiffContentData*)(void*)[(NSButton*)sender tag];
-  NSError *error;
+  NSError* error;
 
   [self.repository updateSubmoduleReferenceAtPath:data.conflict.path toCommitSHA1:data.conflict.ourBlobSHA1 error:&error];
 
@@ -773,8 +773,7 @@ - (IBAction)chooseOurs:(id)sender {
 
 - (IBAction)chooseTheirs:(id)sender {
   GIDiffContentData* data = (__bridge GIDiffContentData*)(void*)[(NSButton*)sender tag];
-  NSError *error;
-
+  NSError* error;
 
   [self.repository updateSubmoduleReferenceAtPath:data.conflict.path toCommitSHA1:data.conflict.theirBlobSHA1 error:&error];
 

GitUpKit/Core/GCDiff.m

@@ -358,22 +358,22 @@ - (void)_cacheDeltasIfNeeded {
     // Remove superfluous "untracked" deltas for conflicting submodules
     // Needed when the input _deltas looks like this:
     // 1: [Conflicted] "submodule"
-    // 2: [Untracked] "submodule/"
+    //  2: [Untracked] "submodule/"
     // Which happens every time there's a submodule entry that's a conflict
-    NSMutableArray<GCDiffDelta *> *deltasToFilterOut = [NSMutableArray array];
+    NSMutableArray<GCDiffDelta*>* deltasToFilterOut = [NSMutableArray array];
     for (GCDiffDelta* delta in _deltas) {
       if (delta.change == kGCFileDiffChange_Conflicted && delta.isSubmodule) {
-        // see if there's a superfluous untracked diff for that submodule and remove it
-        NSString *pathWithTrailingSlash = [NSString stringWithFormat:@"%@/", delta.canonicalPath];
+        //  see if there's a superfluous untracked diff for that submodule and remove it
+        NSString* pathWithTrailingSlash = [NSString stringWithFormat:@"%@/", delta.canonicalPath];
         for (GCDiffDelta* delta in _deltas) {
           if (delta.isSubmodule && [delta.canonicalPath isEqualToString:pathWithTrailingSlash]) {
             [deltasToFilterOut addObject:delta];
-            break; // there's only one so we can break out early if we've found it
+            break;  //  there's only one so we can break out early if we've found it
           }
         }
       }
     }
-    
+
     [_deltas removeObjectsInArray:deltasToFilterOut];
   }
 }

GitUpKit/Core/GCHistory.m

@@ -459,8 +459,7 @@ - (BOOL)iterateWithCommitBlock:(void (^)(GCHistoryCommit* commit, BOOL* stop))bl
   // Keep generating commit rows following parents (respectively children)
   if (GC_POINTER_LIST_COUNT(previousRow)) {
     __block BOOL success = NO;
-    BOOL(^commitBlock)
-    (GCHistoryCommit*) = ^(GCHistoryCommit* commit) {
+    BOOL (^commitBlock)(GCHistoryCommit*) = ^(GCHistoryCommit* commit) {
       XLOG_DEBUG_CHECK(!COMMIT_IS_PROCESSED(commit));
       BOOL ready = YES;
 
@@ -775,8 +774,7 @@ - (BOOL)_reloadHistory:(GCHistory*)history
   }
 
   // Find all other tips
-  BOOL(^enumerateBlock)
-  (git_reference*) = ^(git_reference* reference) {
+  BOOL (^enumerateBlock)(git_reference*) = ^(git_reference* reference) {
     GCReference* referenceObject = nil;
     if (git_reference_type(reference) != GIT_REF_SYMBOLIC) {  // Skip symbolic refs like "remote/origin/HEAD"
       git_commit* commit = NULL;
@@ -901,7 +899,7 @@ - (BOOL)_reloadHistory:(GCHistory*)history
   // Configure commit tree walker to start from tips
   CALL_LIBGIT2_FUNCTION_GOTO(cleanup, git_revwalk_new, &walker, self.private);
   git_revwalk_sorting(walker, GIT_SORT_NONE);
-  git_revwalk_add_hide_block(walker, ^int(const git_oid *commit_id) {
+  git_revwalk_add_hide_block(walker, ^int(const git_oid* commit_id) {
     return CFDictionaryContainsKey(lookup, commit_id);
   });
   if (historyTips) {

GitUpKit/Core/GCIndex.m

@@ -302,7 +302,7 @@ - (BOOL)_addEntry:(const git_index_entry*)entry toIndex:(git_index*)index error:
 }
 
 // This function adapts to handle submodules by directly using the commit OID and setting the correct file mode for submodules.
-- (BOOL)_addSubmoduleEntry:(const git_index_entry*)entry toIndex:(git_index*)index withCommitOid:(const git_oid *)commitOid error:(NSError**)error {
+- (BOOL)_addSubmoduleEntry:(const git_index_entry*)entry toIndex:(git_index*)index withCommitOid:(const git_oid*)commitOid error:(NSError**)error {
   git_index_entry copyEntry;
   bcopy(entry, &copyEntry, sizeof(git_index_entry));
   git_oid_cpy(&copyEntry.id, commitOid);
@@ -328,17 +328,17 @@ - (BOOL)addFileInWorkingDirectory:(NSString*)path toIndex:(GCIndex*)index error:
   git_index_entry__init_from_stat(&entry, &info, true);
 
   if (entry.mode == GIT_FILEMODE_COMMIT) {
-    GCSubmodule *submodule = [self lookupSubmoduleWithName:path error:error];
+    GCSubmodule* submodule = [self lookupSubmoduleWithName:path error:error];
     if (!submodule) {
       return NO;
     }
 
-    GCRepository *submoduleRepository = [[GCRepository alloc] initWithSubmodule:submodule error:error];
+    GCRepository* submoduleRepository = [[GCRepository alloc] initWithSubmodule:submodule error:error];
     if (!submoduleRepository) {
       return NO;
     }
 
-    GCCommit *headCommit;
+    GCCommit* headCommit;
     if (![submoduleRepository lookupHEADCurrentCommit:&headCommit branch:NULL error:error]) {
       return NO;
     }
@@ -536,10 +536,10 @@ - (BOOL)checkoutFileToWorkingDirectory:(NSString*)path fromIndex:(GCIndex*)index
 }
 
 - (BOOL)checkoutFilesToWorkingDirectory:(NSArray<NSString*>*)paths fromIndex:(GCIndex*)index error:(NSError**)error {
-	if ([paths count] == 0) {
-		return YES;
-	}
-	
+  if ([paths count] == 0) {
+    return YES;
+  }
+
   git_checkout_options options = GIT_CHECKOUT_OPTIONS_INIT;
   options.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_DONT_UPDATE_INDEX;  // There's no reason to update the index
   options.paths.count = paths.count;

GitUpKit/Core/GCLiveRepository+Conflicts.m

@@ -19,8 +19,6 @@ - (GCCommit*)resolveConflictsWithResolver:(id<GCMergeConflictResolver>)resolver
                             parentCommits:(NSArray*)parentCommits
                                   message:(NSString*)message
                                     error:(NSError**)error {
-
-
   // Save HEAD
   GCCommit* headCommit;
   GCLocalBranch* headBranch;

GitUpKit/Core/GCRepository+Bare.m

@@ -95,7 +95,7 @@ - (GCCommit*)cherryPickCommit:(GCCommit*)pickCommit
                       message:(NSString*)message
               conflictHandler:(GCConflictHandler)handler
                         error:(NSError**)error {
-  const git_commit** parents = (againstCommit != nil) ? (git_commit*[]) {againstCommit.private} : (git_commit*[]) {};
+  const git_commit** parents = (againstCommit != nil) ? (git_commit*[]){againstCommit.private} : (git_commit*[]){};
   return [self _mergeTheirCommit:pickCommit.private
                    intoOurCommit:againstCommit.private
               withAncestorCommit:ancestorCommit.private
@@ -113,7 +113,7 @@ - (GCCommit*)revertCommit:(GCCommit*)revertCommit
                   message:(NSString*)message
           conflictHandler:(GCConflictHandler)handler
                     error:(NSError**)error {
-  const git_commit** parents = (againstCommit != nil) ? (git_commit*[]) {againstCommit.private} : (git_commit*[]) {};
+  const git_commit** parents = (againstCommit != nil) ? (git_commit*[]){againstCommit.private} : (git_commit*[]){};
   return [self _mergeTheirCommit:ancestorCommit.private
                    intoOurCommit:againstCommit.private
               withAncestorCommit:revertCommit.private

GitUpKit/Core/GCRepository+HEAD.h

@@ -32,7 +32,7 @@ typedef NS_OPTIONS(NSUInteger, GCCheckoutOptions) {
 - (BOOL)setDetachedHEADToCommit:(GCCommit*)commit error:(NSError**)error;  // git update-ref HEAD {commit}
 
 - (BOOL)moveHEADToCommit:(GCCommit*)commit reflogMessage:(NSString*)message error:(NSError**)error;  // git reset --soft {commit} (but with custom reflog message)
-- (BOOL)updateSubmoduleReferenceAtPath:(NSString *)submodulePath toCommitSHA1:(NSString *)commitSHA1 error:(NSError **)error;
+- (BOOL)updateSubmoduleReferenceAtPath:(NSString*)submodulePath toCommitSHA1:(NSString*)commitSHA1 error:(NSError**)error;
 
 - (BOOL)checkoutCommit:(GCCommit*)commit options:(GCCheckoutOptions)options error:(NSError**)error;  // git checkout {commit}
 - (BOOL)checkoutLocalBranch:(GCLocalBranch*)branch options:(GCCheckoutOptions)options error:(NSError**)error;  // git checkout {branch}

GitUpKit/Core/GCRepository+HEAD.m

@@ -222,17 +222,17 @@ - (BOOL)checkoutCommit:(GCCommit*)commit options:(GCCheckoutOptions)options erro
 }
 
 - (BOOL)updateSubmoduleReferenceAtPath:(NSString*)submodulePath toCommitSHA1:(NSString*)commitSHA1 error:(NSError**)error {
-  GCSubmodule *submodule = [self lookupSubmoduleWithName:submodulePath error:error];
+  GCSubmodule* submodule = [self lookupSubmoduleWithName:submodulePath error:error];
   if (!submodule) {
     return NO;
   }
 
-  GCRepository *submoduleRepository = [[GCRepository alloc] initWithSubmodule:submodule error:error];
+  GCRepository* submoduleRepository = [[GCRepository alloc] initWithSubmodule:submodule error:error];
   if (!submoduleRepository) {
     return NO;
   }
 
-  GCCommit *targetCommit = [submoduleRepository findCommitWithSHA1:commitSHA1 error:error];
+  GCCommit* targetCommit = [submoduleRepository findCommitWithSHA1:commitSHA1 error:error];
   if (!targetCommit) {
     return NO;
   }