Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1062

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Develop #1062

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions XVim.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
6E2B33341836E60600EFE4E2 /* DVTTextStorage+XVimTextStoring.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E2B33331836E60600EFE4E2 /* DVTTextStorage+XVimTextStoring.m */; };
A204814F19702F3E0064BE66 /* NSObject+XVimAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A204814E19702F3E0064BE66 /* NSObject+XVimAdditions.m */; };
A212A53D1940A330002FB2CF /* XVim.xcplugin in Copy Files */ = {isa = PBXBuildFile; fileRef = A2E7E45217EF0219008F045A /* XVim.xcplugin */; };
A2193E961BE56730002629FB /* IDEPlaygroundEditor+XVim.m in Sources */ = {isa = PBXBuildFile; fileRef = A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */; };
A2193E9A1BE73300002629FB /* IDELanguageSupportUI in Frameworks */ = {isa = PBXBuildFile; fileRef = A2193E991BE73300002629FB /* IDELanguageSupportUI */; };
A25032B319F805110021C34E /* IDEWorkspaceTabController+XVim.m in Sources */ = {isa = PBXBuildFile; fileRef = A25032B219F805110021C34E /* IDEWorkspaceTabController+XVim.m */; };
A259E2231B3C263B006000D9 /* NSURL+XVimXcodeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = A259E2221B3C263B006000D9 /* NSURL+XVimXcodeModule.m */; };
Expand Down Expand Up @@ -141,8 +140,6 @@
A2165BFC17A3762C00AB18FD /* XVimDefs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = XVimDefs.h; path = XVim/XVimDefs.h; sourceTree = SOURCE_ROOT; };
A216F39F156560FE00AD2529 /* IDEEditorArea+XVim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "IDEEditorArea+XVim.h"; path = "XVim/IDEEditorArea+XVim.h"; sourceTree = SOURCE_ROOT; };
A216F3A0156560FE00AD2529 /* IDEEditorArea+XVim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "IDEEditorArea+XVim.m"; path = "XVim/IDEEditorArea+XVim.m"; sourceTree = SOURCE_ROOT; };
A2193E941BE56730002629FB /* IDEPlaygroundEditor+XVim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "IDEPlaygroundEditor+XVim.h"; path = "XVim/IDEPlaygroundEditor+XVim.h"; sourceTree = SOURCE_ROOT; };
A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "IDEPlaygroundEditor+XVim.m"; path = "XVim/IDEPlaygroundEditor+XVim.m"; sourceTree = SOURCE_ROOT; };
A2193E991BE73300002629FB /* IDELanguageSupportUI */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = IDELanguageSupportUI; path = ../PlugIns/IDELanguageSupportUI.ideplugin/Contents/MacOS/IDELanguageSupportUI; sourceTree = DEVELOPER_DIR; };
A222B5DF1514DFCD005E8802 /* XVimOperatorEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XVimOperatorEvaluator.h; path = XVim/XVimOperatorEvaluator.h; sourceTree = SOURCE_ROOT; };
A222B5E01514DFCD005E8802 /* XVimOperatorEvaluator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XVimOperatorEvaluator.m; path = XVim/XVimOperatorEvaluator.m; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -723,8 +720,6 @@
A2F2621A182CEC3600AD3DC4 /* DVTSourceTextScrollView+XVim.m */,
C38A5B4515272DCC00E1448D /* IDESourceCodeEditor+XVim.h */,
C38A5B4615272DCD00E1448D /* IDESourceCodeEditor+XVim.m */,
A2193E941BE56730002629FB /* IDEPlaygroundEditor+XVim.h */,
A2193E951BE56730002629FB /* IDEPlaygroundEditor+XVim.m */,
A26ACC4C154F2D6600B27D69 /* IDEEditor+XVim.h */,
A26ACC4D154F2D6700B27D69 /* IDEEditor+XVim.m */,
C345DDB9154CE12A009F232E /* XVimHookManager.h */,
Expand Down Expand Up @@ -856,7 +851,6 @@
A28F423917EEDBC200A3F7AE /* XVimRegisterEvaluator.m in Sources */,
A28F423A17EEDBC200A3F7AE /* XVimOperatorEvaluator.m in Sources */,
A28F423B17EEDBC200A3F7AE /* XVimKeyStroke.m in Sources */,
A2193E961BE56730002629FB /* IDEPlaygroundEditor+XVim.m in Sources */,
A28F423C17EEDBC200A3F7AE /* DVTSourceTextView+XVim.m in Sources */,
A28F423D17EEDBC200A3F7AE /* IDESourceCodeEditor+XVim.m in Sources */,
A28F423E17EEDBC200A3F7AE /* XVimNumericEvaluator.m in Sources */,
Expand Down
22 changes: 0 additions & 22 deletions XVim/IDEPlaygroundEditor+XVim.h

This file was deleted.

30 changes: 0 additions & 30 deletions XVim/IDEPlaygroundEditor+XVim.m

This file was deleted.

3 changes: 2 additions & 1 deletion XVim/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<string>1</string>
<key>DVTPlugInCompatibilityUUIDs</key>
<array>
<string>DFFB3951-EB0A-4C09-9DAC-5F2D28CC839C</string>
<string>1637F4D5-0B27-416B-A78D-498965D64877</string>
<string>AD68E85B-441B-4301-B564-A45E4919A6AD</string>
<string>A2E4D43F-41F4-4FB9-BB94-7177011C9AED</string>
Expand All @@ -42,7 +43,7 @@
<string>E71C2CFE-BFD8-4044-8F06-00AE685A406C</string>
<string>8A66E736-A720-4B3C-92F1-33D9962C69DF</string>
<string>DA4FDFD8-C509-4D8B-8B55-84A7B66AE701</string>
<string>E0A62D1F-3C18-4D74-BFE5-A4167D643966</string>
<string>E0A62D1F-3C18-4D74-BFE5-A4167D643966</string>
</array>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2012 JugglerShu.Net. All rights reserved.</string>
Expand Down
2 changes: 1 addition & 1 deletion XVim/XVimExCommand.m
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ -(id)init {
CMD(@"tabnext", @"tabnext:inWindow:"),
CMD(@"tabnew", @"splitview:inWindow:"),
CMD(@"tabonly", @"tabonly:inWindow:"),
CMD(@"tabprevious", @"tabnext:inWindow:"),
CMD(@"tabprevious", @"tabprevious:inWindow:"),
CMD(@"tabNext", @"tabnext:inWindow:"),
CMD(@"tabrewind", @"tabnext:inWindow:"),
CMD(@"tabs", @"tabs:inWindow:"),
Expand Down
2 changes: 0 additions & 2 deletions XVim/XVimHookManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#import "NSObject+XVimAdditions.h"
#import "DVTSourceTextView+XVim.h"
#import "IDEApplicationController+XVim.h"
#import "IDEPlaygroundEditor+XVim.h"

@implementation IDEWorkspaceWindow (XVim)

Expand Down Expand Up @@ -53,7 +52,6 @@ + (void)hookWhenPluginLoaded
[DVTTextSidebarView xvim_initialize];
[DVTSourceTextScrollView xvim_initialize];
[IDESourceCodeEditor xvim_initialize];
[IDEPlaygroundEditor xvim_initialize];
[IDEEditor xvim_initialize];
[IDEApplicationController xvim_initialize];
}
Expand Down