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

fix highlighting of scala strings

Browse source
This commit is contained in:
nightwing 2012-06-01 14:52:51 +04:00
commit e38875cdfc
1 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/ace/mode/scala_highlight_rules.js
View file

@ -75,11 +75,16 @@ var ScalaHighlightRules = function() {
token : "string.regexp", token : "string.regexp",
regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)" regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
}, { }, {
token : "string", // single line token : "string",
regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' regex : '"""',
next : "tstring"
}, { }, {
token : "string", // single line token : "string",
regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" regex : '"',
next : "string"
}, {
token : "symbol.constant", // single line
regex : "'[\\w\\d_]+"
}, { }, {
token : "constant.numeric", // hex token : "constant.numeric", // hex
regex : "0[xX][0-9a-fA-F]+\\b" regex : "0[xX][0-9a-fA-F]+\\b"
@ -131,6 +136,32 @@ var ScalaHighlightRules = function() {
merge : true, merge : true,
regex : ".+" regex : ".+"
} }
],
"string" : [
{
token : "escape",
regex : '\\\\"',
}, {
token : "string",
merge : true,
regex : '"',
next : "start"
}, {
token : "string",
regex : '[^"\\\\]+',
merge : true
}
],
"tstring" : [
{
token : "string", // closing comment
regex : '"{3,5}',
next : "start"
}, {
token : "string", // comment spanning whole line
merge : true,
regex : ".+?"
}
] ]
}; };