Amend language variable support

This commit is contained in:
richo 2012-03-28 23:52:43 +11:00
commit 99702e7505

View file

@ -58,11 +58,6 @@ var ShHighlightRules = function() {
).split('|') ).split('|')
); );
var builtinVariables = lang.arrayToMap(
// TODO
('$?|$$|$!|$SHLVL').split('|')
);
var integer = "(?:(?:[1-9]\\d*)|(?:0))"; var integer = "(?:(?:[1-9]\\d*)|(?:0))";
// var integer = "(?:" + decimalInteger + ")"; // var integer = "(?:" + decimalInteger + ")";
@ -74,9 +69,10 @@ var ShHighlightRules = function() {
var fileDescriptor = "(?:&" + intPart + ")"; var fileDescriptor = "(?:&" + intPart + ")";
var variableName = "[a-zA-Z][a-zA-Z0-9_]*"; var variableName = "[a-zA-Z][a-zA-Z0-9_]*";
var variable = "(?:(?:\\$" + variableName + ")|(?:" + variableName + "=))"; var variable = "(?:(?:\\$" + variableName + ")|(?:" + variableName + "=))";
var builtinVariable = "(?:\\$(?:SHLVL|\\$|\\!|\\?))";
this.$rules = { this.$rules = {
"start" : [ { "start" : [ {
token : "comment", token : "comment",
@ -84,6 +80,9 @@ var ShHighlightRules = function() {
}, { }, {
token : "string", // " string token : "string", // " string
regex : '"(?:[^\\\\]|\\\\.)*?"' regex : '"(?:[^\\\\]|\\\\.)*?"'
}, {
token : "variable.language",
regex : builtinVariable
}, { }, {
token : "variable", token : "variable",
regex : variable regex : variable
@ -105,8 +104,6 @@ var ShHighlightRules = function() {
return "keyword"; return "keyword";
else if (languageConstructs.hasOwnProperty(value)) else if (languageConstructs.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (builtinVariables.hasOwnProperty(value))
return "support.function";
else if (value == "debugger") else if (value == "debugger")
return "invalid.deprecated"; return "invalid.deprecated";
else else