Moved kDefaultZoomLevel to the SCXcodeMinimap class and added highlighting for comment.doc and comment.doc.keyword.

Author: stefanceriu

SCXcodeMinimap/SCXcodeMinimap.h

@@ -8,6 +8,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+const CGFloat kDefaultZoomLevel;
+
 extern NSString *const SCXodeMinimapShowNotification;
 extern NSString *const SCXodeMinimapHideNotification;
 

SCXcodeMinimap/SCXcodeMinimap.m

@@ -13,6 +13,8 @@
 #import "IDESourceCodeEditor.h"
 #import "DVTSourceTextView.h"
 
+const CGFloat kDefaultZoomLevel = 0.15f;
+
 static char kAssociatedObjectMinimapViewKey;
 
 static NSString * const IDESourceCodeEditorDidFinishSetupNotification = @"IDESourceCodeEditorDidFinishSetup";

SCXcodeMinimap/SCXcodeMinimapView.h

@@ -11,8 +11,6 @@
 @class DVTSourceTextView;
 @class SCSelectionView;
 
-extern const CGFloat kDefaultZoomLevel;
-
 @interface SCXcodeMinimapView : NSView
 
 - (instancetype)initWithFrame:(NSRect)frameRect

SCXcodeMinimap/SCXcodeMinimapView.m

@@ -16,11 +16,12 @@
 #import "DVTSourceNodeTypes.h"
 #import "DVTFontAndColorTheme.h"
 
-const CGFloat kDefaultZoomLevel = 0.1f;
 const CGFloat kBackgroundColorShadowLevel = 0.1f;
 const CGFloat kHighlightColorAlphaLevel = 0.3f;
 
 static NSString * const kXcodeSyntaxCommentNodeName = @"xcode.syntax.comment";
+static NSString * const kXcodeSyntaxCommentDocNodeName = @"xcode.syntax.comment.doc";
+static NSString * const kXcodeSyntaxCommentDocKeywordNodeName = @"xcode.syntax.comment.doc.keyword";
 static NSString * const kXcodeSyntaxPreprocessorNodeName = @"xcode.syntax.preprocessor";
 
 static NSString * const DVTFontAndColorSourceTextSettingsChangedNotification = @"DVTFontAndColorSourceTextSettingsChangedNotification";
@@ -121,10 +122,14 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager shouldUseTempor
 	NSColor *color = [storage colorAtCharacterIndex:charIndex effectiveRange:effectiveCharRange context:nil];
 	NSColor *backgroundColor = nil;
 
-	if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName]) {
+	if(currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentNodeName] ||
+	   currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocNodeName] ||
+	   currentNodeId == [DVTSourceNodeTypes registerNodeTypeNamed:kXcodeSyntaxCommentDocKeywordNodeName])
+	{
 		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]) {
+	} 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];
 	}