[javascript mode] fix tokenizing of underscore properties

The regexp for parsing numbers with numeric separators is too broad. This way, we mistake properties starting with underscore to be numbers.
codemirror · Jul 19, 2019 · 463ea2c · 463ea2c
1 parent 1745746
commit 463ea2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
@@ -67,7 +67,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (ch == '"' || ch == "'") {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^[\d_]+(?:[eE][+\-]?[\d_]+)?/)) {
+    } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) {
       return ret("number", "number");
     } else if (ch == "." && stream.match("..")) {
       return ret("spread", "meta");

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
@@ -310,6 +310,13 @@
      "[number 1E+123_456];",
      "[number 12_34_56n];")
 
+  MT("underscore property",
+     "[variable something].[property _property];",
+     "[variable something].[property _123];",
+     "[variable something].[property _for];",
+     "[variable _for];",
+     "[variable _123];")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))