Fix crash when using Xcode commit

johnno1962 · johnno1962 · commit c3b5d3dd3403 · 2014-07-28T08:49:04.000+01:00
diff --git a/Classes/GitDiff.mm b/Classes/GitDiff.mm
@@ -140,7 +140,8 @@ @interface IDESourceCodeDocument : NSDocument
 @implementation IDESourceCodeDocument(GitDiff)
 
 // source file is being saved
-- (void)_finishSavingToURL:(id)a0 ofType:(id)a1 forSaveOperation:(unsigned long)a2 changeCount:(id)a3 {
+- (void)_finishSavingToURL:(id)a0 ofType:(id)a1 forSaveOperation:(unsigned long)a2 changeCount:(id)a3
+{
     [super _finishSavingToURL:a0 ofType:a1 forSaveOperation:a2 changeCount:a3];
     [[GitFileDiffs alloc] performSelectorInBackground:@selector(initFile:) withObject:[[self fileURL] path]];
 }
@@ -162,7 +163,11 @@ - (NSTextView *)sourceTextView
 
 - (GitFileDiffs *)gitDiffs
 {
-    IDESourceCodeDocument *doc = [(id)[[self sourceTextView] delegate] document];
+    NSTextView *sourceTextView = [self sourceTextView];
+    if ( ![sourceTextView respondsToSelector:@selector(delegate)] )
+        return nil;
+
+    IDESourceCodeDocument *doc = [(id)[sourceTextView delegate] document];
     NSString *path = [[doc fileURL] path];
 
     GitFileDiffs *diffs = gitDiffPlugin.diffsByFile[path];
@@ -177,28 +182,30 @@ - (void)gitdiff_drawLineNumbersInSidebarRect:(CGRect)rect foldedIndexes:(unsigne
 {
     GitFileDiffs *diffs = [self gitDiffs];
 
-    [self lockFocus];
+    if ( diffs ) {
+        [self lockFocus];
 
-    for ( int i=0 ; i<indexCount ; i++ ) {
-        unsigned long line = indexes[i];
-        NSColor *highlight = !exists( diffs->added, line ) ? nil :
-            exists( diffs->modified, line ) ? gitDiffPlugin.modifiedColor : gitDiffPlugin.addedColor;
-        CGRect a0, a1;
+        for ( int i=0 ; i<indexCount ; i++ ) {
+            unsigned long line = indexes[i];
+            NSColor *highlight = !exists( diffs->added, line ) ? nil :
+                exists( diffs->modified, line ) ? gitDiffPlugin.modifiedColor : gitDiffPlugin.addedColor;
+            CGRect a0, a1;
 
-        if ( highlight ) {
-            [highlight setFill];
-            [self getParagraphRect:&a0 firstLineRect:&a1 forLineNumber:line];
-            NSRectFill( CGRectInset(a0,1.,1.) );
-        }
-        else if ( exists( diffs->deleted, line ) ) {
-            [gitDiffPlugin.deletedColor setFill];
-            [self getParagraphRect:&a0 firstLineRect:&a1 forLineNumber:line];
-            a0.size.height = 1.;
-            NSRectFill( a0 );
+            if ( highlight ) {
+                [highlight setFill];
+                [self getParagraphRect:&a0 firstLineRect:&a1 forLineNumber:line];
+                NSRectFill( CGRectInset(a0,1.,1.) );
+            }
+            else if ( exists( diffs->deleted, line ) ) {
+                [gitDiffPlugin.deletedColor setFill];
+                [self getParagraphRect:&a0 firstLineRect:&a1 forLineNumber:line];
+                a0.size.height = 1.;
+                NSRectFill( a0 );
+            }
         }
-    }
 
-    [self unlockFocus];
+        [self unlockFocus];
+    }
 
     [self gitdiff_drawLineNumbersInSidebarRect:rect foldedIndexes:indexes count:indexCount
                              linesToInvert:a3 linesToReplace:a4 getParaRectBlock:rectBlock];
@@ -213,8 +220,8 @@ - (id)gitdiff_annotationAtSidebarPoint:(CGPoint)p0
         GitFileDiffs *diffs = [self gitDiffs];
         unsigned long line = [self lineNumberForPoint:p0];
 
-        if ( exists( diffs->deleted, line ) ||
-                (exists( diffs->added, line ) && exists( diffs->modified, line )) ) {
+        if ( diffs && (exists( diffs->deleted, line ) ||
+                (exists( diffs->added, line ) && exists( diffs->modified, line ))) ) {
             CGRect a0, a1;
             unsigned long start = diffs->modified[line];
             [self getParagraphRect:&a0 firstLineRect:&a1 forLineNumber:start];
