Fix behaviour at line end.

aioutecism · Jan 3, 2016 · 7e77109 · 7e77109
1 parent fd676a0
commit 7e77109
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/Actions/MoveCursor.ts b/src/Actions/MoveCursor.ts
@@ -5,9 +5,15 @@ import {MotionCharacter} from '../Motions/Character';
 
 export class ActionMoveCursor {
 
-    static byMotions(args: {motions: Motion[], isVisualMode?: boolean, isVisualLineMode?: boolean}): Thenable<boolean> {
+    static byMotions(args: {
+        motions: Motion[],
+        isVisualMode?: boolean,
+        isVisualLineMode?: boolean,
+        noEmptyAtLineEnd?: boolean
+    }): Thenable<boolean> {
         args.isVisualMode = args.isVisualMode === undefined ? false : args.isVisualMode;
         args.isVisualLineMode = args.isVisualLineMode === undefined ? false : args.isVisualLineMode;
+        args.noEmptyAtLineEnd = args.noEmptyAtLineEnd === undefined ? false : args.noEmptyAtLineEnd;
 
         const activeTextEditor = window.activeTextEditor;
 
@@ -17,6 +23,8 @@ export class ActionMoveCursor {
 
         // TODO: Preserve character position
 
+        const document = activeTextEditor.document;
+
         activeTextEditor.selections = activeTextEditor.selections.map(selection => {
             let anchor: Position;
 
@@ -55,6 +63,13 @@ export class ActionMoveCursor {
                 }
             }
             else {
+                if (args.noEmptyAtLineEnd) {
+                    const lineEndCharacter = document.lineAt(active.line).text.length;
+                    if (lineEndCharacter !== 0 && active.character === lineEndCharacter) {
+                        active = active.translate(0, -1);
+                    }
+                }
+
                 anchor = active;
             }
 

diff --git a/src/Modes/Normal.ts b/src/Modes/Normal.ts
@@ -23,7 +23,7 @@ export class ModeNormal extends Mode {
     name = 'NORMAL';
 
     private maps: CommandMap[] = [
-        { keys: '{motion}', command: ActionMoveCursor.byMotions },
+        { keys: '{motion}', command: ActionMoveCursor.byMotions, args: {noEmptyAtLineEnd: true} },
 
         { keys: 'i', command: ActionMode.toInsert },
         { keys: 'I', command: () => ActionMoveCursor.byMotions({motions: [MotionLine.firstNonBlank()]}).then(ActionMode.toInsert) },

diff --git a/src/Motions/Motion.ts b/src/Motions/Motion.ts
@@ -33,7 +33,7 @@ export class Motion {
             toCharacter = Infinity;
         }
 
-        toCharacter = Math.min(toCharacter, document.lineAt(toLine).text.length - 1);
+        toCharacter = Math.min(toCharacter, document.lineAt(toLine).text.length);
         toCharacter = Math.max(toCharacter, 0);
 
         return new Position(toLine, toCharacter);