Merged 'Xcode5.0' into master.

Author: stefanceriu

SCXcodeMinimap.xcodeproj/project.pbxproj

@@ -132,7 +132,7 @@
 		18FE09AA1707639E00118FEB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0460;
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "Stefan Ceriu";
 			};
 			buildConfigurationList = 18FE09AD1707639E00118FEB /* Build configuration list for PBXProject "SCXcodeMinimap" */;
@@ -180,7 +180,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -212,7 +211,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -236,10 +234,11 @@
 		18FE09C51707639E00118FEB /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = "$(HOME)";
-				GCC_ENABLE_OBJC_GC = supported;
+				GCC_ENABLE_OBJC_GC = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SCXcodeMinimap/SCXcodeMinimap-Prefix.pch";
 				INFOPLIST_FILE = "SCXcodeMinimap/SCXcodeMinimap-Info.plist";
@@ -252,10 +251,11 @@
 		18FE09C61707639E00118FEB /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = "$(HOME)";
-				GCC_ENABLE_OBJC_GC = supported;
+				GCC_ENABLE_OBJC_GC = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SCXcodeMinimap/SCXcodeMinimap-Prefix.pch";
 				INFOPLIST_FILE = "SCXcodeMinimap/SCXcodeMinimap-Info.plist";

SCXcodeMinimap/SCMiniMapView.h

@@ -11,10 +11,10 @@
 
 @interface SCMiniMapView : NSScrollView <NSLayoutManagerDelegate>
 
-@property (nonatomic, retain) NSTextView *textView;
-@property (nonatomic, retain) SCSelectionView *selectionView;
+@property (nonatomic, strong) NSTextView *textView;
+@property (nonatomic, strong) SCSelectionView *selectionView;
 
-@property (nonatomic, assign) NSScrollView *editorScrollView;
+@property (nonatomic, weak) NSScrollView *editorScrollView;
 @property (nonatomic, assign) NSTextView *editorTextView;
 
 - (void)updateTextView;

SCXcodeMinimap/SCMiniMapView.m

@@ -13,8 +13,8 @@
 
 @interface SCMiniMapView ()
 
-@property (nonatomic, retain) NSColor *backgroundColor;
-@property (nonatomic, retain) NSFont *font;
+@property (nonatomic, strong) NSColor *backgroundColor;
+@property (nonatomic, strong) NSFont *font;
 
 @end
 
@@ -54,12 +54,6 @@ - (id)initWithFrame:(NSRect)frame
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    
-    [_selectionView release];
-    [_textView release];
-    [_backgroundColor release];
-    [_font release];
-    [super dealloc];
 }
 
 #pragma mark - Lazy Initialization
@@ -73,7 +67,7 @@ - (NSTextView *)textView
         [_textView.textContainer setLineFragmentPadding:0.0f];
 
         [_textView.layoutManager setDelegate:self];
-
+        
         [_textView setAllowsUndo:NO];
         [_textView setAllowsImageEditing:NO];
         [_textView setAutomaticDashSubstitutionEnabled:NO];
@@ -151,9 +145,9 @@ - (void)show
 {
     self.hidden = NO;
 
-    NSRect frame = self.editorScrollView.frame;
-    frame.size.width = self.editorScrollView.superview.frame.size.width - self.bounds.size.width;
-    self.editorScrollView.frame = frame;
+    NSRect editorTextViewFrame = self.editorScrollView.frame;
+    editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width - self.bounds.size.width;
+    self.editorScrollView.frame = editorTextViewFrame;
 
     [self updateTextView];
     [self updateSelectionView];
@@ -163,21 +157,20 @@ - (void)hide
 {
     self.hidden = YES;
 
-    NSRect frame = self.editorScrollView.frame;
-    frame.size.width = self.editorScrollView.superview.frame.size.width;
-    self.editorScrollView.frame = frame;
+    NSRect editorTextViewFrame = self.editorScrollView.frame;
+    editorTextViewFrame.size.width = self.editorScrollView.superview.frame.size.width;
+    self.editorScrollView.frame = editorTextViewFrame;
 }
 
 #pragma mark - Updating
 
 - (void)updateTheme
 {
     [self setFont:nil];
-    [self updateTextView];
 
     [self setBackgroundColor:nil];
     [self.selectionView setSelectionColor:nil];
-	[self.textView setBackgroundColor:self.backgroundColor];
+    [self.textView setBackgroundColor:self.backgroundColor];
 }
 
 - (void)updateTextView
@@ -204,7 +197,6 @@ - (void)updateTextView
 
     [mutableAttributedString setAttributes:@{NSFontAttributeName: self.font, NSParagraphStyleAttributeName : style} range:NSMakeRange(0, mutableAttributedString.length)];
     [self.textView.textStorage setAttributedString:mutableAttributedString];
-    [mutableAttributedString release];
 }
 
 - (void)resizeWithOldSuperviewSize:(NSSize)oldSize
@@ -238,15 +230,20 @@ - (void)updateSelectionView
         ratio = (textHeight - self.selectionView.bounds.size.height) / editorContentHeight;
         selectionViewFrame.origin.y = self.editorScrollView.contentView.bounds.origin.y * ratio;
     }
-
+    
 	[self.selectionView setFrame:selectionViewFrame];
 }
 
 #pragma mark - NSLayoutManagerDelegate
 
 - (void)layoutManager:(NSLayoutManager *)layoutManager didCompleteLayoutForTextContainer:(NSTextContainer *)textContainer atEnd:(BOOL)layoutFinished
 {
-    if(layoutFinished) {
+    if([layoutManager isEqual:self.editorTextView.layoutManager]) {
+        [(id<NSLayoutManagerDelegate>)self.editorTextView layoutManager:layoutManager
+                                      didCompleteLayoutForTextContainer:textContainer
+                                                                  atEnd:layoutFinished];
+    }
+    else if(layoutFinished) {
         [self updateSelectionView];
     }
 }

SCXcodeMinimap/SCSelectionView.h

@@ -10,7 +10,7 @@
 
 @interface SCSelectionView : NSView
 
-@property (nonatomic, retain) NSColor *selectionColor;
+@property (nonatomic, strong) NSColor *selectionColor;
 @property (nonatomic, assign) BOOL shouldInverseColors;
 
 @end

SCXcodeMinimap/SCSelectionView.m

@@ -11,12 +11,6 @@
 @implementation SCSelectionView
 @synthesize selectionColor = _selectionColor;
 
-- (void)dealloc
-{
-    [self.selectionColor release];
-    [super dealloc];
-}
-
 - (void)drawRect:(NSRect)dirtyRect
 {
     [[self selectionColor] setFill];

SCXcodeMinimap/SCXcodeMinimap-Info.plist

@@ -22,6 +22,11 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>DVTPlugInCompatibilityUUIDs</key>
+	<array>
+		<string>63FC1C47-140D-42B0-BB4D-A10B2D225574</string>
+		<string>37B30044-3B14-46BA-ABAA-F01000C27B63</string>
+	</array>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2013 Stefan Ceriu. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

SCXcodeMinimap/SCXcodeMinimap.m

@@ -63,8 +63,6 @@ - (void)createMenuItem
                                atIndex:[editMenuItem.submenu numberOfItems]];
     [editMenuItem.submenu insertItem:miniMapItem
                                atIndex:[editMenuItem.submenu numberOfItems]];
-    
-    [miniMapItem release];
 
     if ([[NSUserDefaults standardUserDefaults] boolForKey:SCXodeMinimapIsInitiallyHidden]) {
         [self hideMiniMap:miniMapItem];
@@ -96,10 +94,14 @@ - (void)showMiniMap:(NSMenuItem *)sender
 
 - (void)onDocumentDidChange:(NSNotification*)sender
 {
+	if ([[[sender object] class] isSubclassOfClass:[NSDocument class]])
+	{
     SCMiniMapView *miniMapView = objc_getAssociatedObject([sender object], &kKeyMiniMapView);
     [miniMapView updateTextView];
 }
 
+}
+
 - (void)onCodeEditorBoundsChange:(NSNotification*)sender
 {
     if(![sender.object respondsToSelector:@selector(scrollView)]) {
@@ -161,8 +163,6 @@ - (void)onDidFinishSetup:(NSNotification*)sender
     else {
         [miniMapView show];
     }
-
-    [miniMapView release];
 }
 
 @end