suggestion to move Vim mode into ace

Makefile.dryice.js

@@ -326,7 +326,7 @@ project.assumeAllFilesLoaded();
         source: [
             copy.source.commonjs({
                 project: cloneProject(project),
-                require: [ 'ace/keyboard/keybinding/' + keybinding ]
+                require: [ 'ace/keyboard/' + keybinding ]
             })
         ],
         filter: [ copy.filter.moduleDefines, copy.filter.uglifyjs, filterTextPlugin ],

demo/kitchen-sink/demo.js

@@ -49,8 +49,8 @@ var theme = require("ace/theme/textmate");
 var EditSession = require("ace/edit_session").EditSession;
 var UndoManager = require("ace/undomanager").UndoManager;
 
-var vim = require("ace/keyboard/keybinding/vim").Vim;
-var emacs = require("ace/keyboard/keybinding/emacs").Emacs;
+var vim = require("ace/keyboard/vim").handler;
+var emacs = require("ace/keyboard/emacs").handler;
 var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
 
 

lib/ace/keyboard/keybinding/emacs.js → lib/ace/keyboard/emacs.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var StateHandler = require("../state_handler").StateHandler;
-var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
+var StateHandler = require("./state_handler").StateHandler;
+var matchCharacterOnly =  require("./state_handler").matchCharacterOnly;
 
 var emacsState = {
     start: [
@@ -144,6 +144,6 @@ var emacsState = {
     ]
 };
 
-exports.Emacs = new StateHandler(emacsState);
+exports.handler = new StateHandler(emacsState);
 
 });

lib/ace/keyboard/keybinding.js

@@ -54,19 +54,28 @@ var KeyBinding = function(editor) {
         if (this.$handlers[this.$handlers.length - 1] == keyboardHandler)
             return;
         this.$data = { };
-        this.$handlers = keyboardHandler ? [this, keyboardHandler] : [this];
+        for (var i = 0; i < this.$handlers.length; i++)
+            this.$handlers[i].detach && this.$handlers[i].detach(this.$editor);
+
+        this.$handlers = [this];
+        if (keyboardHandler) {
+            this.$handlers.push(keyboardHandler);
+            keyboardHandler.attach && keyboardHandler.attach(this.$editor);
+        }
     };
 
     this.addKeyboardHandler = function(keyboardHandler) {
         this.removeKeyboardHandler(keyboardHandler);
         this.$handlers.push(keyboardHandler);
+        keyboardHandler.attach && keyboardHandler.attach(this.$editor);
     };
 
     this.removeKeyboardHandler = function(keyboardHandler) {
         var i = this.$handlers.indexOf(keyboardHandler);
         if (i == -1)
             return false;
         this.$handlers.splice(i, 1);
+        keyboardHandler.detach && keyboardHandler.detach(this.$editor);
         return true;
     };
 

lib/ace/keyboard/vim.js

@@ -0,0 +1,27 @@
+define(function(require, exports, module) {
+
+"never use strict";
+
+var commands = require("./vim/commands");
+var util = require("./vim/maps/util");
+
+exports.handler = require("./vim/keyboard").handler;
+
+exports.onCursorMove = function(e) {
+    commands.onCursorMove(e.editor);
+    exports.onCursorMove.scheduled = false;
+};
+
+exports.handler.attach = function(editor) {
+    editor.on("click", exports.onCursorMove);
+    if (util.currentMode !== "insert")
+        commands.coreCommands.stop.exec(editor);
+};
+
+exports.handler.detach = function(editor) {
+    editor.removeListener("click", exports.onCursorMove);
+    commands.coreCommands.start.exec(editor);
+    util.currentMode = "normal";
+};
+
+});