fix after rebase

Author: nightwing

demo/kitchen-sink/demo.js

@@ -130,6 +130,7 @@ function loadLanguageProvider(editor) {
             }
         }, true);
         function showOccurrenceMarkers(session, positions) {
+            if (!session.state) session.state = {}
             if (!session.state.occurrenceMarkers) {
                 session.state.occurrenceMarkers = new MarkerGroup(session);
             }
@@ -179,7 +180,7 @@ function loadLanguageProvider(editor) {
             let docPos = e.getDocumentPosition();
 
             languageProvider.doHover(session, docPos, function(hover) {
-                var errorMarker = session.state?.diagnosticMarkers.getMarkerAtPosition(docPos);
+                var errorMarker = session.state?.diagnosticMarkers?.getMarkerAtPosition(docPos);
 
                 if (!errorMarker && !hover?.content) return;
 

src/layer/text.js

@@ -416,7 +416,7 @@ class Text {
         if (!isTextToken(token.type.toString())) {
             var classes = "ace_" + token.type.toString().replace(/\./g, " ace_");
             var span = this.dom.createElement("span");
-            if (token.type.toString() === "fold")
+            if (token.type.toString() === "fold") {
                 span.style.width = (token.value.length * this.config.characterWidth) + "px";
                 span.setAttribute("title", nls("inline-fold.closed.title", "Unfold code"));
             }

src/scope.js

@@ -1,55 +1,68 @@
 "use strict";
 
-var Scope = function (name, parent) {
-    this.name = name.toString();
-    this.children = {};
-    this.parent = parent;
-};
-(function () {
-    Scope.prototype.toString = function () {
+class Scope {
+    /**
+     * @param {string} name
+     * @param {Scope} [parent]
+     */
+    constructor(name, parent) {
+        this.name = name.toString();
+        this.children = {};
+        this.parent = parent;
+    }
+    toString() {
         return this.name;
-    };
-    Scope.prototype.get = function (name, extraId = '') {
-        return this.children[name.toString() + extraId] || (this.children[name.toString() + extraId] = new Scope(
-            name, this));
-    };
-    Scope.prototype.find = function (states) {
+    }
+    /**
+     * @param {string} name
+     * @param {string|undefined} extraId
+     */
+    get(name, extraId) {
+        var id = name.toString() + (extraId || "");
+        return this.children[id] || (
+            this.children[id] = new Scope(name, this)
+        );
+    }
+    find(states) {
         var s = this;
         while (s && !states[s.name]) {
             s = s.parent;
         }
         return states[s ? s.name : "start"];
-    };
-    Scope.prototype.replace = function (a, b) {
+    }
+    replace(a, b) {
         return this.name.replace(a, b);
-    };
-    Scope.prototype.indexOf = function (a, b) {
+    }
+    indexOf(a, b) {
         return this.name.indexOf(a, b);
-    };
-    Scope.prototype.hasParent = function (states) {
+    }
+    /**
+     * @param {string} states
+     */
+    hasParent(states) {
         var s = this;
         while (s && states !== s.name) {
             s = s.parent;
         }
         return s ? 1 : -1;
-    };
-    Scope.prototype.count = function () {
+    }
+    count() {
         var s = 1;
         for (var i in this.children) s += this.children[i].count();
         return s;
-    };
+    }
     /**
      *
      * @returns {string[]}
      */
-    Scope.prototype.getAllScopeNames = function () {
+    getAllScopeNames() {
         var scopeNames = [];
         var self = this;
         do {
             scopeNames.push(self.name);
         } while (self = self.parent);
         return scopeNames;
-    };
-}).call(Scope.prototype);
+    }
+} 
 
 exports.Scope = Scope;

src/tokenizer.js

@@ -372,21 +372,19 @@ Tokenizer.prototype.reportError = reportError;
  *
  * @constructor
  **/
-var CustomTokenizer = function(rules, modeName) {
-    Tokenizer.call(this, rules);
-    this.rootScope = new Scope(modeName);
-}
-oop.inherits(CustomTokenizer, Tokenizer);
-
-(function() {
+class CustomTokenizer extends Tokenizer {
+    constructor(rules, modeName) {
+        super(rules);
+        this.rootScope = new Scope(modeName);
+    }
     /**
      * Returns an object containing two properties: `tokens`, which contains all the tokens; and `state`, the current state.
      * @param {String} line
      * @param {String|Scope} startState
      * @returns {Object}
      * @override
      **/
-    this.getLineTokens = function(line, startState) {
+    getLineTokens(line, startState) {
         var stack = [];
 
         var currentState = (startState !== undefined) ? (startState instanceof Scope) ? startState
@@ -404,7 +402,7 @@ oop.inherits(CustomTokenizer, Tokenizer);
         var lastIndex = 0;
         var matchAttempts = 0;
 
-        var token = {type: null, value: ""};
+        var token = { type: null, value: "" };
 
         while (match = re.exec(line)) {
             var type = currentState.get(mapping.defaultToken);
@@ -420,11 +418,11 @@ oop.inherits(CustomTokenizer, Tokenizer);
                 } else {
                     if (token.type)
                         tokens.push(token);
-                    token = {type: currentState.get(type), value: skipped};
+                    token = { type: currentState.get(type), value: skipped };
                 }
             }
 
-            for (var i = 0; i < match.length-2; i++) {
+            for (var i = 0; i < match.length - 2; i++) {
                 if (match[i + 1] === undefined)
                     continue;
 
@@ -491,14 +489,14 @@ oop.inherits(CustomTokenizer, Tokenizer);
                     } else {
                         if (token.type)
                             tokens.push(token);
-                        token = {type: currentState.get(type), value: value};
+                        token = { type: currentState.get(type), value: value };
                     }
                 } else if (type) {
                     if (token.type)
                         tokens.push(token);
-                    token = {type: null, value: ""};
+                    token = { type: null, value: "" };
                     for (var i = 0; i < type.length; i++) {
-                        type[i].type=currentState.get(type[i].type);
+                        type[i].type = currentState.get(type[i].type);
                         tokens.push(type[i]);
                     }
                 }
@@ -544,8 +542,9 @@ oop.inherits(CustomTokenizer, Tokenizer);
         return {
             tokens: tokens
         };
-    };
-}).call(CustomTokenizer.prototype);
+    }
+}
 
+ 
 exports.Tokenizer = Tokenizer;
 exports.CustomTokenizer = CustomTokenizer;