lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/sql_highlight_rules.js in gollum-3.1.2 vs lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/sql_highlight_rules.js in gollum-3.1.3
- old
+ new
@@ -36,11 +36,11 @@
var SqlHighlightRules = function() {
var keywords = (
"select|insert|update|delete|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
- "when|else|end|type|left|right|join|on|outer|desc|asc"
+ "when|else|end|type|left|right|join|on|outer|desc|asc|union"
);
var builtinConstants = (
"true|false|null"
);
@@ -57,10 +57,14 @@
this.$rules = {
"start" : [ {
token : "comment",
regex : "--.*$"
+ }, {
+ token : "comment",
+ start : "/\\*",
+ end : "\\*/"
}, {
token : "string", // " string
regex : '".*?"'
}, {
token : "string", // ' string
@@ -83,9 +87,10 @@
}, {
token : "text",
regex : "\\s+"
} ]
};
+ this.normalizeRules();
};
oop.inherits(SqlHighlightRules, TextHighlightRules);
exports.SqlHighlightRules = SqlHighlightRules;