Merge pull request #1837 from xconverge/fix-yiw-cursor-pos

Fix yiw cursor pos
VSCodeVim · Jun 14, 2017 · 99b7650 · 99b7650
2 parents 877d30f + 9bd0023
commit 99b7650
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/actions/operator.ts b/src/actions/operator.ts
@@ -6,6 +6,7 @@ import { Range } from './../common/motion/range';
 import { ModeName } from './../mode/mode';
 import { TextEditor } from './../textEditor';
 import { Configuration } from './../configuration/configuration';
+import { TextObjectMovement } from './textobject';
 import {
   BaseAction, RegisterAction, compareKeypressSequence
 } from './base';
@@ -233,7 +234,15 @@ export class YankOperator extends BaseOperator {
       vimState.currentMode = ModeName.Normal;
       vimState.cursorStartPosition = start;
 
-      if (originalMode === ModeName.Normal) {
+      // Only change cursor position if we ran a text object movement
+      let moveCursor = false;
+      if (vimState.recordedState.actionsRun.length > 1) {
+        if (vimState.recordedState.actionsRun[1] instanceof TextObjectMovement) {
+          moveCursor = true;
+        }
+      }
+
+      if (originalMode === ModeName.Normal && !moveCursor) {
         vimState.allCursors = vimState.cursorPositionJustBeforeAnythingHappened.map(x => new Range(x, x));
       } else {
         vimState.cursorPosition = start;

diff --git a/test/mode/modeNormal.test.ts b/test/mode/modeNormal.test.ts
@@ -259,6 +259,14 @@ suite("Mode Normal", () => {
       endMode: ModeName.Insert
     });
 
+    newTest({
+      title: "Can handle 'yiw' with correct cursor ending position",
+      start: ['tes|t'],
+      keysPressed: 'yiwp',
+      end: ['ttes|test'],
+      endMode: ModeName.Normal
+    });
+
     newTest({
       title: "Can handle 'ciw'",
       start: ['text text tex|t'],