Skip to content

Commit 08a7641

Browse files
committed
[javascript mode] Simplify number tokenizing and add support for n prefix
Issue #5411
1 parent 2e99e14 commit 08a7641

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

mode/javascript/javascript.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
7575
return ret(ch);
7676
} else if (ch == "=" && stream.eat(">")) {
7777
return ret("=>", "operator");
78-
} else if (ch == "0" && stream.eat(/x/i)) {
79-
stream.eatWhile(/[\da-f]/i);
80-
return ret("number", "number");
81-
} else if (ch == "0" && stream.eat(/o/i)) {
82-
stream.eatWhile(/[0-7]/i);
83-
return ret("number", "number");
84-
} else if (ch == "0" && stream.eat(/b/i)) {
85-
stream.eatWhile(/[01]/i);
78+
} else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
8679
return ret("number", "number");
8780
} else if (/\d/.test(ch)) {
88-
stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
81+
stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
8982
return ret("number", "number");
9083
} else if (ch == "/") {
9184
if (stream.eat("*")) {

0 commit comments

Comments
 (0)