Let completion box reappear after mistyping and pressing backspace.

gero3 · May 8, 2012 · c5ad584 · c5ad584
1 parent c856e36
commit c5ad584
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/plugins-client/ext.language/complete.js b/plugins-client/ext.language/complete.js
@@ -125,8 +125,8 @@ module.exports = {
 
         // Monkey patch
         if(!oldCommandKey) {
-        oldCommandKey = ace.keyBinding.onCommandKey;
-        ace.keyBinding.onCommandKey = this.onKeyPress.bind(this);
+            oldCommandKey = ace.keyBinding.onCommandKey;
+            ace.keyBinding.onCommandKey = this.onKeyPress.bind(this);
             oldOnTextInput = ace.keyBinding.onTextInput;
             ace.keyBinding.onTextInput = this.onTextInput.bind(this);
         }

diff --git a/plugins-client/ext.language/keyhandler.js b/plugins-client/ext.language/keyhandler.js
@@ -17,16 +17,22 @@ function composeHandlers(mainHandler, fallbackHandler) {
     };
 }
 
-/*function typeAlongComplete(e) {
+function typeAlongComplete(e) {
     if(e.metaKey || e.altKey || e.ctrlKey)
         return false;
     if(editors.currentEditor.amlEditor.syntax !== "javascript")
         return false;
-    var ch = String.fromCharCode(e.keyIdentifier ? parseInt(e.keyIdentifier.replace("U+", ""), 16) : e.keyCode);
-    console.log(e);
-    handleChar(ch);
+    if(e.keyCode === 8) {
+        var ext = require("ext/language/complete");
+        var editor = editors.currentEditor.amlEditor.$editor;
+        var pos = editor.getCursorPosition();
+        var line = editor.session.getDocument().getLine(pos.row);
+        if(!preceededByIdentifier(line, pos.column))
+            return false;
+        ext.deferredInvoke();
+    }
     return false;
-}*/
+}
 
 function typeAlongCompleteTextInput(text, pasted) {
     if(editors.currentEditor.amlEditor.syntax !== "javascript")
@@ -91,6 +97,7 @@ function preceededByIdentifier(line, column, postfix) {
 }
 
 exports.typeAlongCompleteTextInput = typeAlongCompleteTextInput;
+exports.typeAlongComplete = typeAlongComplete;
 exports.composeHandlers = composeHandlers;
 exports.inCompletableCodeContext = inCompletableCodeContext;
 exports.preceededByIdentifier = preceededByIdentifier;

diff --git a/plugins-client/ext.language/language.js b/plugins-client/ext.language/language.js
@@ -38,6 +38,7 @@ module.exports = ext.register("ext/language/language", {
     enabled : true,
 
     defaultKeyHandler: null,
+    defaultCommandKeyHandler: null,
 
     hook : function() {
         var _self = this;
@@ -148,13 +149,17 @@ module.exports = ext.register("ext/language/language", {
         if(enabled) {
             if(!this.defaultKeyHandler) {
                 this.defaultKeyHandler = this.editor.keyBinding.onTextInput;
+                this.defaultCommandKeyHandler = this.editor.keyBinding.onCommandKey;
                 this.editor.keyBinding.onTextInput = keyhandler.composeHandlers(keyhandler.typeAlongCompleteTextInput, this.defaultKeyHandler.bind(this.editor.keyBinding));
+                this.editor.keyBinding.onCommandKey = keyhandler.composeHandlers(keyhandler.typeAlongComplete, this.defaultCommandKeyHandler.bind(this.editor.keyBinding));
             }
         }
         else {
             if(this.defaultKeyHandler) {
                 this.editor.keyBinding.onTextInput = this.defaultKeyHandler;
+                this.editor.keyBinding.onCommandKey = this.defaultCommandKeyHandler;
                 this.defaultKeyHandler = null;
+                this.defaultCommandKeyHandler = null;
             }
         }
     },