Beautify XQuery highlighting rules.

This commit is contained in:
William Candillon 2012-11-08 15:06:35 -08:00 committed by nightwing
commit d91d4954ea

View file

@ -41,49 +41,48 @@ var XQueryHighlightRules = function() {
// regexp must not have capturing parentheses
// regexps are ordered -> the first match is used
this.$rules = {
start : [ {
token : "text",
regex : "<\\!\\[CDATA\\[",
next : "cdata"
start: [{
token: "text",
regex: "<\\!\\[CDATA\\[",
next: "cdata"
}, {
token : "xml-pe",
regex : "<\\?.*?\\?>"
token: "xml-pe",
regex: "<\\?.*?\\?>"
}, {
token : "comment",
regex : "<\\!--",
next : "comment"
}, {
token : "comment",
regex : "\\(:",
next : "comment"
token: "comment",
regex: "<\\!--",
next: "comment"
}, {
token : "text", // opening tag
regex : "<\\/?",
next : "tag"
token: "comment",
regex: "\\(:",
next: "comment"
}, {
token : "constant", // number
regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
}, {
token : "variable", // variable
regex : "\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"
}, {
token: "string",
regex : '".*?"'
}, {
token: "string",
regex : "'.*?'"
token: "text", // opening tag
regex: "<\\/?",
next: "tag"
}, {
token : "text",
regex : "\\s+"
token: "constant", // number
regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
}, {
token: "variable", // variable
regex: "\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"
}, {
token: "string",
regex: '".*?"'
}, {
token: "string",
regex: "'.*?'"
}, {
token: "text",
regex: "\\s+"
}, {
token: "support.function",
regex: "\\w[\\w+_\\-:]+(?=\\()"
}, {
token : keywordMapper,
regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
}, {
token: keywordMapper,
regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
}, {
token: "keyword.operator",
regex: "\\*|=|<|>|\\-|\\+"
}, {
@ -92,50 +91,50 @@ var XQueryHighlightRules = function() {
}, {
token: "rparen",
regex: "[\\])}]"
} ],
tag : [ {
token : "text",
regex : ">",
next : "start"
}],
tag: [{
token: "text",
regex: ">",
next: "start"
}, {
token : "meta.tag",
regex : "[-_a-zA-Z0-9:]+"
token: "meta.tag",
regex: "[-_a-zA-Z0-9:]+"
}, {
token : "text",
regex : "\\s+"
token: "text",
regex: "\\s+"
}, {
token : "string",
regex : '".*?"'
token: "string",
regex: '".*?"'
}, {
token : "string",
regex : "'.*?'"
} ],
cdata : [ {
token : "comment",
regex : "\\]\\]>",
next : "start"
token: "string",
regex: "'.*?'"
}],
cdata: [{
token: "comment",
regex: "\\]\\]>",
next: "start"
}, {
token : "comment",
regex : "\\s+"
token: "comment",
regex: "\\s+"
}, {
token : "comment",
regex : "(?:[^\\]]|\\](?!\\]>))+"
} ],
comment : [ {
token : "comment",
regex : ".*?-->",
next : "start"
token: "comment",
regex: "(?:[^\\]]|\\](?!\\]>))+"
}],
comment: [{
token: "comment",
regex: ".*?-->",
next: "start"
}, {
token: "comment",
regex : ".*:\\)",
next : "start"
token: "comment",
regex: ".*:\\)",
next: "start"
}, {
token : "comment",
regex : ".+"
} ]
token: "comment",
regex: ".+"
}]
};
};