Merge pull request #1360 from chhochreiner/master

minor tcl mode cleanup
This commit is contained in:
Harutyun Amirjanyan 2013-04-08 06:05:41 -07:00
commit bf4e49668a

View file

@ -66,7 +66,7 @@ var TclHighlightRules = function() {
regex : '[ ]*["]', regex : '[ ]*["]',
next : "qqstring" next : "qqstring"
}, { }, {
token : "variable.instance", // variable xotcl with braces token : "variable.instance",
regex : "[$]", regex : "[$]",
next : "variable" next : "variable"
}, { }, {
@ -103,7 +103,7 @@ var TclHighlightRules = function() {
token : "string", // single line token : "string", // single line
regex : '[ ]*["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' regex : '[ ]*["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
}, { }, {
token : "variable.instance", // variable xotcl with braces token : "variable.instance",
regex : "[$]", regex : "[$]",
next : "variable" next : "variable"
}, { }, {
@ -147,10 +147,6 @@ var TclHighlightRules = function() {
}], }],
"variable" : [ "variable" : [
{ {
token : "variable.instance", // variable xotcl with braces
regex : "(?:[:][:])?[a-zA-Z_\\d]+(?:(?:[:][:])?[a-zA-Z_\\d]+)?(?:[(][a-zA-Z_\\d]+[)])?",
next : "start"
}, {
token : "variable.instance", // variable tcl token : "variable.instance", // variable tcl
regex : "[a-zA-Z_\\d]+(?:[(][a-zA-Z_\\d]+[)])?", regex : "[a-zA-Z_\\d]+(?:[(][a-zA-Z_\\d]+[)])?",
next : "start" next : "start"