fixed local autocomplete for set/kill commands

Author: nikitaeverywhere

classes/%WebTerminal.Engine.cls

@@ -713,6 +713,7 @@ Method Update(version) As %Status
     if ($isobject(httprequest.HttpResponse.Data)) {
         do ..SendData($C(13,10))
         do ..SendData("35", ..ConstClientOutputLocalized)
+        do ..SendData($C(13,10))
         do $system.OBJ.LoadStream(httprequest.HttpResponse.Data,"",.error,.items)
         if (error) {
             do ..SendData($C(27)_"[31mFAILED" _ $C(27) _ "[0m" _ $C(13,10))

package.json

@@ -3,8 +3,8 @@
   "title": "Cache WEB Terminal",
   "description": "Web-based terminal emulator for Caché administering.",
   "author": "ZitRo",
-  "version": "2.0.0-beta.7",
-  "releaseNumber": "9",
+  "version": "2.0.0-beta.8",
+  "releaseNumber": "10",
   "repository": {
     "type": "git",
     "url": "https://github.com/intersystems-ru/webterminal.git"

webSource/js/TerminalAutocomplete.js

@@ -176,7 +176,9 @@ TerminalAutocomplete.prototype.getEndings = function (string) {
 };
 
 /**
- * @param {TerminalAutocomplete.prototype.TYPES} type
+ * Register new autocomplete variant.
+ *
+ * @param type - TerminalAutocomplete.TYPES.*
  * @param {string} lexeme
  * @param {string|undefined} [namespace] - If set to undefined, lexeme will be registered in global
  *                                         namespace.
@@ -189,8 +191,6 @@ TerminalAutocomplete.prototype.register = function (type, lexeme, namespace, par
             : this._trie,
         i;
 
-    //console.log("Registering", lexeme, "in", namespace || "%", "withing", parents);
-
     if (parents) {
         lexeme = (parents || []).join("\n") + "\n" + lexeme;
     }
@@ -205,4 +205,67 @@ TerminalAutocomplete.prototype.register = function (type, lexeme, namespace, par
 
     level["\n"] = { type: type };
 
+};
+
+/**
+ * @param {string} lexeme
+ * @param {string} [namespace]  - If set to undefined, lexeme will be registered in global
+ *                                namespace.
+ * @param {string[]} [parents] - Parents to which child was appended.
+ */
+TerminalAutocomplete.prototype.clear = function (lexeme, namespace, parents) {
+
+    var level = namespace
+            ? this._namespaceTries[namespace] || (this._namespaceTries[namespace] = {})
+            : this._trie,
+        i;
+
+    if (parents) {
+        lexeme = (parents || []).join("\n") + "\n" + lexeme;
+    }
+
+    for (i = 0; i < lexeme.length; i++) {
+        if (level.hasOwnProperty(lexeme[i])) {
+            level = level[lexeme[i]];
+        } else {
+            level = level[lexeme[i]] = {};
+        }
+    }
+
+    if (level.hasOwnProperty("\n") && level["\n"].type) {
+        delete level["\n"].type;
+    }
+
+};
+
+TerminalAutocomplete.prototype.parseForCacheTokens = function (string) {
+
+    string = " " + string + "  "; // keep two spaces
+
+    var re = new RegExp(
+            "[\\s\\{](set|s)\\s(([a-zA-Z][a-zA-Z0-9]*)|(\\^[a-zA-Z][a-z\\.A-Z0-9]*))\\s*=",
+            "ig"
+        ),
+        result = re.exec(string);
+
+    if (result && result[2]) {
+        if (result[2].charAt(0) === "^") {
+            this.register(this.TYPES.globals, result[2].substr(1), this.NAMESPACE);
+        } else {
+            this.register(this.TYPES.common, result[2], this.NAMESPACE);
+        }
+    }
+
+    re = new RegExp(
+        "[\\s\\{](k|kill)\\s(([a-zA-Z][a-zA-Z0-9]*)|(\\^[a-zA-Z][a-z\\.A-Z0-9]*))[\\s\\}]",
+        "ig"
+    );
+    result = re.exec(string);
+
+    if (result && result[2]) {
+        if (result[2].charAt(0) === "^") {
+            this.clear(result[2].substr(1), this.NAMESPACE);
+        } else this.clear(result[2], this.NAMESPACE);
+    }
+
 };

webSource/js/TerminalController.js

@@ -28,7 +28,7 @@ var TerminalController = function (TERMINAL) {
      */
     this.server = new CacheWebTerminalServer(
         this, (location.protocol === "https:" ? "wss:" : "ws:"), location.hostname,
-        "".concat(/* @echo "location.port || 80" */) || "57772"
+        "".concat(/* @echo "location.port || 80" */) || "57773"
     );
 
     /**

webSource/js/TerminalInput.js

@@ -384,6 +384,7 @@ TerminalInput.prototype.submit = function () {
         this._handler = null;
         handler.call(this, value);
     } else {
+        this.TERMINAL.autocomplete.parseForCacheTokens(value);
         this.TERMINAL.controller.terminalQuery(value);
     }
     this._updateAutocompleteView();