Merge pull request #2596 from hy950831/master

add easymotion-lineforward and easymotion-linebackward
VSCodeVim · May 6, 2018 · 57b2b46 · 57b2b46
2 parents 6ae22ea + 8be5d6e
commit 57b2b46
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -421,6 +421,8 @@ Motion Command | Description
 `<leader><leader> T <char>`|Til character backwards
 `<leader><leader> w`|Start of word forwards
 `<leader><leader> b`|Start of word backwards
+`<leader><leader> l`|matches beginning & ending of word, camelCase, after _ and after # forwards
+`<leader><leader> h`|matches beginning & ending of word, camelCase, after _ and after # backwards
 `<leader><leader> e`|End of word forwards
 `<leader><leader> ge`|End of word backwards
 `<leader><leader> j`|Start of line forwards

diff --git a/src/actions/plugins/easymotion/registerMoveActions.ts b/src/actions/plugins/easymotion/registerMoveActions.ts
@@ -142,6 +142,20 @@ class EasyMotionStartOfWordBidirectionalCommand extends EasyMotionWordMoveComman
   }
 }
 
+@RegisterAction
+class EasyMotionLineForward extends EasyMotionWordMoveCommandBase {
+  constructor() {
+    super({ key: 'l' }, { jumpToAnywhere: true, searchOptions: 'min', labelPosition: 'after' });
+  }
+}
+
+@RegisterAction
+class EasyMotionLineBackward extends EasyMotionWordMoveCommandBase {
+  constructor() {
+    super({ key: 'h' }, { jumpToAnywhere: true, searchOptions: 'max', labelPosition: 'after' });
+  }
+}
+
 // easymotion "JumpToAnywhere" motion
 
 @RegisterAction

diff --git a/test/plugins/easymotion.test.ts b/test/plugins/easymotion.test.ts
@@ -186,4 +186,32 @@ suite('easymotion plugin', () => {
     keysPressed: easymotionCommand({ key: 'bdjk', leaderCount: 3 }, '', 'h'),
     end: ['abc', 'def', 'ghi', '|jkl'],
   });
+
+  newTest({
+    title: 'Can handle lineforward move (1)',
+    start: ['|abcDefGhi'],
+    keysPressed: easymotionCommand({ key: 'l', leaderCount: 2 }, '', 'h'),
+    end: ['abc|DefGhi'],
+  });
+
+  newTest({
+    title: 'Can handle lineforward move (2)',
+    start: ['|abcDefGhi'],
+    keysPressed: easymotionCommand({ key: 'l', leaderCount: 2 }, '', 'k'),
+    end: ['abcDef|Ghi'],
+  });
+
+  newTest({
+    title: 'Can handle linebackward move (1)',
+    start: ['abcDefGhi|'],
+    keysPressed: easymotionCommand({ key: 'h', leaderCount: 2 }, '', 'k'),
+    end: ['abc|DefGhi'],
+  });
+
+  newTest({
+    title: 'Can handle linebackward move (2)',
+    start: ['abcDefGhi|'],
+    keysPressed: easymotionCommand({ key: 'h', leaderCount: 2 }, '', 'h'),
+    end: ['abcDef|Ghi'],
+  });
 });