Skip to content

Commit fa5224b

Browse files
authored
Merge pull request #1055 from keith/xcode-8.3-release
Remove IDEPlaygroundEditor for Xcode 8.3 support
2 parents ec2c601 + 76f20f3 commit fa5224b

File tree

5 files changed

+2
-61
lines changed

5 files changed

+2
-61
lines changed

XVim.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
6E2B33341836E60600EFE4E2 /* DVTTextStorage+XVimTextStoring.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B33331836E60600EFE4E2 /* DVTTextStorage+XVimTextStoring.m */; };
1414
A204814F19702F3E0064BE66 /* NSObject+XVimAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A204814E19702F3E0064BE66 /* NSObject+XVimAdditions.m */; };
1515
A212A53D1940A330002FB2CF /* XVim.xcplugin in Copy Files */ = {isa = PBXBuildFile; fileRef = A2E7E45217EF0219008F045A /* XVim.xcplugin */; };
16-
A2193E961BE56730002629FB /* IDEPlaygroundEditor+XVim.m in Sources */ = {isa = PBXBuildFile; fileRef = A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */; };
1716
A2193E9A1BE73300002629FB /* IDELanguageSupportUI in Frameworks */ = {isa = PBXBuildFile; fileRef = A2193E991BE73300002629FB /* IDELanguageSupportUI */; };
1817
A25032B319F805110021C34E /* IDEWorkspaceTabController+XVim.m in Sources */ = {isa = PBXBuildFile; fileRef = A25032B219F805110021C34E /* IDEWorkspaceTabController+XVim.m */; };
1918
A259E2231B3C263B006000D9 /* NSURL+XVimXcodeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A259E2221B3C263B006000D9 /* NSURL+XVimXcodeModule.m */; };
@@ -141,8 +140,6 @@
141140
A2165BFC17A3762C00AB18FD /* XVimDefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = XVimDefs.h; path = XVim/XVimDefs.h; sourceTree = SOURCE_ROOT; };
142141
A216F39F156560FE00AD2529 /* IDEEditorArea+XVim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "IDEEditorArea+XVim.h"; path = "XVim/IDEEditorArea+XVim.h"; sourceTree = SOURCE_ROOT; };
143142
A216F3A0156560FE00AD2529 /* IDEEditorArea+XVim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "IDEEditorArea+XVim.m"; path = "XVim/IDEEditorArea+XVim.m"; sourceTree = SOURCE_ROOT; };
144-
A2193E941BE56730002629FB /* IDEPlaygroundEditor+XVim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "IDEPlaygroundEditor+XVim.h"; path = "XVim/IDEPlaygroundEditor+XVim.h"; sourceTree = SOURCE_ROOT; };
145-
A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "IDEPlaygroundEditor+XVim.m"; path = "XVim/IDEPlaygroundEditor+XVim.m"; sourceTree = SOURCE_ROOT; };
146143
A2193E991BE73300002629FB /* IDELanguageSupportUI */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = IDELanguageSupportUI; path = ../PlugIns/IDELanguageSupportUI.ideplugin/Contents/MacOS/IDELanguageSupportUI; sourceTree = DEVELOPER_DIR; };
147144
A222B5DF1514DFCD005E8802 /* XVimOperatorEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XVimOperatorEvaluator.h; path = XVim/XVimOperatorEvaluator.h; sourceTree = SOURCE_ROOT; };
148145
A222B5E01514DFCD005E8802 /* XVimOperatorEvaluator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XVimOperatorEvaluator.m; path = XVim/XVimOperatorEvaluator.m; sourceTree = SOURCE_ROOT; };
@@ -723,8 +720,6 @@
723720
A2F2621A182CEC3600AD3DC4 /* DVTSourceTextScrollView+XVim.m */,
724721
C38A5B4515272DCC00E1448D /* IDESourceCodeEditor+XVim.h */,
725722
C38A5B4615272DCD00E1448D /* IDESourceCodeEditor+XVim.m */,
726-
A2193E941BE56730002629FB /* IDEPlaygroundEditor+XVim.h */,
727-
A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */,
728723
A26ACC4C154F2D6600B27D69 /* IDEEditor+XVim.h */,
729724
A26ACC4D154F2D6700B27D69 /* IDEEditor+XVim.m */,
730725
C345DDB9154CE12A009F232E /* XVimHookManager.h */,
@@ -856,7 +851,6 @@
856851
A28F423917EEDBC200A3F7AE /* XVimRegisterEvaluator.m in Sources */,
857852
A28F423A17EEDBC200A3F7AE /* XVimOperatorEvaluator.m in Sources */,
858853
A28F423B17EEDBC200A3F7AE /* XVimKeyStroke.m in Sources */,
859-
A2193E961BE56730002629FB /* IDEPlaygroundEditor+XVim.m in Sources */,
860854
A28F423C17EEDBC200A3F7AE /* DVTSourceTextView+XVim.m in Sources */,
861855
A28F423D17EEDBC200A3F7AE /* IDESourceCodeEditor+XVim.m in Sources */,
862856
A28F423E17EEDBC200A3F7AE /* XVimNumericEvaluator.m in Sources */,

XVim/IDEPlaygroundEditor+XVim.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

XVim/IDEPlaygroundEditor+XVim.m

Lines changed: 0 additions & 30 deletions
This file was deleted.

XVim/Info.plist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<string>1</string>
2121
<key>DVTPlugInCompatibilityUUIDs</key>
2222
<array>
23+
<string>DFFB3951-EB0A-4C09-9DAC-5F2D28CC839C</string>
2324
<string>1637F4D5-0B27-416B-A78D-498965D64877</string>
2425
<string>AD68E85B-441B-4301-B564-A45E4919A6AD</string>
2526
<string>A2E4D43F-41F4-4FB9-BB94-7177011C9AED</string>
@@ -42,7 +43,7 @@
4243
<string>E71C2CFE-BFD8-4044-8F06-00AE685A406C</string>
4344
<string>8A66E736-A720-4B3C-92F1-33D9962C69DF</string>
4445
<string>DA4FDFD8-C509-4D8B-8B55-84A7B66AE701</string>
45-
<string>E0A62D1F-3C18-4D74-BFE5-A4167D643966</string>
46+
<string>E0A62D1F-3C18-4D74-BFE5-A4167D643966</string>
4647
</array>
4748
<key>NSHumanReadableCopyright</key>
4849
<string>Copyright © 2012 JugglerShu.Net. All rights reserved.</string>

XVim/XVimHookManager.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#import "NSObject+XVimAdditions.h"
1919
#import "DVTSourceTextView+XVim.h"
2020
#import "IDEApplicationController+XVim.h"
21-
#import "IDEPlaygroundEditor+XVim.h"
2221

2322
@implementation IDEWorkspaceWindow (XVim)
2423

@@ -53,7 +52,6 @@ + (void)hookWhenPluginLoaded
5352
[DVTTextSidebarView xvim_initialize];
5453
[DVTSourceTextScrollView xvim_initialize];
5554
[IDESourceCodeEditor xvim_initialize];
56-
[IDEPlaygroundEditor xvim_initialize];
5755
[IDEEditor xvim_initialize];
5856
[IDEApplicationController xvim_initialize];
5957
}

0 commit comments

Comments
 (0)