-
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
doc: Add warning and notes for two-letter hotkey usage in README
refactor: Extract two-letter normal mode logic to a new Vimkey class
- Loading branch information
Showing
3 changed files
with
80 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| class Vimkey{ | ||
| __New(Vim){ | ||
| this.Vim := Vim | ||
|
|
||
| ; Two-letter normal mode | ||
| this.TwoLetterNormalIsSet := False | ||
| this.TwoLetterNormalArray := Array() | ||
| this.TwoLetterNormalEnabledObj := ObjBindMethod(this, "TwoLetterNormalEnabled") | ||
| } | ||
|
|
||
| TwoLetterNormalEnabled(HotkeyName){ | ||
| Return this.Vim.IsVimGroup() && (this.Vim.State.StrIsInCurrentVimMode("Insert")) && this.TwoLetterNormalIsSet | ||
| } | ||
|
|
||
| TwoLetterEnterNormal(EndKey, HotkeyName){ | ||
| Out := InputHook("I T0.1 V L1", EndKey) | ||
| Out.Start() | ||
| EndReason := Out.Wait() | ||
| if(EndReason == "EndKey"){ | ||
| SendInput("{BackSpace 2}") | ||
| Vim.State.SetNormal() | ||
| } | ||
| } | ||
|
|
||
| SetTwoLetterMap(Key1, Key2){ | ||
| SendSame := ObjBindMethod(this, "SendSame") | ||
| EnterNormal := ObjBindMethod(this, "TwoLetterEnterNormal") | ||
| EnterNormal1 := EnterNormal.Bind(Key2) | ||
| EnterNormal2 := EnterNormal.Bind(Key1) | ||
| HotKey("~" Key1, EnterNormal1) | ||
| HotKey("~" Key2, EnterNormal2) | ||
| this.TwoLetterNormalArray.Push(key1) | ||
| this.TwoLetterNormalArray.Push(key2) | ||
| } | ||
|
|
||
| SetTwoLetterMaps() { | ||
| HotIf(this.TwoLetterNormalEnabledObj) | ||
| this.TwoLetterNormalIsSet := False | ||
| for value in this.TwoLetterNormalArray { | ||
| HotKey(value, "Off") | ||
| } | ||
| this.TwoLetterNormalArray := Array() | ||
|
|
||
| Loop Parse, this.Vim.Conf["VimTwoLetter"]["val"], this.Vim.GroupDel { | ||
| if(A_LoopField != ""){ | ||
| if(StrLen(A_LoopField) != 2){ | ||
| MsgBox("Two-letter should be exactly two letters: " A_LoopField) | ||
| Continue | ||
| } | ||
| this.TwoLetterNormalIsSet := True | ||
| key1 := SubStr(A_LoopField, 1, 1) | ||
| key2 := SubStr(A_LoopField, 2, 1) | ||
| this.SetTwoLetterMap(key1, key2) | ||
| } | ||
| } | ||
| HotIf() | ||
| } | ||
|
|
||
| Set(){ | ||
| this.SetTwoLetterMaps() | ||
| } | ||
| } |