refactor due to code review

ajaxorg · Nov 24, 2024 · bf581ad · bf581ad
1 parent fb48def
commit bf581ad
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 32 deletions.
diff --git a/src/mode/lua_highlight_rules.js b/src/mode/lua_highlight_rules.js
@@ -81,7 +81,7 @@ var LuaHighlightRules = function() {
                     },
                     regex : /\]=*\]/,
                 }, {
-                    defaultToken : "comment"
+                    defaultToken : "comment.body"
                 }
             ]
         },

diff --git a/src/mode/text.js b/src/mode/text.js
@@ -34,13 +34,7 @@ Mode = function() {
             this.$highlightRules = this.$highlightRules || new this.HighlightRules(this.$highlightRuleConfig);
             var modeName;
             if (this.$id) {
-                var chunks = this.$id.split('/');
-                if (chunks.length > 1) {
-                    modeName = chunks[chunks.length - 1];
-                }
-                else {
-                    modeName = chunks;
-                }
+                modeName = this.$id.split('/').pop();
             }
             else {
                 modeName = "root";

diff --git a/src/scope.js b/src/scope.js
@@ -21,6 +21,7 @@ class Scope {
         stringObj.count = this.count;
         stringObj.getAllScopeNames = this.getAllScopeNames;
         stringObj.toStack = this.toStack;
+        stringObj.fromStack = this.fromStack;
 
         return stringObj;
     }
@@ -88,6 +89,33 @@ class Scope {
         } while (self = self.parent);
         return stack;
     }
+
+    /**
+     * Retrieves the scope for the given stack and current state.
+     *
+     * @param {string[]} stack - The stack of scopes.
+     * @param {string | Scope} currentState - The current state.
+     * @returns {Scope} The scope for the given stack and current state.
+     */
+    fromStack(stack, currentState) {
+        /**@type{Scope}*/
+        let scope = this;
+        while (scope.parent) {
+            scope = scope.parent;
+        }
+
+        if (stack.length === 0) {
+            return scope.get(currentState); //the start state
+        }
+        for (var i = stack.length - 1; i >= 0; i--) {
+            scope = scope.get(stack[i]);
+        }
+        if (stack[0] !== currentState) {
+            scope = scope.get(currentState, "#tmp");
+        }
+
+        return scope;
+    }
 }
 
 

diff --git a/src/tokenizer.js b/src/tokenizer.js
@@ -303,7 +303,7 @@ class Tokenizer {
                         else {
                             if (rule.next) {
                                 currentState = rule.next(currentState.toString(), stack);
-                                currentState = this.fromStack(stack, currentState);
+                                currentState = this.rootScope.fromStack(stack, currentState);
                             }
                             else {
                                 currentState = rule.next2(currentState, stack);
@@ -331,7 +331,7 @@ class Tokenizer {
 
             if (value) {
                 if (type && !type["getAllScopeNames"]) {
-                    currentState = this.fromStack(stack, currentState.toString());
+                    currentState = this.rootScope.fromStack(stack, currentState);
                 }
 
                 if (type && !Array.isArray(type) && type != "") {
@@ -402,27 +402,7 @@ class Tokenizer {
         };
     }
 
-    /**
-     * Retrieves the scope for the given stack and current state.
-     *
-     * @param {string[]} stack - The stack of scopes.
-     * @param {string} currentState - The current state.
-     * @returns {Scope} The scope for the given stack and current state.
-     */
-    fromStack(stack, currentState) {
-        let scope = this.rootScope;
-        if (stack.length === 0) {
-            return scope.get(currentState); //the start state
-        }
-        for (var i = stack.length - 1; i >= 0; i--) {
-            scope = scope.get(stack[i]);
-        }
-        if (stack[0] !== currentState) {
-            scope = scope.get(currentState, "#tmp");
-        }
 
-        return scope;
-    }
 }
 
 Tokenizer.prototype.reportError = reportError;

diff --git a/src/tooltip.js b/src/tooltip.js
@@ -56,8 +56,8 @@ class Tooltip {
      * @param {Number} y
      **/
     setPosition(x, y) {
-        this.getElement().style.left = Math.round(x) + "px";
-        this.getElement().style.top = Math.round(y) + "px";
+        this.getElement().style.left = x + "px";
+        this.getElement().style.top = y + "px";
     }
 
     /**