Xcode 6 support + various tweaks and fixes.

Author: stefanceriu

SCXcodeMinimap/SCMiniMapView.h

@@ -11,7 +11,7 @@
 
 extern const CGFloat kDefaultZoomLevel;
 
-@interface SCMiniMapView : NSScrollView <NSLayoutManagerDelegate>
+@interface SCMiniMapView : NSScrollView
 
 @property (nonatomic, strong) NSTextView *textView;
 @property (nonatomic, strong) SCSelectionView *selectionView;

SCXcodeMinimap/SCMiniMapView.m

@@ -14,14 +14,20 @@
 
 static NSString * const DVTFontAndColorSourceTextSettingsChangedNotification = @"DVTFontAndColorSourceTextSettingsChangedNotification";
 
-@interface SCMiniMapView ()
+@interface SCMiniMapView () <NSLayoutManagerDelegate>
 
 @property (nonatomic, strong) NSColor *backgroundColor;
 @property (nonatomic, strong) NSFont *font;
 
 @end
 
 @implementation SCMiniMapView
+@synthesize backgroundColor = _backgroundColor;
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
 - (id)initWithFrame:(NSRect)frame
 {
@@ -53,23 +59,17 @@ - (id)initWithFrame:(NSRect)frame
     return self;
 }
 
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 #pragma mark - Lazy Initialization
 
 - (NSTextView *)textView
 {
     if (_textView == nil) {
-        _textView = [[NSTextView alloc] initWithFrame:self.bounds];
+        _textView = [[NSClassFromString(@"DVTSourceTextView") alloc] initWithFrame:self.bounds];
+        
         [_textView setBackgroundColor:[NSColor clearColor]];
 
         [_textView.textContainer setLineFragmentPadding:0.0f];
 
-        [_textView.layoutManager setDelegate:self];
-        
         [_textView setAllowsUndo:NO];
         [_textView setAllowsImageEditing:NO];
         [_textView setAutomaticDashSubstitutionEnabled:NO];
@@ -87,8 +87,12 @@ - (NSTextView *)textView
         [self setDocumentView:_textView];
 
         [self updateTheme];
+        
+        [[NSNotificationCenter defaultCenter] removeObserver:_textView name:DVTFontAndColorSourceTextSettingsChangedNotification object:nil];
     }
 
+    [_textView.layoutManager setDelegate:self];
+    
     return _textView;
 }
 
@@ -186,21 +190,21 @@ - (void)updateTextView
     if(mutableAttributedString.length == 0) {
         return;
     }
-	
+    
     __block NSMutableParagraphStyle *style;
-
-	[mutableAttributedString enumerateAttribute:NSParagraphStyleAttributeName
-										inRange:NSMakeRange(0, mutableAttributedString.length)
-										options:0
-									 usingBlock:^(id value, NSRange range, BOOL *stop) {
+    
+    [mutableAttributedString enumerateAttribute:NSParagraphStyleAttributeName
+                                        inRange:NSMakeRange(0, mutableAttributedString.length)
+                                        options:0
+                                     usingBlock:^(id value, NSRange range, BOOL *stop) {
                                          style = [value mutableCopy];
                                          *stop = YES;
                                      }];
 
 
     [style setTabStops:@[]];
-	[style setDefaultTabInterval:style.defaultTabInterval * kDefaultZoomLevel];
-
+    [style setDefaultTabInterval:style.defaultTabInterval * kDefaultZoomLevel];
+    
     [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font, NSParagraphStyleAttributeName : style} range:NSMakeRange(0, mutableAttributedString.length)];
 
     [self.textView.textStorage setAttributedString:mutableAttributedString];
@@ -238,30 +242,25 @@ - (void)updateSelectionView
         selectionViewFrame.origin.y = self.editorScrollView.contentView.bounds.origin.y * ratio;
     }
 
-	[self.selectionView setFrame:selectionViewFrame];
+    [self.selectionView setFrame:selectionViewFrame];
 }
 
 #pragma mark - NSLayoutManagerDelegate
 
 - (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinished
 {
-    if([layoutManager isEqual:self.editorTextView.layoutManager]) {
-        [(id<NSLayoutManagerDelegate>)self.editorTextView layoutManager:layoutManager
-                                      didCompleteLayoutForTextContainer:textContainer
-                                                                  atEnd:layoutFinished];
-    }
-    else if(layoutFinished) {
+    if(layoutFinished) {
         [self updateSelectionView];
     }
 }
 
 - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager shouldUseTemporaryAttributes:(NSDictionary *)attrs forDrawingToScreen:(BOOL)toScreen atCharacterIndex:(NSUInteger)charIndex effectiveRange:(NSRangePointer)effectiveCharRange
 {
-    return [(id<NSLayoutManagerDelegate>)self.editorTextView layoutManager:layoutManager
-                                              shouldUseTemporaryAttributes:attrs
-                                                        forDrawingToScreen:toScreen
-                                                          atCharacterIndex:charIndex
-                                                            effectiveRange:effectiveCharRange];
+    return [self.editorTextView.layoutManager.delegate layoutManager:layoutManager
+                                        shouldUseTemporaryAttributes:attrs
+                                                  forDrawingToScreen:toScreen
+                                                    atCharacterIndex:charIndex
+                                                      effectiveRange:effectiveCharRange];
 }
 
 #pragma mark - Navigation

SCXcodeMinimap/SCXcodeMinimap-Info.plist

@@ -27,6 +27,7 @@
 		<string>A2E4D43F-41F4-4FB9-BB94-7177011C9AED</string>
 		<string>63FC1C47-140D-42B0-BB4D-A10B2D225574</string>
 		<string>37B30044-3B14-46BA-ABAA-F01000C27B63</string>
+		<string>AD68E85B-441B-4301-B564-A45E4919A6AD</string>
 	</array>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 Stefan Ceriu. All rights reserved.</string>

SCXcodeMinimap/SCXcodeMinimap.m

@@ -21,26 +21,28 @@
 
 NSString * const SCXodeMinimapIsInitiallyHidden  = @"SCXodeMinimapIsInitiallyHidden";
 
+static const CGFloat kDefaultUpdateInterval = 0.25f;
+
 @implementation SCXcodeMinimap
 
 static SCXcodeMinimap *sharedMinimap = nil;
 + (void)pluginDidLoad:(NSBundle *)plugin {
-	static dispatch_once_t onceToken;
-	dispatch_once(&onceToken, ^{
-		sharedMinimap = [[self alloc] init];
-	});
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedMinimap = [[self alloc] init];
+    });
 }
 
 - (id)init {
-	if (self = [super init]) {
+    if (self = [super init]) {
 
         [self createMenuItem];
 
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onDidFinishSetup:) name:IDESourceCodeEditorDidFinishSetupNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onDocumentDidChange:) name:IDEEditorDocumentDidChangeNotification object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onCodeEditorBoundsChange:) name:IDESourceCodeEditorTextViewBoundsDidChangeNotification object:nil];
     }
-	return self;
+    return self;
 }
 
 - (void)createMenuItem
@@ -94,7 +96,9 @@ - (void)showMiniMap:(NSMenuItem *)sender
 - (void)onDocumentDidChange:(NSNotification*)sender
 {
     SCMiniMapView *miniMapView = objc_getAssociatedObject([sender object], &kKeyMiniMapView);
-    [miniMapView updateTextView];
+    
+    [NSObject cancelPreviousPerformRequestsWithTarget:miniMapView selector:@selector(updateTextView) object:nil];
+    [miniMapView performSelector:@selector(updateTextView) withObject:nil afterDelay:kDefaultUpdateInterval];
 }
 
 - (void)onCodeEditorBoundsChange:(NSNotification*)sender