- added comment and preprocessor instructions highlighting

- cleaned up theme related methods and selection view.

Author: stefanceriu

SCXcodeMinimap/SCXcodeMinimapSelectionView.h

@@ -11,6 +11,5 @@
 @interface SCXcodeMinimapSelectionView : NSView
 
 @property (nonatomic, strong) NSColor *selectionColor;
-@property (nonatomic, assign) BOOL shouldInverseColors;
 
 @end

SCXcodeMinimap/SCXcodeMinimapSelectionView.m

@@ -18,32 +18,6 @@ - (void)drawRect:(NSRect)dirtyRect
 	NSRectFill(dirtyRect);
 }
 
-- (NSColor *)selectionColor
-{
-	if(_selectionColor == nil) {
-		
-		_selectionColor = [NSColor colorWithDeviceRed:0.0f green:0.0f blue:0.0f alpha:0.3f];
-		
-		NSColor *backgroundColor = [[[DVTFontAndColorTheme currentTheme] sourceTextBackgroundColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
-		
-		if(self.shouldInverseColors) {
-			
-			_selectionColor = [NSColor colorWithCalibratedRed:(1.0f - [backgroundColor redComponent])
-														green:(1.0f - [backgroundColor greenComponent])
-														 blue:(1.0f - [backgroundColor blueComponent])
-														alpha:0.3f];
-		} else {
-			
-			_selectionColor = [NSColor colorWithCalibratedHue:0.0f
-												   saturation:0.0f
-												   brightness:(1.0f - [backgroundColor brightnessComponent])
-														alpha:0.3f];
-		}
-	}
-	
-	return _selectionColor;
-}
-
 - (void)setSelectionColor:(NSColor *)selectionColor
 {
 	if([_selectionColor isEqual:selectionColor]) return;
@@ -52,14 +26,4 @@ - (void)setSelectionColor:(NSColor *)selectionColor
 	[self setNeedsDisplay:YES];
 }
 
-- (void)setShouldInverseColors:(BOOL)shouldInverseColors
-{
-	if(_shouldInverseColors == shouldInverseColors) {
-		return;
-	}
-	
-	_shouldInverseColors = shouldInverseColors;
-	_selectionColor = nil;
-}
-
 @end

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -16,12 +16,13 @@
 #import "DVTSourceNodeTypes.h"
 #import "DVTFontAndColorTheme.h"
 
-
 const CGFloat kDefaultZoomLevel = 0.1f;
-const CGFloat kDefaultShadowLevel = 0.1f;
+const CGFloat kBackgroundColorShadowLevel = 0.1f;
+const CGFloat kHighlightColorAlphaLevel = 0.3f;
+
+static NSString * const kXcodeSyntaxCommentNodeName = @"xcode.syntax.comment";
+static NSString * const kXcodeSyntaxPreprocessorNodeName = @"xcode.syntax.preprocessor";
 
-static NSString * const kXcodeSyntaxCommentColor = @"xcode.syntax.comment";
-static NSString * const kXcodeSyntaxPreprocessorColor = @"xcode.syntax.preprocessor";
 static NSString * const DVTFontAndColorSourceTextSettingsChangedNotification = @"DVTFontAndColorSourceTextSettingsChangedNotification";
 
 @interface SCXcodeMinimapView () <NSLayoutManagerDelegate>
@@ -114,8 +115,26 @@ - (void)setVisible:(BOOL)visible
 - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager shouldUseTemporaryAttributes:(NSDictionary *)attrs forDrawingToScreen:(BOOL)toScreen atCharacterIndex:(NSUInteger)charIndex effectiveRange:(NSRangePointer)effectiveCharRange
 {
 	DVTTextStorage *storage = [self.editorTextView textStorage];
+	
+	short currentNodeId = [storage nodeTypeAtCharacterIndex:charIndex effectiveRange:effectiveCharRange context:nil];
+	
 	NSColor *color = [storage colorAtCharacterIndex:charIndex effectiveRange:effectiveCharRange context:nil];
-	return @{NSForegroundColorAttributeName : color};
+	NSColor *backgroundColor = nil;
+	
+	if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName]) {
+		NSColor *color =  [[[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType] pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName]];
+		backgroundColor = [NSColor colorWithCalibratedRed:color.redComponent green:color.greenComponent blue:color.blueComponent alpha:kHighlightColorAlphaLevel];
+	} else if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorNodeName]) {
+		NSColor *color = [[[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType] pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorNodeName]];
+		backgroundColor = [NSColor colorWithCalibratedRed:color.redComponent green:color.greenComponent blue:color.blueComponent alpha:kHighlightColorAlphaLevel];
+	}
+	
+	if(backgroundColor) {
+		NSColor *foregroundColor = [[DVTFontAndColorTheme currentTheme] sourceTextBackgroundColor];
+		return @{NSForegroundColorAttributeName : foregroundColor, NSBackgroundColorAttributeName : backgroundColor};
+	} else {
+		return @{NSForegroundColorAttributeName : color};
+	}
 }
 
 - (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinished
@@ -188,31 +207,19 @@ - (void)handleMouseEvent:(NSEvent *)theEvent
 #pragma mark - Theme
 
 - (void)updateTheme
-{
-	[self.scrollView setBackgroundColor:self.backgroundColor];
-	[self.textView setBackgroundColor:self.backgroundColor];
-	[self.selectionView setSelectionColor:nil];
-}
-
-- (NSColor *)backgroundColor
 {
 	DVTFontAndColorTheme *theme = [DVTFontAndColorTheme currentTheme];
+	NSColor *backgroundColor = [theme.sourceTextBackgroundColor shadowWithLevel:kBackgroundColorShadowLevel];
 
-	if(theme.sourceTextBackgroundColor) {
-		return [theme.sourceTextBackgroundColor shadowWithLevel:kDefaultShadowLevel];
-	}
+	[self.scrollView setBackgroundColor:backgroundColor];
+	[self.textView setBackgroundColor:backgroundColor];
 
-	return [[NSColor clearColor] shadowWithLevel:kDefaultShadowLevel];
-}
-
-- (NSColor *)commentColor
-{
-	return [[[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType] pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentColor]];
-}
-
-- (NSColor *)preprocessorColor
-{
-	return [[[DVTFontAndColorTheme currentTheme] syntaxColorsByNodeType] pointerAtIndex:[DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxPreprocessorColor]];
+	NSColor *selectionColor = [NSColor colorWithCalibratedRed:(1.0f - [backgroundColor redComponent])
+														green:(1.0f - [backgroundColor greenComponent])
+														 blue:(1.0f - [backgroundColor blueComponent])
+														alpha:kHighlightColorAlphaLevel];
+	
+	[self.selectionView setSelectionColor:selectionColor];
 }
 
 #pragma mark - Autoresizing