Various tweaks and fixes.

Author: stefanceriu

README.md

@@ -1,26 +1,34 @@
-# SCXcodeMiniMap
+# SCXcodeMinimap v2.0
+SCXcodeMiniMap is a Xcode plugin that adds a source editor Minimap to Xcode.
 
-SCXcodeMiniMap is a plugin that adds a source editor MiniMap to Xcode.
+Version 2.0 has been rewritten from the ground up to address performance issues (delays on large source files - 1000+ lines) and for creating a better base to build upon. As such, the following new features are now supported:
 
-![SCXcodeMiniMap](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/SCXcodeMiniMapv1.3.png)
+#### New Features
+- Faster syntax highlighting
+- Shows code foldings
+- Comment and preprocessor directive highlighting
+- Breakpoint highlighting
+- All highlighting options are also available for the main Xcode editor
+- Custom themes
+- All options are accessible from the View/Minimap menu item
 
-## Features
-- It works with an unlimited number of opened editors, including the assistant and version editors
-- The minimap and its selection view scroll seamlessly with the editor and provide a nice way of figuring out the current position in the document
-- Full syntax highlighting
-- It blends with the currently selected theme 
-- View menu item for showing/hiding it (Ctrl+Shift+M)
-- Size configurable via the kDefaultZoomLevel parameter (defaults to 10% out of the editor's size)
+#### Screenshots
+Without editor highlighting |  With editor highlighting
+:--------------------------:|:--------------------------:
+![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-01.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-03.png)  |
+![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-02.png)  | ![](https://dl.dropboxusercontent.com/u/12748201/SCXcodeMiniMap/v2.0/SCXcodeMinimap%20v2.0-04.png)  |
 
-## Installation
-- Build the project and restart Xcode or
+#### Installation
+- Through [Alcatraz](https://github.com/supermarin/Alcatraz)
+
+- 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
 
 - If you encounter any issues you can uninstall it by removing the ~/Library/Application Support/Developer/Shared/Xcode/Plug-ins/SCXcodeMinimap.xcplugin folder
 
-## License
+#### License
 SCXcodeMiniMap is released under the GNU GENERAL PUBLIC LICENSE (see the LICENSE file)
 
-## Contact
+#### Contact
 Any suggestions or improvements are more than welcome. Feel free to contact me at [stefan.ceriu@yahoo.com](mailto:stefan.ceriu@yahoo.com) or [@stefanceriu](https://twitter.com/stefanceriu).

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		18143CC41A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18143CC31A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.m */; };
 		184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */; };
 		184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */; };
 		184C118F1A741136002A7C65 /* DVTFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184C118E1A741136002A7C65 /* DVTFoundation.framework */; };
@@ -26,8 +25,6 @@
 /* Begin PBXFileReference section */
 		180F0C651A98AE1500E97254 /* DVTAnnotationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTAnnotationManager.h; sourceTree = "<group>"; };
 		1812C3911A77A7CF00E2CFB3 /* IDESourceCodeDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = IDESourceCodeDocument.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-		18143CC21A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DVTTextDocumentLocation+SCXcodeMinimap.h"; sourceTree = "<group>"; };
-		18143CC31A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DVTTextDocumentLocation+SCXcodeMinimap.m"; sourceTree = "<group>"; };
 		18269AD51A8F2F4300953B3D /* DVTFoldingManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTFoldingManager.h; sourceTree = "<group>"; };
 		184407641A8F7B1900C530CF /* DVTTextDocumentLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTTextDocumentLocation.h; sourceTree = "<group>"; };
 		184407651A8F7B3E00C530CF /* DVTDocumentLocation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTDocumentLocation.h; sourceTree = "<group>"; };
@@ -186,8 +183,6 @@
 				184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */,
 				184C11811A740F97002A7C65 /* SCXcodeMinimapSelectionView.h */,
 				184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */,
-				18143CC21A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.h */,
-				18143CC31A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.m */,
 				188FCC881A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.h */,
 				188FCC891A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.m */,
 				18FE09BC1707639E00118FEB /* Supporting Files */,
@@ -268,7 +263,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				188FCC8A1A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.m in Sources */,
-				18143CC41A98A83700BD8DD8 /* DVTTextDocumentLocation+SCXcodeMinimap.m in Sources */,
 				18FE09C9170764E400118FEB /* SCXcodeMinimap.m in Sources */,
 				184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */,
 				184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */,

SCXcodeMinimap/DVTTextDocumentLocation+SCXcodeMinimap.h

@@ -214,11 +214,11 @@ - (void)setVisible:(BOOL)visible
 	if(visible) {
 		[self updateOffset];
 		[self.textView.layoutManager setDelegate:self];
-		
-		BOOL editorHighlightingEnabled = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldHighlightEditorKey] boolValue];
-		if(editorHighlightingEnabled) {
-			[self.editorTextView.layoutManager setDelegate:self];
-		}
+	}
+	
+	BOOL editorHighlightingEnabled = [[[NSUserDefaults standardUserDefaults] objectForKey:SCXcodeMinimapShouldHighlightEditorKey] boolValue];
+	if(editorHighlightingEnabled) {
+		[self.editorTextView.layoutManager setDelegate:self];
 	}
 }
 
@@ -230,7 +230,11 @@ - (NSDictionary *)layoutManager:(NSLayoutManager *)layoutManager
 			   atCharacterIndex:(NSUInteger)charIndex
 				 effectiveRange:(NSRangePointer)effectiveCharRange
 {
-	if(!toScreen || self.hidden) {
+	if(!toScreen) {
+		return nil;
+	}
+	
+	if(self.hidden && [layoutManager isEqual:self.textView.layoutManager]) {
 		return nil;
 	}