Xcode 7 beta support.

stefanceriu · stefanceriu · commit d0e5f3a52dc3 · 2015-06-08T22:30:59.000+01:00
diff --git a/SCXcodeMinimap.xcodeproj/project.pbxproj b/SCXcodeMinimap.xcodeproj/project.pbxproj
@@ -30,6 +30,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		180790681B263C200026A519 /* DVTFoldingManagerDelegate-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DVTFoldingManagerDelegate-Protocol.h"; sourceTree = "<group>"; };
+		180790691B263CF60026A519 /* DVTTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTTextView.h; sourceTree = "<group>"; };
 		1809FF8D1AED1A730058D946 /* NSScroller+SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScroller+SCXcodeMinimap.h"; sourceTree = "<group>"; };
 		1809FF8E1AED1A730058D946 /* NSScroller+SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScroller+SCXcodeMinimap.m"; sourceTree = "<group>"; };
 		180F0C651A98AE1500E97254 /* DVTAnnotationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTAnnotationManager.h; sourceTree = "<group>"; };
@@ -141,6 +143,7 @@
 				18DE6AFB1B203D070042615D /* DVTFindResult.h */,
 				18C8F0331A7ECB1300C7A76F /* DVTFoldingLayoutManager.h */,
 				18269AD51A8F2F4300953B3D /* DVTFoldingManager.h */,
+				180790681B263C200026A519 /* DVTFoldingManagerDelegate-Protocol.h */,
 				184C11721A740F8A002A7C65 /* DVTFontAndColorTheme.h */,
 				184C11731A740F8A002A7C65 /* DVTInvalidation-Protocol.h */,
 				18C8F0341A7ECB1300C7A76F /* DVTLayoutManager.h */,
@@ -156,6 +159,7 @@
 				188D38771A98B3AC005C7F85 /* DVTTextAnnotation.h */,
 				184407641A8F7B1900C530CF /* DVTTextDocumentLocation.h */,
 				184C117B1A740F8A002A7C65 /* DVTTextStorage.h */,
+				180790691B263CF60026A519 /* DVTTextView.h */,
 				184C117C1A740F8A002A7C65 /* DVTViewController.h */,
 				18CA02B61A9D0DF1001C5CE1 /* IDEBreakpoint.h */,
 				18E577F61B119BF200421483 /* IDEBuildIssueAnnotation.h */,
diff --git a/SCXcodeMinimap/SCXcodeMinimap-Info.plist b/SCXcodeMinimap/SCXcodeMinimap-Info.plist
@@ -37,6 +37,7 @@
 		<string>992275C1-432A-4CF7-B659-D84ED6D42D3F</string>
 		<string>E969541F-E6F9-4D25-8158-72DC3545A6C6</string>
 		<string>8DC44374-2B35-4C57-A6FE-2AD66A36AAD9</string>
+		<string>AABB7188-E14E-4433-AD3B-5CD791EAD9A3</string>
 	</array>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
diff --git a/SCXcodeMinimap/SCXcodeMinimapView.m b/SCXcodeMinimap/SCXcodeMinimapView.m
@@ -120,7 +120,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
 		[self.editor setSearchResultsDelegate:self];
 		
 		self.editorTextView = editor.textView;
-		
+
 		[self setWantsLayer:YES];
 		[self setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin | NSViewWidthSizable | NSViewHeightSizable];
 		
@@ -145,7 +145,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
 		[self.textView setTextStorage:storage];
 		[storage addLayoutManager:self.editorTextView.layoutManager];
 		
-		[self.editorTextView.foldingManager setDelegate:self];
+		[self.editorTextView.layoutManager.foldingManager setDelegate:self];
 		
 		[self.textView setEditable:NO];
 		[self.textView setSelectable:NO];
@@ -157,7 +157,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
 		
 		[self updateTheme];
 		
-		for(NSDictionary *providerDictionary in self.editorTextView.annotationManager.annotationProviders) {
+		for(NSDictionary *providerDictionary in [self.editorTextView.annotationManager valueForKeyPath:@"_annotationProviders"]) {
 			
 			id annotationProvider = providerDictionary[@"annotationProviderObject"];
 			if([annotationProvider isKindOfClass:[DBGBreakpointAnnotationProvider class]]) {
@@ -439,7 +439,7 @@ - (void)foldingManager:(DVTFoldingManager *)foldingManager didFoldRange:(NSRange
 {
 	[(DVTLayoutManager *)self.editorTextView.layoutManager foldingManager:foldingManager didFoldRange:range];
 	
-	[self.textView.foldingManager foldRange:range];
+	[self.textView.layoutManager.foldingManager foldRange:range];
 	
 	[self.textView.layoutManager ensureLayoutForTextContainer:self.textView.textContainer];
 	[self updateOffset];
@@ -449,7 +449,7 @@ - (void)foldingManager:(DVTFoldingManager *)foldingManager didUnfoldRange:(NSRan
 {
 	[(DVTLayoutManager *)self.editorTextView.layoutManager foldingManager:foldingManager didUnfoldRange:range];
 	
-	[self.textView.foldingManager unfoldRange:range];
+	[self.textView.layoutManager.foldingManager unfoldRange:range];
 	
 	[self.textView.layoutManager ensureLayoutForTextContainer:self.textView.textContainer];
 	[self updateOffset];
diff --git a/SCXcodeMinimap/Xcode Headers/DVTAnnotationManager.h b/SCXcodeMinimap/Xcode Headers/DVTAnnotationManager.h
@@ -1,22 +1,32 @@
-/*
- *     Generated by class-dump 3.3.4 (64 bit).
- *
- *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
- */
+//
+//     Generated by class-dump 3.5 (64 bit).
+//
+//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
+//
 
-
-@class DVTAnnotationContext, NSMutableArray;
+@class DVTStackBacktrace, NSMutableArray, NSString;
 
 @interface DVTAnnotationManager : NSObject
 {
 	NSMutableArray *_annotationProviders;
-	DVTAnnotationContext *_context;
 }
 
-@property(retain) DVTAnnotationContext *context; // @synthesize context=_context;
-@property(retain) NSMutableArray *annotationProviders; // @synthesize annotationProviders=_annotationProviders;
++ (unsigned long long)assertionBehaviorForKeyValueObservationsAtEndOfEvent;
++ (unsigned long long)assertionBehaviorAfterEndOfEventForSelector:(SEL)arg1;
++ (void)initialize;
 - (void)removeAllAnnotationProviders;
 - (void)setupAnnotationProvidersWithContext:(id)arg1;
 - (id)_installObservationBlockForAnnotationProvider:(id)arg1;
+- (void)primitiveInvalidate;
+
+// Remaining properties
+@property(retain) DVTStackBacktrace *creationBacktrace;
+@property(readonly, copy) NSString *debugDescription;
+@property(readonly, copy) NSString *description;
+@property(readonly) unsigned long long hash;
+@property(readonly) DVTStackBacktrace *invalidationBacktrace;
+@property(readonly) Class superclass;
+@property(readonly, nonatomic, getter=isValid) BOOL valid;
 
 @end
+
diff --git a/SCXcodeMinimap/Xcode Headers/DVTCompletingTextView.h b/SCXcodeMinimap/Xcode Headers/DVTCompletingTextView.h
@@ -1,35 +1,36 @@
-/*
- *     Generated by class-dump 3.3.4 (64 bit).
- *
- *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
- */
+//
+//     Generated by class-dump 3.5 (64 bit).
+//
+//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
+//
 
-#import <AppKit/NSTextView.h>
+#import "DVTTextView.h"
+#import "DVTTextStorage.h"
+#import "DVTLayoutManager.h"
 
-@class DVTFoldingLayoutManager, DVTFoldingManager, DVTSourceCodeLanguage, DVTTextCompletionController, DVTTextCompletionDataSource, NSColor;
+@class DVTLayoutManager, DVTSourceCodeLanguage, DVTTextCompletionController, DVTTextCompletionDataSource, DVTTextStorage, NSCharacterSet, NSColor, NSString;
 
-@interface DVTCompletingTextView : NSTextView
+@interface DVTCompletingTextView : DVTTextView
 {
 	DVTTextCompletionController *_completionController;
 	DVTTextCompletionDataSource *_completionsDataSource;
 	NSColor *_secondarySelectedTextBackgroundColor;
-	unsigned long long _accessoryAnnotationWidth;
+	double _accessoryAnnotationWidth;
 	unsigned long long _modifierFlagsAtLastSingleMouseDown;
 	BOOL _tabSelectsNextPlaceholder;
 }
 
 + (id)readableTextPasteboardTypes;
 + (long long)scrollerKnobStyleForBackgroundColor:(id)arg1;
 + (id)_operatorChars;
-+ (id)autoCompleteChars;
 + (id)identifierChars;
 + (id)_identifierCharsForImportStatements;
 + (BOOL)appSupportsActionMonitoring;
 @property(copy, nonatomic) NSColor *secondarySelectedTextBackgroundColor; // @synthesize secondarySelectedTextBackgroundColor=_secondarySelectedTextBackgroundColor;
 @property BOOL tabSelectsNextPlaceholder; // @synthesize tabSelectsNextPlaceholder=_tabSelectsNextPlaceholder;
 @property(readonly) DVTTextCompletionController *completionController; // @synthesize completionController=_completionController;
 @property unsigned long long modifierFlagsAtLastSingleMouseDown; // @synthesize modifierFlagsAtLastSingleMouseDown=_modifierFlagsAtLastSingleMouseDown;
-@property unsigned long long accessoryAnnotationWidth; // @synthesize accessoryAnnotationWidth=_accessoryAnnotationWidth;
+@property double accessoryAnnotationWidth; // @synthesize accessoryAnnotationWidth=_accessoryAnnotationWidth;
 - (void)setMarkedText:(id)arg1 selectedRange:(struct _NSRange)arg2;
 - (void)becomeMainWindow;
 - (void)resignKeyWindow;
@@ -54,14 +55,14 @@
 - (void)drawRect:(struct CGRect)arg1;
 - (void)_drawRect:(struct CGRect)arg1 clip:(BOOL)arg2;
 - (void)_drawOverlayRect:(struct CGRect)arg1;
+- (void)moveDown:(id)arg1;
 - (void)setSelectedRange:(struct _NSRange)arg1;
 - (void)setSelectedRanges:(id)arg1 affinity:(unsigned long long)arg2 stillSelecting:(BOOL)arg3;
 - (void)_replaceFoldWithContents:(id)arg1;
-- (id)_formatBlockLiteralFromDeclaration:(id)arg1 lineCount:(unsigned long long *)arg2;
 - (void)textStorage:(id)arg1 didEndEditRange:(struct _NSRange)arg2 changeInLength:(long long)arg3;
 - (void)textStorage:(id)arg1 willEndEditRange:(struct _NSRange)arg2 changeInLength:(long long)arg3;
-- (id)textStorage;
-- (id)layoutManager;
+@property(readonly) DVTTextStorage *textStorage;
+@property(readonly) DVTLayoutManager *layoutManager;
 - (void)didInsertCompletionTextAtRange:(struct _NSRange)arg1;
 - (void)invalidateDisplayForRange:(struct _NSRange)arg1;
 - (unsigned long long)draggingEntered:(id)arg1;
@@ -79,13 +80,15 @@
 - (void)previousCompletion:(id)arg1;
 - (void)nextCompletion:(id)arg1;
 - (void)complete:(id)arg1;
-- (BOOL)shouldChangeTextInRange:(struct _NSRange)arg1 replacementString:(id)arg2;
+- (BOOL)shouldChangeTextInRanges:(id)arg1 replacementStrings:(id)arg2;
 - (void)deleteForward:(id)arg1;
 - (void)deleteBackward:(id)arg1;
 - (void)insertText:(id)arg1 replacementRange:(struct _NSRange)arg2;
 - (void)doCommandBySelector:(SEL)arg1;
-- (void)foldingLayoutManagerFoldsChanged:(id)arg1;
-- (id)layoutManager:(id)arg1 shouldUseTextBackgroundColor:(id)arg2 rectArray:(struct CGRect *)arg3 count:(unsigned long long)arg4 forCharacterRange:(struct _NSRange)arg5;
+- (void)layoutManager:(id)arg1 didUnfoldRange:(struct _NSRange)arg2;
+- (void)layoutManager:(id)arg1 didFoldRange:(struct _NSRange)arg2;
+- (void)_foldingLayoutManagerFoldsChanged:(id)arg1;
+- (id)layoutManager:(id)arg1 shouldUseTextBackgroundColor:(id)arg2 rectArray:(const struct CGRect *)arg3 count:(unsigned long long)arg4 forCharacterRange:(struct _NSRange)arg5;
 - (id)layoutManager:(id)arg1 shouldUseTemporaryAttributes:(id)arg2 forDrawingToScreen:(BOOL)arg3 atCharacterIndex:(unsigned long long)arg4 effectiveRange:(struct _NSRange *)arg5;
 - (void)showMatchingBraceAtLocation:(id)arg1;
 - (void)autoHighlightMatchingBracketAtLocationIfNecessary:(unsigned long long)arg1;
@@ -95,29 +98,35 @@
 - (BOOL)_moveToNextPlaceholderFromCharacterIndex:(unsigned long long)arg1 forward:(BOOL)arg2 onlyIfNearby:(BOOL)arg3;
 - (struct _NSRange)_findString:(id)arg1 inString:(id)arg2 fromRange:(struct _NSRange)arg3 limitRange:(struct _NSRange)arg4 forward:(BOOL)arg5 wrap:(BOOL)arg6;
 - (struct _NSRange)rangeOfPlaceholderFromCharacterIndex:(unsigned long long)arg1 forward:(BOOL)arg2 wrap:(BOOL)arg3 limit:(unsigned long long)arg4;
+- (struct _NSRange)_rangeOfPlaeholderWithStartPrefix:(id)arg1 endSuffix:(id)arg2 inString:(id)arg3 fromRange:(struct _NSRange)arg4 limitRange:(struct _NSRange)arg5 forward:(BOOL)arg6 wrap:(BOOL)arg7;
 - (BOOL)selectFirstPlaceholderInCharacterRange:(struct _NSRange)arg1;
 - (BOOL)handleSelectPreviousPlaceholder;
 - (BOOL)handleSelectNextPlaceholder;
 - (id)ghostComplementTextColor;
 - (BOOL)shouldAutoCompleteAtLocation:(unsigned long long)arg1;
 - (BOOL)shouldSuppressTextCompletion;
+@property(readonly, copy) NSCharacterSet *autoCompleteChars;
 @property(readonly) double autoCompletionDelay;
 - (id)contextForCompletionStrategiesAtWordStartLocation:(unsigned long long)arg1;
 @property(readonly) DVTTextCompletionDataSource *completionsDataSource;
 - (struct _NSRange)wordRangeAtLocation:(unsigned long long)arg1;
 @property(readonly) DVTSourceCodeLanguage *language;
-- (struct CGRect)frameForRange:(struct _NSRange)arg1;
 - (void)dealloc;
 - (id)initWithCoder:(id)arg1;
 - (id)initWithFrame:(struct CGRect)arg1;
 - (id)initWithFrame:(struct CGRect)arg1 textContainer:(id)arg2;
 - (void)_dvtCommonInit;
 - (id)currentTheme;
-@property(readonly) DVTFoldingManager *foldingManager;
-@property(readonly) DVTFoldingLayoutManager *foldingLayoutManager;
 - (BOOL)removeMenusNotInWhiteList:(id)arg1 fromMenu:(id)arg2 removeSeparators:(BOOL)arg3;
 - (id)cell;
 - (id)selectedCell;
 - (id)accessibilityAttributeValue:(id)arg1;
 
+// Remaining properties
+@property(readonly, copy) NSString *debugDescription;
+@property(readonly, copy) NSString *description;
+@property(readonly) unsigned long long hash;
+@property(readonly) Class superclass;
+
 @end
+
diff --git a/SCXcodeMinimap/Xcode Headers/DVTFoldingManager.h b/SCXcodeMinimap/Xcode Headers/DVTFoldingManager.h
@@ -1,11 +1,12 @@
-/*
- *     Generated by class-dump 3.3.4 (64 bit).
- *
- *     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
- */
+//
+//     Generated by class-dump 3.5 (64 bit).
+//
+//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
+//
+
+#import "DVTFoldingManagerDelegate-Protocol.h"
 
 @class DVTTextFold;
-@protocol DVTFoldingManagerDelegate;
 
 @interface DVTFoldingManager : NSObject
 {
@@ -15,6 +16,7 @@
 
 @property(retain, nonatomic) DVTTextFold *topLevelFold; // @synthesize topLevelFold=_topLevelFold;
 @property __weak id <DVTFoldingManagerDelegate> delegate; // @synthesize delegate;
+- (id)fixedSelectionRangesForRanges:(id)arg1 affinity:(unsigned long long)arg2 inTextView:(id)arg3;
 - (id)adjustFoldsForRange:(struct _NSRange)arg1 changeInLength:(long long)arg2;
 - (id)foldsEnclosingRange:(struct _NSRange)arg1;
 - (id)lastFoldTouchingCharacterIndex:(unsigned long long)arg1;
@@ -25,9 +27,9 @@
 - (BOOL)isCharacterRangeFolded:(struct _NSRange)arg1;
 - (BOOL)containsFoldWithRange:(struct _NSRange)arg1;
 - (BOOL)isCharacterFoldedAtIndex:(unsigned long long)arg1;
-- (void)foldRecursiveItem:(id)arg1;
-- (void)unfoldItems:(id)arg1;
-- (void)foldItems:(id)arg1;
+- (void)foldRangesRecursively:(id)arg1;
+- (void)unfoldRanges:(id)arg1;
+- (void)foldRanges:(id)arg1;
 - (void)unfoldRecursiveRange:(struct _NSRange)arg1;
 - (void)unfoldEnclosingRange:(struct _NSRange)arg1;
 - (void)unfoldRange:(struct _NSRange)arg1;
@@ -42,7 +44,3 @@
 
 @end
 
-@protocol DVTFoldingManagerDelegate <NSObject>
-- (void)foldingManager:(id)arg1 didUnfoldRange:(struct _NSRange)arg2;
-- (void)foldingManager:(id)arg1 didFoldRange:(struct _NSRange)arg2;
-@end
diff --git a/SCXcodeMinimap/Xcode Headers/DVTFoldingManagerDelegate-Protocol.h b/SCXcodeMinimap/Xcode Headers/DVTFoldingManagerDelegate-Protocol.h
@@ -0,0 +1,13 @@
+//
+//     Generated by class-dump 3.5 (64 bit).
+//
+//     class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
+//
+
+@class DVTFoldingManager;
+
+@protocol DVTFoldingManagerDelegate <NSObject>
+- (void)foldingManager:(DVTFoldingManager *)arg1 didUnfoldRange:(struct _NSRange)arg2;
+- (void)foldingManager:(DVTFoldingManager *)arg1 didFoldRange:(struct _NSRange)arg2;
+@end
+
diff --git a/SCXcodeMinimap/Xcode Headers/DVTSourceTextView.h b/SCXcodeMinimap/Xcode Headers/DVTSourceTextView.h
diff --git a/SCXcodeMinimap/Xcode Headers/DVTTextView.h b/SCXcodeMinimap/Xcode Headers/DVTTextView.h
