- added search results highlighting

- added autohiding for small files (#44)
- started invalidating the full text range on changes (prevents artifacts)

Author: stefanceriu

README.md

@@ -1,17 +1,19 @@
-# SCXcodeMinimap v2.2
+# SCXcodeMinimap v2.3
 SCXcodeMiniMap is a Xcode plugin that adds a source editor Minimap to Xcode.
 
 #### Features
 
 - Custom size
 - Custom themes
+- Highlighting:
+    - search results 
+    - comments and preprocessor directives
+    - breakpoints
+    - build errors and warnings
+    - Xcode's "instances of selected symbol" (Preferences/Text Editing)
+- Can autohide for small files
 - Can hide the main editor scroller
-- Show code foldings
-- Highlights comments and preprocessor directives
-- Highlights breakpoints
-- Highlights build errors and warnings
-- Hihglights Xcode's "instances of selected symbol" (Preferences/Text Editing)
-- All these highlighting options are also available for the main editor
+- Shows code foldings
 
 All options are configurable through the View/Minimap menu item
 
@@ -21,14 +23,16 @@ Without editor highlighting |  With editor highlighting
 ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-01.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-03.png)  |
 ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-02.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/SCXcodeMinimap%20v2.0-04.png)  |
 
+![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/searchResultsHighlighting.png)
+
 ![](https://dl.dropboxusercontent.com/u/12748201/Recordings/SCXcodeMinimap/v2.2/selectedSymbolInstancesHighlighting.gif)
 
 #### Installation
 - Through [Alcatraz](https://github.com/supermarin/Alcatraz)
 
-- Download the sources, build the project and restart Xcode
+- or download the sources, build the project and restart Xcode
 
-- Download SCXcodeMinimap.xcplugin.zip from the releases tab, unzip and move it to the  Xcode plugins folder ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SCXcodeMinimap.xcplugin
+- or download SCXcodeMinimap.xcplugin.zip from the releases tab, unzip and move it to the  Xcode plugins folder ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SCXcodeMinimap.xcplugin
 
 - If you encounter any issues you can uninstall it by removing the ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SCXcodeMinimap.xcplugin folder
 

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -20,6 +20,7 @@
 		18C2EA5C1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C2EA5B1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m */; };
 		18C999FF1A98B04C0008AF54 /* DebuggerUI in Frameworks */ = {isa = PBXBuildFile; fileRef = 18C999FE1A98B04C0008AF54 /* DebuggerUI */; };
 		18D6AD111A8F727B0082CB3F /* IDEFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18D6AD101A8F727B0082CB3F /* IDEFoundation.framework */; };
+		18DE25ED1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18DE25EC1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m */; };
 		18E577FC1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E577FB1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.m */; };
 		18ECB80E1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18ECB80D1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m */; };
 		18ECB8111B1322A300EE4D82 /* SCXcodeMinimapCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 18ECB8101B1322A300EE4D82 /* SCXcodeMinimapCommon.m */; };
@@ -82,6 +83,9 @@
 		18C999FE1A98B04C0008AF54 /* DebuggerUI */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = DebuggerUI; path = /Applications/Xcode.app/Contents/PlugIns/DebuggerUI.ideplugin/Contents/MacOS/DebuggerUI; sourceTree = "<group>"; };
 		18CA02B61A9D0DF1001C5CE1 /* IDEBreakpoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEBreakpoint.h; sourceTree = "<group>"; };
 		18D6AD101A8F727B0082CB3F /* IDEFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDEFoundation.framework; path = /Applications/Xcode.app/Contents/Frameworks/IDEFoundation.framework; sourceTree = "<group>"; };
+		18DE25EB1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "IDESourceCodeEditor+SCXcodeMinimap.h"; sourceTree = "<group>"; };
+		18DE25EC1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "IDESourceCodeEditor+SCXcodeMinimap.m"; sourceTree = "<group>"; };
+		18DE6AFB1B203D070042615D /* DVTFindResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTFindResult.h; sourceTree = "<group>"; };
 		18E577F61B119BF200421483 /* IDEBuildIssueAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDEBuildIssueAnnotation.h; sourceTree = "<group>"; };
 		18E577F71B119C1000421483 /* IDEBuildIssueWarningAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEBuildIssueWarningAnnotation.h; sourceTree = "<group>"; };
 		18E577F81B119C3F00421483 /* IDEBuildIssueErrorAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEBuildIssueErrorAnnotation.h; sourceTree = "<group>"; };
@@ -134,6 +138,7 @@
 				18C999FD1A98AF580008AF54 /* DVTAnnotationProvider.h */,
 				184C11711A740F8A002A7C65 /* DVTCompletingTextView.h */,
 				184407651A8F7B3E00C530CF /* DVTDocumentLocation.h */,
+				18DE6AFB1B203D070042615D /* DVTFindResult.h */,
 				18C8F0331A7ECB1300C7A76F /* DVTFoldingLayoutManager.h */,
 				18269AD51A8F2F4300953B3D /* DVTFoldingManager.h */,
 				184C11721A740F8A002A7C65 /* DVTFontAndColorTheme.h */,
@@ -217,6 +222,8 @@
 				184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */,
 				1889464B1B11DDEE0036175B /* SCXcodeMinimapTheme.h */,
 				1889464C1B11DDEE0036175B /* SCXcodeMinimapTheme.m */,
+				18ECB80F1B1322A300EE4D82 /* SCXcodeMinimapCommon.h */,
+				18ECB8101B1322A300EE4D82 /* SCXcodeMinimapCommon.m */,
 				18C2EA5A1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.h */,
 				18C2EA5B1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m */,
 				188FCC881A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.h */,
@@ -225,10 +232,10 @@
 				18ECB80D1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m */,
 				18E577FA1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.h */,
 				18E577FB1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.m */,
+				18DE25EB1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.h */,
+				18DE25EC1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m */,
 				1809FF8D1AED1A730058D946 /* NSScroller+SCXcodeMinimap.h */,
 				1809FF8E1AED1A730058D946 /* NSScroller+SCXcodeMinimap.m */,
-				18ECB80F1B1322A300EE4D82 /* SCXcodeMinimapCommon.h */,
-				18ECB8101B1322A300EE4D82 /* SCXcodeMinimapCommon.m */,
 				18FE09BC1707639E00118FEB /* Supporting Files */,
 				184C11701A740F8A002A7C65 /* Xcode Headers */,
 			);
@@ -311,6 +318,7 @@
 				184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */,
 				184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */,
 				18C2EA5C1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m in Sources */,
+				18DE25ED1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m in Sources */,
 				1889464D1B11DDEE0036175B /* SCXcodeMinimapTheme.m in Sources */,
 				18ECB80E1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m in Sources */,
 				1819E4291AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m in Sources */,

SCXcodeMinimap.xcodeproj/xcshareddata/xcschemes/SCXcodeMinimap.xcscheme

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0500"
-   version = "1.3">
+   version = "2.0">
    <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      parallelizeBuildables = "NO"
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -31,16 +31,19 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES"
+      debugDocumentVersioning = "NO"
+      debugXPCServices = "NO"
+      allowLocationSimulation = "NO"
       viewDebuggingEnabled = "No">
       <PathRunnable
+         runnableDebuggingMode = "0"
+         BundleIdentifier = "com.apple.dt.Xcode"
          FilePath = "/Applications/Xcode.app">
       </PathRunnable>
       <MacroExpansion>

SCXcodeMinimap/DVTLayoutManager+SCXcodeMinimap.m

@@ -17,15 +17,6 @@ + (void)load
 	sc_swizzleInstanceMethod(self, @selector(_displayAutoHighlightTokens), @selector(sc_displayAutoHighlightTokens));
 }
 
-- (void)sc_displayAutoHighlightTokens
-{
-	[self sc_displayAutoHighlightTokens];
-	
-	if([self.minimapDelegate respondsToSelector:@selector(layoutManagerDidRequestSelectedSymbolInstancesHighlight:)]) {
-		[self.minimapDelegate layoutManagerDidRequestSelectedSymbolInstancesHighlight:self];
-	}
-}
-
 - (id<DVTLayoutManagerMinimapDelegate>)minimapDelegate
 {
 	return objc_getAssociatedObject(self, @selector(minimapDelegate));
@@ -36,4 +27,13 @@ - (void)setMinimapDelegate:(id<DVTLayoutManagerMinimapDelegate>)minimapDelegate
 	objc_setAssociatedObject(self, @selector(minimapDelegate), minimapDelegate, OBJC_ASSOCIATION_ASSIGN);
 }
 
+- (void)sc_displayAutoHighlightTokens
+{
+	[self sc_displayAutoHighlightTokens];
+	
+	if([self.minimapDelegate respondsToSelector:@selector(layoutManagerDidRequestSelectedSymbolInstancesHighlight:)]) {
+		[self.minimapDelegate layoutManagerDidRequestSelectedSymbolInstancesHighlight:self];
+	}
+}
+
 @end

SCXcodeMinimap/IDESourceCodeEditor+SCXcodeMinimap.h

@@ -0,0 +1,25 @@
+//
+//  IDESourceCodeEditor+SCXcodeMinimap.h
+//  SCXcodeMinimap
+//
+//  Created by Stefan Ceriu on 6/4/15.
+//  Copyright (c) 2015 Stefan Ceriu. All rights reserved.
+//
+
+#import "IDESourceCodeEditor.h"
+
+@protocol IDESourceCodeEditorSearchResultsDelegate;
+
+@interface IDESourceCodeEditor (SCXcodeMinimap)
+
+@property (nonatomic, weak) id<IDESourceCodeEditorSearchResultsDelegate> searchResultsDelegate;
+
+@property (nonatomic, strong) NSArray *searchResults;
+
+@end
+
+@protocol IDESourceCodeEditorSearchResultsDelegate <NSObject>
+
+- (void)sourceCodeEditorDidUpdateSearchResults:(IDESourceCodeEditor *)editor;
+
+@end

SCXcodeMinimap/IDESourceCodeEditor+SCXcodeMinimap.m

@@ -0,0 +1,53 @@
+//
+//  IDESourceCodeEditor+SCXcodeMinimap.m
+//  SCXcodeMinimap
+//
+//  Created by Stefan Ceriu on 6/4/15.
+//  Copyright (c) 2015 Stefan Ceriu. All rights reserved.
+//
+
+#import "IDESourceCodeEditor+SCXcodeMinimap.h"
+#import "SCXcodeMinimapCommon.h"
+
+@implementation IDESourceCodeEditor (SCXcodeMinimap)
+
++ (void)load
+{
+	sc_swizzleInstanceMethod([self class], @selector(dvtFindBar:didUpdateResults:), @selector(sc_dvtFindBar:didUpdateResults:));
+}
+
+- (void)sc_dvtFindBar:(id)findBar didUpdateResults:(NSArray *)searchResults
+{
+	[self sc_dvtFindBar:findBar didUpdateResults:searchResults];
+	[self setSearchResults:searchResults];
+}
+
+- (NSArray *)searchResults
+{
+	return objc_getAssociatedObject(self, @selector(searchResults));
+}
+
+- (void)setSearchResults:(NSArray *)searchResults
+{
+	if([self.searchResults isEqual:searchResults]) {
+		return;
+	}
+	
+	objc_setAssociatedObject(self, @selector(searchResults), searchResults, OBJC_ASSOCIATION_RETAIN);
+	
+	if([self.searchResultsDelegate respondsToSelector:@selector(sourceCodeEditorDidUpdateSearchResults:)]) {
+		[self.searchResultsDelegate sourceCodeEditorDidUpdateSearchResults:self];
+	}
+}
+
+- (id<IDESourceCodeEditorSearchResultsDelegate>)searchResultsDelegate
+{
+	return objc_getAssociatedObject(self, @selector(searchResultsDelegate));
+}
+
+- (void)setSearchResultsDelegate:(id<IDESourceCodeEditorSearchResultsDelegate>)searchResultsDelegate
+{
+	objc_setAssociatedObject(self, @selector(searchResultsDelegate), searchResultsDelegate, OBJC_ASSOCIATION_ASSIGN);
+}
+
+@end

SCXcodeMinimap/SCXcodeMinimap-Info.plist

@@ -38,10 +38,12 @@
 		<string>E969541F-E6F9-4D25-8158-72DC3545A6C6</string>
 		<string>8DC44374-2B35-4C57-A6FE-2AD66A36AAD9</string>
 	</array>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 Stefan Ceriu. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
-	<string></string>
+	<string>SCXcodeMinimap</string>
 	<key>XC4Compatible</key>
 	<true/>
 	<key>XCGCReady</key>

SCXcodeMinimap/SCXcodeMinimap.h

@@ -23,6 +23,9 @@ extern NSString *const SCXcodeMinimapShouldHighlightIssuesKey;
 extern NSString *const SCXcodeMinimapHighlightSelectedSymbolChangeNotification;
 extern NSString *const SCXcodeMinimapShouldHighlightSelectedSymbolKey;
 
+extern NSString *const SCXcodeMinimapHighlightSearchResultsChangeNotification;
+extern NSString *const SCXcodeMinimapShouldHighlightSearchResultsKey;
+
 extern NSString *const SCXcodeMinimapHighlightCommentsChangeNotification;
 extern NSString *const SCXcodeMinimapShouldHighlightCommentsKey;
 
@@ -35,6 +38,9 @@ extern NSString *const SCXcodeMinimapShouldHighlightEditorKey;
 extern NSString *const SCXcodeMinimapHideEditorScrollerChangeNotification;
 extern NSString *const SCXcodeMinimapShouldHideEditorScrollerKey;
 
+extern NSString *const SCXcodeMinimapAutohideChangeNotification;
+extern NSString *const SCXcodeMinimapShouldAutohideKey;
+
 extern NSString *const SCXcodeMinimapThemeChangeNotification;
 extern NSString *const SCXcodeMinimapThemeKey;
 

SCXcodeMinimap/SCXcodeMinimap.m

@@ -32,6 +32,9 @@
 NSString *const SCXcodeMinimapHighlightSelectedSymbolChangeNotification = @"SCXcodeMinimapHighlightSelectedSymbolChangeNotification";
 NSString *const SCXcodeMinimapShouldHighlightSelectedSymbolKey = @"SCXcodeMinimapShouldHighlightSelectedSymbolKey";
 
+NSString *const SCXcodeMinimapHighlightSearchResultsChangeNotification = @"SCXcodeMinimapHighlightSearchResultsChangeNotification";
+NSString *const SCXcodeMinimapShouldHighlightSearchResultsKey = @"SCXcodeMinimapShouldHighlightSearchResultsKey";
+
 NSString *const SCXcodeMinimapHighlightCommentsChangeNotification = @"SCXcodeMinimapHighlightCommentsChangeNotification";
 NSString *const SCXcodeMinimapShouldHighlightCommentsKey  = @"SCXcodeMinimapShouldHighlightCommentsKey";
 
@@ -44,6 +47,9 @@
 NSString *const SCXcodeMinimapHideEditorScrollerChangeNotification = @"SCXcodeMinimapHideEditorScrollerChangeNotification";
 NSString *const SCXcodeMinimapShouldHideEditorScrollerKey  = @"SCXcodeMinimapShouldHideEditorScrollerKey";
 
+NSString *const SCXcodeMinimapAutohideChangeNotification = @"SCXcodeMinimapAutohideChangeNotification";
+NSString *const SCXcodeMinimapShouldAutohideKey = @"SCXcodeMinimapShouldAutohideKey";
+
 NSString *const SCXcodeMinimapThemeChangeNotification = @"SCXcodeMinimapThemeChangeNotification";
 NSString *const SCXcodeMinimapThemeKey  = @"SCXcodeMinimapThemeKey";
 
@@ -58,10 +64,12 @@
 NSString *const kHighlightBreakpointsMenuItemTitle = @"Highlight breakpoints";
 NSString *const kHighlightIssuesMenuItemTitle = @"Highlight issues";
 NSString *const kHighlightSelectedSymbolMenuItemTitle = @"Highlight selected symbol";
+NSString *const kHighlightSearchResultsMenuItemTitle = @"Highlight search results";
 NSString *const kHighlightCommentsMenuItemTitle = @"Highlight comments";
 NSString *const kHighlightPreprocessorMenuItemTitle = @"Highlight preprocessor";
 NSString *const kHighlightEditorMenuItemTitle = @"Highlight main editor";
 NSString *const kHideEditorScrollerMenuItemTitle = @"Hide editor scroller";
+NSString *const kAutohideMenuItemTitle = @"Autohide";
 
 NSString *const kThemeMenuItemTitle = @"Theme";
 NSString *const kEditorThemeMenuItemTitle = @"Editor Theme";
@@ -99,6 +107,7 @@ - (void)registerUserDefaults
 								   SCXcodeMinimapShouldHighlightBreakpointsKey    : @(YES),
 								   SCXcodeMinimapShouldHighlightIssuesKey         : @(YES),
 								   SCXcodeMinimapShouldHighlightSelectedSymbolKey : @(YES),
+								   SCXcodeMinimapShouldHighlightSearchResultsKey  : @(YES),
 								   SCXcodeMinimapShouldHighlightCommentsKey       : @(YES),
 								   SCXcodeMinimapShouldHighlightPreprocessorKey   : @(YES)};
 
@@ -187,6 +196,15 @@ - (void)createMenuItem
 		[highlightSelectedSymbolMenuItem setState:(selectedSymbolHighlightingEnabled ? NSOnState : NSOffState)];
 
 
+		NSMenuItem *highlightSearchResultsMenuItem = [[NSMenuItem alloc] initWithTitle:kHighlightSearchResultsMenuItemTitle
+																				action:@selector(toggleSearchResultsHighlighting:) keyEquivalent:@""];
+		[highlightSearchResultsMenuItem setTarget:self];
+		[minimapMenu addItem:highlightSearchResultsMenuItem];
+		
+		BOOL searchResultsHighlightingEnabled = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldHighlightSearchResultsKey] boolValue];
+		[highlightSearchResultsMenuItem setState:(searchResultsHighlightingEnabled ? NSOnState : NSOffState)];
+		
+		
 		NSMenuItem *highlightCommentsMenuItem = [[NSMenuItem alloc] initWithTitle:kHighlightCommentsMenuItemTitle
 																		   action:@selector(toggleCommentsHighlighting:) keyEquivalent:@""];
 		[highlightCommentsMenuItem setTarget:self];
@@ -223,6 +241,15 @@ - (void)createMenuItem
 		[hideEditorScrollerMenuItem setState:(shouldHideEditorScroller ? NSOnState : NSOffState)];
 
 
+		NSMenuItem *autohideMenuItem = [[NSMenuItem alloc] initWithTitle:kAutohideMenuItemTitle
+																  action:@selector(toggleAutohide:) keyEquivalent:@""];
+		[autohideMenuItem setTarget:self];
+		[minimapMenu addItem:autohideMenuItem];
+		
+		BOOL shouldAutohide = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldAutohideKey] boolValue];
+		[autohideMenuItem setState:(shouldAutohide ? NSOnState : NSOffState)];
+		
+		
 		[minimapMenu addItem:[NSMenuItem separatorItem]];
 	}
 
@@ -312,6 +339,15 @@ - (void)toggleSelectedSymbolHighlighting:(NSMenuItem *)sender
 	[[NSNotificationCenter defaultCenter] postNotificationName:SCXcodeMinimapHighlightSelectedSymbolChangeNotification object:nil];
 }
 
+- (void)toggleSearchResultsHighlighting:(NSMenuItem *)sender
+{
+	BOOL searchResultsHighlightingEnabled = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldHighlightSearchResultsKey] boolValue];
+	
+	[sender setState:(searchResultsHighlightingEnabled ? NSOffState : NSOnState)];
+	[[NSUserDefaults standardUserDefaults] setObject:@(!searchResultsHighlightingEnabled) forKey:SCXcodeMinimapShouldHighlightSearchResultsKey];
+	[[NSNotificationCenter defaultCenter] postNotificationName:SCXcodeMinimapHighlightSearchResultsChangeNotification object:nil];
+}
+
 - (void)toggleCommentsHighlighting:(NSMenuItem *)sender
 {
 	BOOL commentsHighlightingEnabled = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldHighlightCommentsKey] boolValue];
@@ -348,6 +384,15 @@ - (void)toggleEditorScrollerHiding:(NSMenuItem *)sender
 	[[NSNotificationCenter defaultCenter] postNotificationName:SCXcodeMinimapHideEditorScrollerChangeNotification object:nil];
 }
 
+- (void)toggleAutohide:(NSMenuItem *)sender
+{
+	BOOL shouldAutohide = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldAutohideKey] boolValue];
+	
+	[sender setState:(shouldAutohide ? NSOffState : NSOnState)];
+	[[NSUserDefaults standardUserDefaults] setObject:@(!shouldAutohide) forKey:SCXcodeMinimapShouldAutohideKey];
+	[[NSNotificationCenter defaultCenter] postNotificationName:SCXcodeMinimapAutohideChangeNotification object:nil];
+}
+
 - (void)setMinimapTheme:(NSMenuItem *)sender
 {
 	NSString *currentThemeName = [[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapThemeKey];