Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd0e5f3a

Browse files
committed
Xcode 7 beta support.
1 parent459a747 commitd0e5f3a

File tree

9 files changed

+158
-102
lines changed

9 files changed

+158
-102
lines changed

‎SCXcodeMinimap.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
/* End PBXBuildFile section */
3131

3232
/* Begin PBXFileReference section */
33+
180790681B263C200026A519 /* DVTFoldingManagerDelegate-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DVTFoldingManagerDelegate-Protocol.h"; sourceTree = "<group>"; };
34+
180790691B263CF60026A519 /* DVTTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTTextView.h; sourceTree = "<group>"; };
3335
1809FF8D1AED1A730058D946 /* NSScroller+SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScroller+SCXcodeMinimap.h"; sourceTree = "<group>"; };
3436
1809FF8E1AED1A730058D946 /* NSScroller+SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScroller+SCXcodeMinimap.m"; sourceTree = "<group>"; };
3537
180F0C651A98AE1500E97254 /* DVTAnnotationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTAnnotationManager.h; sourceTree = "<group>"; };
@@ -141,6 +143,7 @@
141143
18DE6AFB1B203D070042615D /* DVTFindResult.h */,
142144
18C8F0331A7ECB1300C7A76F /* DVTFoldingLayoutManager.h */,
143145
18269AD51A8F2F4300953B3D /* DVTFoldingManager.h */,
146+
180790681B263C200026A519 /* DVTFoldingManagerDelegate-Protocol.h */,
144147
184C11721A740F8A002A7C65 /* DVTFontAndColorTheme.h */,
145148
184C11731A740F8A002A7C65 /* DVTInvalidation-Protocol.h */,
146149
18C8F0341A7ECB1300C7A76F /* DVTLayoutManager.h */,
@@ -156,6 +159,7 @@
156159
188D38771A98B3AC005C7F85 /* DVTTextAnnotation.h */,
157160
184407641A8F7B1900C530CF /* DVTTextDocumentLocation.h */,
158161
184C117B1A740F8A002A7C65 /* DVTTextStorage.h */,
162+
180790691B263CF60026A519 /* DVTTextView.h */,
159163
184C117C1A740F8A002A7C65 /* DVTViewController.h */,
160164
18CA02B61A9D0DF1001C5CE1 /* IDEBreakpoint.h */,
161165
18E577F61B119BF200421483 /* IDEBuildIssueAnnotation.h */,

‎SCXcodeMinimap/SCXcodeMinimap-Info.plist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<string>992275C1-432A-4CF7-B659-D84ED6D42D3F</string>
3838
<string>E969541F-E6F9-4D25-8158-72DC3545A6C6</string>
3939
<string>8DC44374-2B35-4C57-A6FE-2AD66A36AAD9</string>
40+
<string>AABB7188-E14E-4433-AD3B-5CD791EAD9A3</string>
4041
</array>
4142
<key>LSMinimumSystemVersion</key>
4243
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>

‎SCXcodeMinimap/SCXcodeMinimapView.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
120120
[self.editorsetSearchResultsDelegate:self];
121121

122122
self.editorTextView = editor.textView;
123-
123+
124124
[selfsetWantsLayer:YES];
125125
[selfsetAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin | NSViewWidthSizable | NSViewHeightSizable];
126126

@@ -145,7 +145,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
145145
[self.textViewsetTextStorage:storage];
146146
[storageaddLayoutManager:self.editorTextView.layoutManager];
147147

148-
[self.editorTextView.foldingManagersetDelegate:self];
148+
[self.editorTextView.layoutManager.foldingManagersetDelegate:self];
149149

150150
[self.textViewsetEditable:NO];
151151
[self.textViewsetSelectable:NO];
@@ -157,7 +157,7 @@ - (instancetype)initWithEditor:(IDESourceCodeEditor *)editor
157157

158158
[selfupdateTheme];
159159

160-
for(NSDictionary *providerDictionary in self.editorTextView.annotationManager.annotationProviders) {
160+
for(NSDictionary *providerDictionary in[self.editorTextView.annotationManagervalueForKeyPath:@"_annotationProviders"]) {
161161

162162
id annotationProvider = providerDictionary[@"annotationProviderObject"];
163163
if([annotationProviderisKindOfClass:[DBGBreakpointAnnotationProviderclass]]) {
@@ -439,7 +439,7 @@ - (void)foldingManager:(DVTFoldingManager *)foldingManager didFoldRange:(NSRange
439439
{
440440
[(DVTLayoutManager *)self.editorTextView.layoutManagerfoldingManager:foldingManagerdidFoldRange:range];
441441

442-
[self.textView.foldingManagerfoldRange:range];
442+
[self.textView.layoutManager.foldingManagerfoldRange:range];
443443

444444
[self.textView.layoutManagerensureLayoutForTextContainer:self.textView.textContainer];
445445
[selfupdateOffset];
@@ -449,7 +449,7 @@ - (void)foldingManager:(DVTFoldingManager *)foldingManager didUnfoldRange:(NSRan
449449
{
450450
[(DVTLayoutManager *)self.editorTextView.layoutManagerfoldingManager:foldingManagerdidUnfoldRange:range];
451451

452-
[self.textView.foldingManagerunfoldRange:range];
452+
[self.textView.layoutManager.foldingManagerunfoldRange:range];
453453

454454
[self.textView.layoutManagerensureLayoutForTextContainer:self.textView.textContainer];
455455
[selfupdateOffset];
Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1-
/*
2-
*Generated by class-dump 3.3.4 (64 bit).
3-
*
4-
*class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
5-
*/
1+
//
2+
// Generated by class-dump 3.5 (64 bit).
3+
//
4+
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
5+
//
66

7-
8-
@class DVTAnnotationContext,NSMutableArray;
7+
@class DVTStackBacktrace,NSMutableArray,NSString;
98

109
@interfaceDVTAnnotationManager :NSObject
1110
{
1211
NSMutableArray *_annotationProviders;
13-
DVTAnnotationContext *_context;
1412
}
1513

16-
@property(retain) DVTAnnotationContext *context;// @synthesize context=_context;
17-
@property(retain)NSMutableArray *annotationProviders;// @synthesize annotationProviders=_annotationProviders;
14+
+ (unsignedlonglong)assertionBehaviorForKeyValueObservationsAtEndOfEvent;
15+
+ (unsignedlonglong)assertionBehaviorAfterEndOfEventForSelector:(SEL)arg1;
16+
+ (void)initialize;
1817
- (void)removeAllAnnotationProviders;
1918
- (void)setupAnnotationProvidersWithContext:(id)arg1;
2019
- (id)_installObservationBlockForAnnotationProvider:(id)arg1;
20+
- (void)primitiveInvalidate;
21+
22+
// Remaining properties
23+
@property(retain) DVTStackBacktrace *creationBacktrace;
24+
@property(readonly,copy)NSString *debugDescription;
25+
@property(readonly,copy)NSString *description;
26+
@property(readonly)unsignedlonglong hash;
27+
@property(readonly) DVTStackBacktrace *invalidationBacktrace;
28+
@property(readonly)Class superclass;
29+
@property(readonly,nonatomic,getter=isValid)BOOL valid;
2130

2231
@end
32+

‎SCXcodeMinimap/Xcode Headers/DVTCompletingTextView.h

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,36 @@
1-
/*
2-
*Generated by class-dump 3.3.4 (64 bit).
3-
*
4-
*class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
5-
*/
1+
//
2+
// Generated by class-dump 3.5 (64 bit).
3+
//
4+
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
5+
//
66

7-
#import<AppKit/NSTextView.h>
7+
#import"DVTTextView.h"
8+
#import"DVTTextStorage.h"
9+
#import"DVTLayoutManager.h"
810

9-
@classDVTFoldingLayoutManager, DVTFoldingManager,DVTSourceCodeLanguage, DVTTextCompletionController, DVTTextCompletionDataSource,NSColor;
11+
@classDVTLayoutManager,DVTSourceCodeLanguage, DVTTextCompletionController, DVTTextCompletionDataSource,DVTTextStorage,NSCharacterSet,NSColor,NSString;
1012

11-
@interfaceDVTCompletingTextView :NSTextView
13+
@interfaceDVTCompletingTextView :DVTTextView
1214
{
1315
DVTTextCompletionController *_completionController;
1416
DVTTextCompletionDataSource *_completionsDataSource;
1517
NSColor *_secondarySelectedTextBackgroundColor;
16-
unsignedlonglong _accessoryAnnotationWidth;
18+
double _accessoryAnnotationWidth;
1719
unsignedlonglong _modifierFlagsAtLastSingleMouseDown;
1820
BOOL _tabSelectsNextPlaceholder;
1921
}
2022

2123
+ (id)readableTextPasteboardTypes;
2224
+ (longlong)scrollerKnobStyleForBackgroundColor:(id)arg1;
2325
+ (id)_operatorChars;
24-
+ (id)autoCompleteChars;
2526
+ (id)identifierChars;
2627
+ (id)_identifierCharsForImportStatements;
2728
+ (BOOL)appSupportsActionMonitoring;
2829
@property(copy,nonatomic)NSColor *secondarySelectedTextBackgroundColor;// @synthesize secondarySelectedTextBackgroundColor=_secondarySelectedTextBackgroundColor;
2930
@propertyBOOL tabSelectsNextPlaceholder;// @synthesize tabSelectsNextPlaceholder=_tabSelectsNextPlaceholder;
3031
@property(readonly) DVTTextCompletionController *completionController;// @synthesize completionController=_completionController;
3132
@propertyunsignedlonglong modifierFlagsAtLastSingleMouseDown;// @synthesize modifierFlagsAtLastSingleMouseDown=_modifierFlagsAtLastSingleMouseDown;
32-
@propertyunsignedlonglong accessoryAnnotationWidth;// @synthesize accessoryAnnotationWidth=_accessoryAnnotationWidth;
33+
@propertydouble accessoryAnnotationWidth;// @synthesize accessoryAnnotationWidth=_accessoryAnnotationWidth;
3334
- (void)setMarkedText:(id)arg1selectedRange:(struct _NSRange)arg2;
3435
- (void)becomeMainWindow;
3536
- (void)resignKeyWindow;
@@ -54,14 +55,14 @@
5455
- (void)drawRect:(struct CGRect)arg1;
5556
- (void)_drawRect:(struct CGRect)arg1clip:(BOOL)arg2;
5657
- (void)_drawOverlayRect:(struct CGRect)arg1;
58+
- (void)moveDown:(id)arg1;
5759
- (void)setSelectedRange:(struct _NSRange)arg1;
5860
- (void)setSelectedRanges:(id)arg1affinity:(unsignedlonglong)arg2stillSelecting:(BOOL)arg3;
5961
- (void)_replaceFoldWithContents:(id)arg1;
60-
- (id)_formatBlockLiteralFromDeclaration:(id)arg1lineCount:(unsignedlonglong *)arg2;
6162
- (void)textStorage:(id)arg1didEndEditRange:(struct _NSRange)arg2changeInLength:(longlong)arg3;
6263
- (void)textStorage:(id)arg1willEndEditRange:(struct _NSRange)arg2changeInLength:(longlong)arg3;
63-
- (id)textStorage;
64-
- (id)layoutManager;
64+
@property(readonly) DVTTextStorage *textStorage;
65+
@property(readonly) DVTLayoutManager *layoutManager;
6566
- (void)didInsertCompletionTextAtRange:(struct _NSRange)arg1;
6667
- (void)invalidateDisplayForRange:(struct _NSRange)arg1;
6768
- (unsignedlonglong)draggingEntered:(id)arg1;
@@ -79,13 +80,15 @@
7980
- (void)previousCompletion:(id)arg1;
8081
- (void)nextCompletion:(id)arg1;
8182
- (void)complete:(id)arg1;
82-
- (BOOL)shouldChangeTextInRange:(struct _NSRange)arg1replacementString:(id)arg2;
83+
- (BOOL)shouldChangeTextInRanges:(id)arg1replacementStrings:(id)arg2;
8384
- (void)deleteForward:(id)arg1;
8485
- (void)deleteBackward:(id)arg1;
8586
- (void)insertText:(id)arg1replacementRange:(struct _NSRange)arg2;
8687
- (void)doCommandBySelector:(SEL)arg1;
87-
- (void)foldingLayoutManagerFoldsChanged:(id)arg1;
88-
- (id)layoutManager:(id)arg1shouldUseTextBackgroundColor:(id)arg2rectArray:(struct CGRect *)arg3count:(unsignedlonglong)arg4forCharacterRange:(struct _NSRange)arg5;
88+
- (void)layoutManager:(id)arg1didUnfoldRange:(struct _NSRange)arg2;
89+
- (void)layoutManager:(id)arg1didFoldRange:(struct _NSRange)arg2;
90+
- (void)_foldingLayoutManagerFoldsChanged:(id)arg1;
91+
- (id)layoutManager:(id)arg1shouldUseTextBackgroundColor:(id)arg2rectArray:(conststruct CGRect *)arg3count:(unsignedlonglong)arg4forCharacterRange:(struct _NSRange)arg5;
8992
- (id)layoutManager:(id)arg1shouldUseTemporaryAttributes:(id)arg2forDrawingToScreen:(BOOL)arg3atCharacterIndex:(unsignedlonglong)arg4effectiveRange:(struct _NSRange *)arg5;
9093
- (void)showMatchingBraceAtLocation:(id)arg1;
9194
- (void)autoHighlightMatchingBracketAtLocationIfNecessary:(unsignedlonglong)arg1;
@@ -95,29 +98,35 @@
9598
- (BOOL)_moveToNextPlaceholderFromCharacterIndex:(unsignedlonglong)arg1forward:(BOOL)arg2onlyIfNearby:(BOOL)arg3;
9699
- (struct _NSRange)_findString:(id)arg1inString:(id)arg2fromRange:(struct _NSRange)arg3limitRange:(struct _NSRange)arg4forward:(BOOL)arg5wrap:(BOOL)arg6;
97100
- (struct _NSRange)rangeOfPlaceholderFromCharacterIndex:(unsignedlonglong)arg1forward:(BOOL)arg2wrap:(BOOL)arg3limit:(unsignedlonglong)arg4;
101+
- (struct _NSRange)_rangeOfPlaeholderWithStartPrefix:(id)arg1endSuffix:(id)arg2inString:(id)arg3fromRange:(struct _NSRange)arg4limitRange:(struct _NSRange)arg5forward:(BOOL)arg6wrap:(BOOL)arg7;
98102
- (BOOL)selectFirstPlaceholderInCharacterRange:(struct _NSRange)arg1;
99103
- (BOOL)handleSelectPreviousPlaceholder;
100104
- (BOOL)handleSelectNextPlaceholder;
101105
- (id)ghostComplementTextColor;
102106
- (BOOL)shouldAutoCompleteAtLocation:(unsignedlonglong)arg1;
103107
- (BOOL)shouldSuppressTextCompletion;
108+
@property(readonly,copy)NSCharacterSet *autoCompleteChars;
104109
@property(readonly)double autoCompletionDelay;
105110
- (id)contextForCompletionStrategiesAtWordStartLocation:(unsignedlonglong)arg1;
106111
@property(readonly) DVTTextCompletionDataSource *completionsDataSource;
107112
- (struct _NSRange)wordRangeAtLocation:(unsignedlonglong)arg1;
108113
@property(readonly) DVTSourceCodeLanguage *language;
109-
- (struct CGRect)frameForRange:(struct _NSRange)arg1;
110114
- (void)dealloc;
111115
- (id)initWithCoder:(id)arg1;
112116
- (id)initWithFrame:(struct CGRect)arg1;
113117
- (id)initWithFrame:(struct CGRect)arg1textContainer:(id)arg2;
114118
- (void)_dvtCommonInit;
115119
- (id)currentTheme;
116-
@property(readonly) DVTFoldingManager *foldingManager;
117-
@property(readonly) DVTFoldingLayoutManager *foldingLayoutManager;
118120
- (BOOL)removeMenusNotInWhiteList:(id)arg1fromMenu:(id)arg2removeSeparators:(BOOL)arg3;
119121
- (id)cell;
120122
- (id)selectedCell;
121123
- (id)accessibilityAttributeValue:(id)arg1;
122124

125+
// Remaining properties
126+
@property(readonly,copy)NSString *debugDescription;
127+
@property(readonly,copy)NSString *description;
128+
@property(readonly)unsignedlonglong hash;
129+
@property(readonly)Class superclass;
130+
123131
@end
132+
Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
/*
2-
* Generated by class-dump 3.3.4 (64 bit).
3-
*
4-
* class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2011 by Steve Nygard.
5-
*/
1+
//
2+
// Generated by class-dump 3.5 (64 bit).
3+
//
4+
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
5+
//
6+
7+
#import"DVTFoldingManagerDelegate-Protocol.h"
68

79
@class DVTTextFold;
8-
@protocol DVTFoldingManagerDelegate;
910

1011
@interfaceDVTFoldingManager :NSObject
1112
{
@@ -15,6 +16,7 @@
1516

1617
@property(retain,nonatomic) DVTTextFold *topLevelFold;// @synthesize topLevelFold=_topLevelFold;
1718
@property __weakid <DVTFoldingManagerDelegate> delegate;// @synthesize delegate;
19+
- (id)fixedSelectionRangesForRanges:(id)arg1affinity:(unsignedlonglong)arg2inTextView:(id)arg3;
1820
- (id)adjustFoldsForRange:(struct _NSRange)arg1changeInLength:(longlong)arg2;
1921
- (id)foldsEnclosingRange:(struct _NSRange)arg1;
2022
- (id)lastFoldTouchingCharacterIndex:(unsignedlonglong)arg1;
@@ -25,9 +27,9 @@
2527
- (BOOL)isCharacterRangeFolded:(struct _NSRange)arg1;
2628
- (BOOL)containsFoldWithRange:(struct _NSRange)arg1;
2729
- (BOOL)isCharacterFoldedAtIndex:(unsignedlonglong)arg1;
28-
- (void)foldRecursiveItem:(id)arg1;
29-
- (void)unfoldItems:(id)arg1;
30-
- (void)foldItems:(id)arg1;
30+
- (void)foldRangesRecursively:(id)arg1;
31+
- (void)unfoldRanges:(id)arg1;
32+
- (void)foldRanges:(id)arg1;
3133
- (void)unfoldRecursiveRange:(struct _NSRange)arg1;
3234
- (void)unfoldEnclosingRange:(struct _NSRange)arg1;
3335
- (void)unfoldRange:(struct _NSRange)arg1;
@@ -42,7 +44,3 @@
4244

4345
@end
4446

45-
@protocolDVTFoldingManagerDelegate <NSObject>
46-
- (void)foldingManager:(id)arg1didUnfoldRange:(struct _NSRange)arg2;
47-
- (void)foldingManager:(id)arg1didFoldRange:(struct _NSRange)arg2;
48-
@end
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//
2+
// Generated by class-dump 3.5 (64 bit).
3+
//
4+
// class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard.
5+
//
6+
7+
@class DVTFoldingManager;
8+
9+
@protocolDVTFoldingManagerDelegate <NSObject>
10+
- (void)foldingManager:(DVTFoldingManager *)arg1didUnfoldRange:(struct _NSRange)arg2;
11+
- (void)foldingManager:(DVTFoldingManager *)arg1didFoldRange:(struct _NSRange)arg2;
12+
@end
13+

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp