jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better highlighting of js regexps

Browse source
This commit is contained in:
nightwing 2012-09-09 17:43:09 +04:00
commit 2a5e44eba2
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/ace/mode/javascript_highlight_rules.js
View file

@ -243,6 +243,7 @@ var JavaScriptHighlightRules = function() {
], ],
"regex": [ "regex": [
{ {
// escapes
token: "regexp.keyword.operator", token: "regexp.keyword.operator",
regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)" regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
}, { }, {
@ -251,13 +252,21 @@ var JavaScriptHighlightRules = function() {
regex: "/\\w*", regex: "/\\w*",
next: "start", next: "start",
merge: true merge: true
}, {
// invalid operators
token : "invalid",
regex: /\{\d+,?(?:\d+)?}[+*]|[+*^$?][+*]|\?\?/ // |[^$][?]
}, {
// operators
token : "constant.language.escape",
regex: /\(\?[:=!]|\)|\{\d+,?(?:\d+)?}|[+*]\?|[(|)$^+*?]/
}, { }, {
token: "string.regexp", token: "string.regexp",
regex: "[^\\\\/\\[]+", regex: /{|[^\[\\{()$^+*?\/]+/,
merge: true merge: true
}, { }, {
token: "string.regexp.charachterclass", token: "constant.language.escape",
regex: "\\[", regex: /\[\^?/,
next: "regex_character_class", next: "regex_character_class",
merge: true merge: true
}, { }, {
@ -271,13 +280,16 @@ var JavaScriptHighlightRules = function() {
token: "regexp.keyword.operator", token: "regexp.keyword.operator",
regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)" regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
}, { }, {
token: "string.regexp.charachterclass", token: "constant.language.escape",
regex: "]", regex: "]",
next: "regex", next: "regex",
merge: true merge: true
}, {
token: "constant.language.escape",
regex: "-",
}, { }, {
token: "string.regexp.charachterclass", token: "string.regexp.charachterclass",
regex: "[^\\\\\\]]+", regex: /[^\]\-\\]+/,
merge: true merge: true
}, { }, {
token: "empty", token: "empty",

2
lib/ace/mode/javascript_highlight_rules_test.js
View file

@ -134,7 +134,7 @@ module.exports = {
assert.equal("string.regexp", tokens[2].type); assert.equal("string.regexp", tokens[2].type);
var tokens = this.tokenizer.getLineTokens("a = 1 + /2 + 1/b", "start").tokens; var tokens = this.tokenizer.getLineTokens("a = 1 + /2 + 1/b", "start").tokens;
assert.equal(9, tokens.length); assert.equal(11, tokens.length);
assert.equal("string.regexp", tokens[8].type); assert.equal("string.regexp", tokens[8].type);
var tokens = this.tokenizer.getLineTokens("a=/a/ / /a/", "start").tokens; var tokens = this.tokenizer.getLineTokens("a=/a/ / /a/", "start").tokens;