Merge pull request #112 from VSCodeVim/motion

Motion Fixes
VSCodeVim · Dec 29, 2015 · dc00fa9 · dc00fa9
2 parents da0753f + eebf8bc
commit dc00fa9
Show file tree

Hide file tree

Showing 15 changed files with 686 additions and 635 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,9 +32,8 @@ When submitting a PR, ensure:
 2. Fork and clone the repo, then
 
 	```bash
-	$ npm install
 	$ npm install -g gulp
-	$ gulp init
+	$ npm install
 	```
 
 3. Open the folder in VS Code

diff --git a/package.json b/package.json
@@ -133,7 +133,8 @@
   },
   "scripts": {
     "vscode:prepublish": "node ./node_modules/vscode/bin/compile",
-    "compile": "node ./node_modules/vscode/bin/compile -watch -p ./"
+    "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+    "postinstall": "gulp init"
   },
   "devDependencies": {
     "gulp": "^3.9.0",

diff --git a/src/mode/mode.ts b/src/mode/mode.ts
@@ -1,30 +1,42 @@
+import {Motion} from './../motion/motion';
+
 export enum ModeName {
     Normal,
     Insert,
     Visual,
 }
 
 export abstract class Mode {
-    private isActive : boolean;
-    private name : ModeName;
+    private _isActive : boolean;
+    private _name : ModeName;
+    private _motion : Motion;
     protected keyHistory : string[];
 
-    constructor(name: ModeName) {
-        this.name = name;
-        this.isActive = false;
+    constructor(name: ModeName, motion : Motion) {
+        this._name = name;
+        this._motion = motion;
+        this._isActive = false;
         this.keyHistory = [];
     }
 
     get Name(): ModeName {
-        return this.name;
+        return this._name;
+    }
+
+    get Motion() : Motion {
+        return this._motion;
+    }
+
+    set Motion(val : Motion) {
+        this._motion = val;
     }
 
     get IsActive() : boolean {
-        return this.isActive;
+        return this._isActive;
     }
 
     set IsActive(val : boolean) {
-        this.isActive = val;
+        this._isActive = val;
     }
 
     public HandleDeactivation() : void {

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -2,41 +2,52 @@ import * as _ from 'lodash';
 import * as vscode from 'vscode';
 
 import {Mode, ModeName} from './mode';
+import {Motion, MotionMode} from './../motion/motion';
 import NormalMode from './modeNormal';
 import InsertMode from './modeInsert';
-import VisualMode from './modeVisual';
 import Configuration from '../configuration';
 
-export default class ModeHandler {
-    private modes : Mode[];
-    private statusBarItem : vscode.StatusBarItem;
-    configuration : Configuration;
+export default class ModeHandler implements vscode.Disposable {
+    private _motion : Motion;
+    private _modes : Mode[];
+    private _statusBarItem : vscode.StatusBarItem;
+    private _configuration : Configuration;
 
     constructor() {
-        this.configuration = Configuration.fromUserFile();
+        this._configuration = Configuration.fromUserFile();
 
-        this.modes = [
-            new NormalMode(),
-            new InsertMode(),
-            new VisualMode(),
+        this._motion = new Motion();
+        this._modes = [
+            new NormalMode(this._motion),
+            new InsertMode(this._motion),
         ];
 
         this.setCurrentModeByName(ModeName.Normal);
     }
 
     get currentMode() : Mode {
-        var currentMode = this.modes.find((mode, index) => {
+        var currentMode = this._modes.find((mode, index) => {
             return mode.IsActive;
         });
 
         return currentMode;
     }
 
     setCurrentModeByName(modeName : ModeName) {
-        this.modes.forEach(mode => {
+        this._modes.forEach(mode => {
             mode.IsActive = (mode.Name === modeName);
         });
 
+        switch (modeName) {
+            case ModeName.Insert:
+                this._motion = this._motion.changeMode(MotionMode.Caret);
+                break;
+
+            case ModeName.Normal:
+                this._motion = this._motion.changeMode(MotionMode.Cursor);
+                break;
+        }
+
         var statusBarText = (this.currentMode.Name === ModeName.Normal) ? '' : ModeName[modeName];
         this.setupStatusBarItem(statusBarText.toUpperCase());
     }
@@ -45,11 +56,11 @@ export default class ModeHandler {
         // Due to a limitation in Electron, en-US QWERTY char codes are used in international keyboards.
         // We'll try to mitigate this problem until it's fixed upstream.
         // https://github.com/Microsoft/vscode/issues/713
-        key = this.configuration.keyboardLayout.translate(key);
+        key = this._configuration.keyboardLayout.translate(key);
 
         var currentModeName = this.currentMode.Name;
         var nextMode : Mode;
-        var inactiveModes = _.filter(this.modes, (m) => !m.IsActive);
+        var inactiveModes = _.filter(this._modes, (m) => !m.IsActive);
 
         _.forEach(inactiveModes, (m, i) => {
             if (m.ShouldBeActivated(key, currentModeName)) {
@@ -59,7 +70,6 @@ export default class ModeHandler {
 
         if (nextMode) {
             this.currentMode.HandleDeactivation();
-
             nextMode.HandleActivation(key);
             this.setCurrentModeByName(nextMode.Name);
             return;
@@ -69,15 +79,16 @@ export default class ModeHandler {
     }
 
     private setupStatusBarItem(text : string) : void {
-        if (!this.statusBarItem) {
-            this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+        if (!this._statusBarItem) {
+            this._statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
         }
 
-        this.statusBarItem.text = (text) ? '-- ' + text + ' --' : '';
-        this.statusBarItem.show();
+        this._statusBarItem.text = (text) ? '-- ' + text + ' --' : '';
+        this._statusBarItem.show();
     }
 
     dispose() {
-        this.statusBarItem.dispose();
+        this._statusBarItem.dispose();
+        this._motion.dispose();
     }
 }
diff --git a/src/mode/modeInsert.ts b/src/mode/modeInsert.ts
@@ -1,16 +1,10 @@
 import * as vscode from 'vscode';
 import {ModeName, Mode} from './mode';
 import TextEditor from './../textEditor';
-import {Cursor} from './../motion/motion';
+import {Motion} from './../motion/motion';
 
 export default class InsertMode extends Mode {
-	private _cursor : Cursor;
-	private get cursor() : Cursor {
-		this._cursor = this._cursor || new Cursor();
-		return this._cursor;
-	}
-
-    private activationKeyHandler : { [ key : string] : (cursor : Cursor) => Thenable<{}> } = {
+    private activationKeyHandler : { [ key : string] : (motion : Motion) => Thenable<{}> } = {
         "i" : () => {
             // insert at cursor
             return Promise.resolve({});
@@ -37,17 +31,16 @@ export default class InsertMode extends Mode {
         }
     };
 
-    constructor() {
-        super(ModeName.Insert);
+    constructor(motion : Motion) {
+        super(ModeName.Insert, motion);
     }
 
     ShouldBeActivated(key : string, currentMode : ModeName) : boolean {
         return key in this.activationKeyHandler;
     }
 
     HandleActivation(key : string) : Thenable<{}> {
-        this.cursor.reset();
-        return this.activationKeyHandler[key](this.cursor);
+        return this.activationKeyHandler[key](this.Motion);
     }
 
     HandleKeyEvent(key : string) : Thenable<{}> {

diff --git a/src/mode/modeNormal.ts b/src/mode/modeNormal.ts
@@ -2,16 +2,10 @@ import * as _ from 'lodash';
 import * as vscode from 'vscode';
 import {ModeName, Mode} from './mode';
 import {showCmdLine} from './../cmd_line/main';
-import {Caret} from './../motion/motion';
+import {Motion} from './../motion/motion';
 
 export default class NormalMode extends Mode {
-	private _caret : Caret;
-	private get caret() : Caret {
-		this._caret = this._caret || new Caret();
-		return this._caret;
-	}
-
-	private keyHandler : { [key : string] : (caret : Caret) => Thenable<{}>; } = {
+	private keyHandler : { [key : string] : (motion : Motion) => Thenable<{}>; } = {
 		":" : () => { return showCmdLine(); },
 		"u" : () => { return vscode.commands.executeCommand("undo"); },
 		"ctrl+r" : () => { return vscode.commands.executeCommand("redo"); },
@@ -36,16 +30,17 @@ export default class NormalMode extends Mode {
 		"esc": () => { return vscode.commands.executeCommand("workbench.action.closeMessages"); }
 	};
 
-	constructor() {
-		super(ModeName.Normal);
+	constructor(motion : Motion) {
+		super(ModeName.Normal, motion);
 	}
 
 	ShouldBeActivated(key : string, currentMode : ModeName) : boolean {
 		return (key === 'esc' || key === 'ctrl+[');
 	}
 
 	HandleActivation(key : string) : Thenable<{}> {
-		return Promise.resolve(this.caret.reset().left().move());
+        this.Motion.left().move();
+		return Promise.resolve(this.Motion);
 	}
 
 	HandleKeyEvent(key : string) : Thenable<{}>  {
@@ -65,7 +60,7 @@ export default class NormalMode extends Mode {
 
 			if (keyHandled) {
 				this.keyHistory = [];
-				return this.keyHandler[keysPressed](this.caret);
+				return this.keyHandler[keysPressed](this.Motion);
 			}
 
 			resolve();

diff --git a/src/mode/modeVisual.ts b/src/mode/modeVisual.ts