- performance tweaking

- fixed crash on theme change
- custom theme support

Author: stefanceriu

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -47,6 +47,7 @@
 		188308091A7411830005DF40 /* DVTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTKit.framework; path = ../../../../../Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework; sourceTree = "<group>"; };
 		1883080B1A7411930005DF40 /* IDESourceEditor.ideplugin */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = IDESourceEditor.ideplugin; path = ../../../../../Applications/Xcode.app/Contents/PlugIns/IDESourceEditor.ideplugin; sourceTree = "<group>"; };
 		1883080F1A7411A70005DF40 /* IDESourceEditor */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = IDESourceEditor; path = ../../../../../Applications/Xcode.app/Contents/PlugIns/IDESourceEditor.ideplugin/Contents/MacOS/IDESourceEditor; sourceTree = "<group>"; };
+		18B3CEE51A8AA52A00A0873D /* DVTPreferenceSetManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTPreferenceSetManager.h; sourceTree = "<group>"; };
 		18C8F0331A7ECB1300C7A76F /* DVTFoldingLayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTFoldingLayoutManager.h; sourceTree = "<group>"; };
 		18C8F0341A7ECB1300C7A76F /* DVTLayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTLayoutManager.h; sourceTree = "<group>"; };
 		18FE09B21707639E00118FEB /* SCXcodeMinimap.xcplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SCXcodeMinimap.xcplugin; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -103,6 +104,7 @@
 				184C117E1A740F8A002A7C65 /* IDESourceCodeEditor.h */,
 				184C117F1A740F8A002A7C65 /* IDESourceCodeEditorContainerView.h */,
 				184C11801A740F8A002A7C65 /* IDEViewController.h */,
+				18B3CEE51A8AA52A00A0873D /* DVTPreferenceSetManager.h */,
 			);
 			path = "Xcode Headers";
 			sourceTree = "<group>";
@@ -127,26 +129,18 @@
 		18FE09B41707639E00118FEB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				18FE09B81707639E00118FEB /* AppKit.framework */,
 				18FE09B51707639E00118FEB /* Cocoa.framework */,
+				18FE09B91707639E00118FEB /* CoreData.framework */,
 				184C118E1A741136002A7C65 /* DVTFoundation.framework */,
 				188308091A7411830005DF40 /* DVTKit.framework */,
+				18FE09BA1707639E00118FEB /* Foundation.framework */,
 				1876135E1A77A74300974BE1 /* IDEKit.framework */,
 				1883080F1A7411A70005DF40 /* IDESourceEditor */,
 				1883080B1A7411930005DF40 /* IDESourceEditor.ideplugin */,
-				18FE09B71707639E00118FEB /* Other Frameworks */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		18FE09B71707639E00118FEB /* Other Frameworks */ = {
-			isa = PBXGroup;
-			children = (
 				8742532217307161001C947C /* QuartzCore.framework */,
-				18FE09B81707639E00118FEB /* AppKit.framework */,
-				18FE09B91707639E00118FEB /* CoreData.framework */,
-				18FE09BA1707639E00118FEB /* Foundation.framework */,
 			);
-			name = "Other Frameworks";
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		18FE09BB1707639E00118FEB /* SCXcodeMinimap */ = {
@@ -311,6 +305,7 @@
 					"$(PROJECT_DIR)",
 					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
 					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
+					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/OtherFrameworks",
 				);
 				GCC_ENABLE_OBJC_GC = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -338,6 +333,7 @@
 					"$(PROJECT_DIR)",
 					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
 					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
+					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/OtherFrameworks",
 				);
 				GCC_ENABLE_OBJC_GC = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -18,7 +18,9 @@
 #import "DVTPointerArray.h"
 #import "DVTSourceTextView.h"
 #import "DVTSourceNodeTypes.h"
+
 #import "DVTFontAndColorTheme.h"
+#import "DVTPreferenceSetManager.h"
 
 const CGFloat kBackgroundColorShadowLevel = 0.1f;
 const CGFloat kHighlightColorAlphaLevel = 0.3f;
@@ -48,6 +50,8 @@ @interface SCXcodeMinimapView () <NSLayoutManagerDelegate>
 @property (nonatomic, strong) NSColor *commentColor;
 @property (nonatomic, strong) NSColor *preprocessorColor;
 
+@property (nonatomic, strong) DVTFontAndColorTheme *theme;
+
 @end
 
 @implementation SCXcodeMinimapView
@@ -79,7 +83,7 @@ - (instancetype)initWithFrame:(NSRect)frame editor:(IDESourceCodeEditor *)editor
 		[self addSubview:self.scrollView];
 
 		self.textView = [[DVTSourceTextView alloc] initWithFrame:self.editorTextView.bounds];
-		[self.editorTextView.textStorage addLayoutManager:self.textView.layoutManager];
+		[self.textView setTextStorage:self.editorTextView.textStorage];
 		[self.textView setEditable:NO];
 		[self.textView setSelectable:NO];
 
@@ -154,40 +158,47 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager
 
 	// Prevent full range invalidation for performance reasons.
 	if(!self.shouldAllowFullSyntaxHighlight) {
+		
+		// Attempt a full range invalidation after all temporary attributes are set
+		__weak typeof(self) weakSelf = self;
+		void(^invalidationBlock)() = ^{
+			weakSelf.shouldAllowFullSyntaxHighlight = YES;
+			NSRange visibleMinimapRange = [weakSelf.textView visibleCharacterRange];
+			[weakSelf.textView.layoutManager invalidateDisplayForCharacterRange:visibleMinimapRange];
+		};
+		
 		NSRange visibleEditorRange = [self.editorTextView visibleCharacterRange];
 		if(charIndex > visibleEditorRange.location + visibleEditorRange.length ) {
 			*effectiveCharRange = NSMakeRange(visibleEditorRange.location + visibleEditorRange.length,
 											  layoutManager.textStorage.length - visibleEditorRange.location - visibleEditorRange.length);
+		
+			[self performBlock:invalidationBlock afterDelay:0.5f cancelPreviousRequest:YES];
 
-			return @{NSForegroundColorAttributeName : [[DVTFontAndColorTheme currentTheme] sourcePlainTextColor]};
+			return @{NSForegroundColorAttributeName : [self.theme sourcePlainTextColor]};
 		}
 
 		if(charIndex < visibleEditorRange.location) {
 			*effectiveCharRange = NSMakeRange(0, visibleEditorRange.location);
-			return @{NSForegroundColorAttributeName : [[DVTFontAndColorTheme currentTheme] sourcePlainTextColor]};
+			
+			[self performBlock:invalidationBlock afterDelay:0.5f cancelPreviousRequest:YES];
+			
+			return @{NSForegroundColorAttributeName : [self.theme sourcePlainTextColor]};
 		}
 	}
 
-	// Attempt a full range invalidation after all temporary attributes are set
-	__weak typeof(self) weakSelf = self;
-	[self performBlock:^{
-		weakSelf.shouldAllowFullSyntaxHighlight = YES;
-		NSRange visibleMinimapRange = [weakSelf.textView visibleCharacterRange];
-		[weakSelf.textView.layoutManager invalidateDisplayForCharacterRange:visibleMinimapRange];
-	} afterDelay:0.5f cancelPreviousRequest:YES];
-	
 	// Rely on the colorAtCharacterIndex: method to update the effective range
 	DVTTextStorage *storage = [self.editorTextView textStorage];
 	NSColor *color = [storage colorAtCharacterIndex:charIndex effectiveRange:effectiveCharRange context:nil];
 
-	// Background color for comments and preprocessor directives
-	short currentNodeId = [storage nodeTypeAtCharacterIndex:charIndex effectiveRange:NULL context:nil];
-	if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName] ||
-	   currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocNodeName] ||
-	   currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocKeywordNodeName]) {
-		return @{NSForegroundColorAttributeName : [[DVTFontAndColorTheme currentTheme] sourceTextBackgroundColor], NSBackgroundColorAttributeName : self.commentColor};
-	} else if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorNodeName]) {
-		return @{NSForegroundColorAttributeName : [[DVTFontAndColorTheme currentTheme] sourceTextBackgroundColor], NSBackgroundColorAttributeName : self.preprocessorColor};
+	// Background color for comments and preprocessor directives. Could query for nodeTypeAtCharacterIndex: but it's too slow.
+	DVTPointerArray *colors = [[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType];
+	if([color isEqual:[colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName]]] ||
+	   [color isEqual:[colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocNodeName]]] ||
+	   [color isEqual:[colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocKeywordNodeName]]])
+	{
+		return @{NSForegroundColorAttributeName : [self.theme sourceTextBackgroundColor], NSBackgroundColorAttributeName : self.commentColor};
+	} else if([color isEqual:[colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorNodeName]]]) {
+		return @{NSForegroundColorAttributeName : [self.theme sourceTextBackgroundColor], NSBackgroundColorAttributeName : self.preprocessorColor};
 	}
 
 	return @{NSForegroundColorAttributeName : color};
@@ -260,8 +271,12 @@ - (void)handleMouseEvent:(NSEvent *)theEvent
 
 - (void)updateTheme
 {
-	DVTFontAndColorTheme *theme = [DVTFontAndColorTheme currentTheme];
-	NSColor *backgroundColor = [theme.sourceTextBackgroundColor shadowWithLevel:kBackgroundColorShadowLevel];
+	//DVTPreferenceSetManager *preferenceSetManager = [DVTFontAndColorTheme preferenceSetsManager];
+	//NSArray *preferenceSet = [preferenceSetManager availablePreferenceSets];
+	//self.theme = [preferenceSet lastObject];
+	self.theme = [DVTFontAndColorTheme currentTheme];
+	
+	NSColor *backgroundColor = [self.theme.sourceTextBackgroundColor shadowWithLevel:kBackgroundColorShadowLevel];
 
 	[self.scrollView setBackgroundColor:backgroundColor];
 	[self.textView setBackgroundColor:backgroundColor];
@@ -271,7 +286,7 @@ - (void)updateTheme
 														 blue:(1.0f - [backgroundColor blueComponent])
 														alpha:kHighlightColorAlphaLevel];
 
-	DVTPointerArray *colors = [[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType];
+	DVTPointerArray *colors = [self.theme syntaxColorsByNodeType];
 	self.commentColor = [colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName]];
 	self.commentColor = [NSColor colorWithCalibratedRed:self.commentColor.redComponent
 												  green:self.commentColor.greenComponent
@@ -280,9 +295,9 @@ - (void)updateTheme
 
 
 	self.preprocessorColor = [colors pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorNodeName]];
-	self.preprocessorColor = [NSColor colorWithCalibratedRed:self.commentColor.redComponent
-													   green:self.commentColor.greenComponent
-														blue:self.commentColor.blueComponent
+	self.preprocessorColor = [NSColor colorWithCalibratedRed:self.preprocessorColor.redComponent
+													   green:self.preprocessorColor.greenComponent
+														blue:self.preprocessorColor.blueComponent
 													   alpha:kHighlightColorAlphaLevel];
 
 	[self.selectionView setSelectionColor:selectionColor];

SCXcodeMinimap/Xcode Headers/DVTPreferenceSetManager.h

@@ -0,0 +1,50 @@
+/*
+ *     Generated by class-dump 3.3.4 (64 bit).
+ *
+ *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
+ */
+
+
+@class DVTDelayedInvocation, DVTMapTable, NSArray, NSMutableArray, NSMutableSet;
+
+@interface DVTPreferenceSetManager : NSObject
+{
+	Class _preferenceSetClass;
+	NSArray *_builtInPreferenceSets;
+	NSMutableSet *_specifierNamesInDataStore;
+	NSMutableArray *_userPreferenceSets;
+	NSMutableArray *_availablePreferenceSets;
+	id <DVTPreferenceSet> _currentPreferenceSet;
+	DVTMapTable *_preferenceSetObserverTokens;
+	DVTDelayedInvocation *_autosavePreferenceSetsInvocation;
+}
+
++ (void)initialize;
+@property(readonly) Class preferenceSetClass; // @synthesize preferenceSetClass=_preferenceSetClass;
+- (id)description;
+- (void)_writePreferenceSetsIfNeeded;
+- (void)_applicationWillTerminate:(id)arg1;
+- (void)_scheduleAutoSavePreferenceSets;
+- (void)_removeObserversForPreferenceSet:(id)arg1;
+- (void)_addObserversForPreferenceSet:(id)arg1;
+- (void)deletePreferenceSet:(id)arg1 completionQueue:(id)arg2 completionBlock:(id)arg3;
+- (id)duplicatePreferenceSet:(id)arg1 error:(id *)arg2;
+- (void)renamePreferenceSet:(id)arg1 toName:(id)arg2 completionQueue:(id)arg3 completionBlock:(id)arg4;
+- (id)editableUserPreferenceSetForPreferenceSet:(id)arg1;
+- (id)_createUserPreferenceSetWithBaseName:(id)arg1 basedOn:(id)arg2;
+- (id)_nameForDuplicateOfPreferenceSet:(id)arg1;
+- (id)_availablePreferenceSetWithLocalizedName:(id)arg1;
+- (id)preferenceSetForName:(id)arg1;
+@property(readonly) NSArray *builtInPreferenceSets;
+@property(retain) id <DVTPreferenceSet> currentPreferenceSet;
+- (void)_rebuildAvailableandUserSetsList;
+- (void)dealloc;
+- (id)initWithPreferenceSetClass:(Class)arg1;
+
+// Remaining properties
+@property(copy) NSArray *availablePreferenceSets; // @dynamic availablePreferenceSets;
+@property(readonly) NSMutableArray *mutableAvailablePreferenceSets; // @dynamic mutableAvailablePreferenceSets;
+@property(readonly) NSMutableArray *mutableUserPreferenceSets; // @dynamic mutableUserPreferenceSets;
+@property(copy) NSArray *userPreferenceSets; // @dynamic userPreferenceSets;
+
+@end