From 729145648ee071c449c791b16345a35d2e747fc1 Mon Sep 17 00:00:00 2001 From: Anders Tidbeck Date: Thu, 5 Jan 2017 11:43:03 +0100 Subject: [PATCH 1/3] :tabp should open the previous tab --- XVim/XVimExCommand.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XVim/XVimExCommand.m b/XVim/XVimExCommand.m index cb1f5215..e80fe2f1 100644 --- a/XVim/XVimExCommand.m +++ b/XVim/XVimExCommand.m @@ -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:"), From 3c9104d3729ba7b628ad4bb79baf42cd1eb6b4a4 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 27 Mar 2017 16:06:27 -0700 Subject: [PATCH 2/3] Remove IDEPlaygroundEditor This no longer exists in the release version of Xcode 8.3. With this change XVim compiles and works in 8.3. --- XVim.xcodeproj/project.pbxproj | 6 ------ XVim/IDEPlaygroundEditor+XVim.h | 22 ---------------------- XVim/IDEPlaygroundEditor+XVim.m | 30 ------------------------------ XVim/XVimHookManager.m | 2 -- 4 files changed, 60 deletions(-) delete mode 100644 XVim/IDEPlaygroundEditor+XVim.h delete mode 100644 XVim/IDEPlaygroundEditor+XVim.m diff --git a/XVim.xcodeproj/project.pbxproj b/XVim.xcodeproj/project.pbxproj index b0bde39d..91767227 100644 --- a/XVim.xcodeproj/project.pbxproj +++ b/XVim.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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; }; @@ -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 */, @@ -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 */, diff --git a/XVim/IDEPlaygroundEditor+XVim.h b/XVim/IDEPlaygroundEditor+XVim.h deleted file mode 100644 index dd8e7900..00000000 --- a/XVim/IDEPlaygroundEditor+XVim.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// XVimSourceCodeEditor.h -// XVim -// -// Created by Tomas Lundell on 31/03/12. -// Copyright (c) 2012 __MyCompanyName__. All rights reserved. -// - -#import -#import "IDESourceCodeEditor+XVim.h" - -@interface IDEPlaygroundEditor : IDESourceCodeEditor -@end - -@interface IDEPlaygroundEditor(XVim) -+ (void)xvim_initialize; - -// The reason to append "2" at end of the method name is because this class is inheited from IDESourceCodeEdtior -// which we also swizzle. It interfares if we us the same name. -- (void)xvim_didSetupEditor2; - -@end \ No newline at end of file diff --git a/XVim/IDEPlaygroundEditor+XVim.m b/XVim/IDEPlaygroundEditor+XVim.m deleted file mode 100644 index 2198e8bc..00000000 --- a/XVim/IDEPlaygroundEditor+XVim.m +++ /dev/null @@ -1,30 +0,0 @@ -// -// XVimSourceCodeEditor.m -// XVim -// -// Created by Tomas Lundell on 31/03/12. -// Copyright (c) 2012 __MyCompanyName__. All rights reserved. -// - -#import "IDEKit.h" -#import "DVTFoundation.h" -#import "XVimWindow.h" -#import "Logger.h" -#import "XVimStatusLine.h" -#import "XVim.h" -#import "NSObject+XVimAdditions.h" -#import "NSObject+ExtraData.h" -#import -#import "IDEPlaygroundEditor+XVim.h" - -@implementation IDEPlaygroundEditor(XVim) - -+ (void)xvim_initialize{ - [self xvim_swizzleInstanceMethod:@selector(didSetupEditor) with:@selector(xvim_didSetupEditor2)]; -} - -- (void)xvim_didSetupEditor2{ - [self xvim_didSetupEditor2]; // This is original didSetupEditor of IDEPlaygroundEditor class - [super didSetupEditor]; // This is super class (IDESourceCodeEditor) didSetupEditor, which is hooked by XVim, resulting in calling xvim_didSetupEditor. -} -@end \ No newline at end of file diff --git a/XVim/XVimHookManager.m b/XVim/XVimHookManager.m index 3d764f9f..46715ae5 100644 --- a/XVim/XVimHookManager.m +++ b/XVim/XVimHookManager.m @@ -18,7 +18,6 @@ #import "NSObject+XVimAdditions.h" #import "DVTSourceTextView+XVim.h" #import "IDEApplicationController+XVim.h" -#import "IDEPlaygroundEditor+XVim.h" @implementation IDEWorkspaceWindow (XVim) @@ -53,7 +52,6 @@ + (void)hookWhenPluginLoaded [DVTTextSidebarView xvim_initialize]; [DVTSourceTextScrollView xvim_initialize]; [IDESourceCodeEditor xvim_initialize]; - [IDEPlaygroundEditor xvim_initialize]; [IDEEditor xvim_initialize]; [IDEApplicationController xvim_initialize]; } From 76f20f3e40baa9b48b3695c5c8dafc5e9d27b13f Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 27 Mar 2017 16:19:22 -0700 Subject: [PATCH 3/3] Add 8.3 UUID --- XVim/Info.plist | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/XVim/Info.plist b/XVim/Info.plist index 99948e10..3d24fcdf 100644 --- a/XVim/Info.plist +++ b/XVim/Info.plist @@ -20,6 +20,7 @@ 1 DVTPlugInCompatibilityUUIDs + DFFB3951-EB0A-4C09-9DAC-5F2D28CC839C 1637F4D5-0B27-416B-A78D-498965D64877 AD68E85B-441B-4301-B564-A45E4919A6AD A2E4D43F-41F4-4FB9-BB94-7177011C9AED @@ -42,7 +43,7 @@ E71C2CFE-BFD8-4044-8F06-00AE685A406C 8A66E736-A720-4B3C-92F1-33D9962C69DF DA4FDFD8-C509-4D8B-8B55-84A7B66AE701 - E0A62D1F-3C18-4D74-BFE5-A4167D643966 + E0A62D1F-3C18-4D74-BFE5-A4167D643966 NSHumanReadableCopyright Copyright © 2012 JugglerShu.Net. All rights reserved.