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

fix merge conflicts

Browse source
This commit is contained in:
nightwing 2012-05-23 22:21:18 +04:00
commit 715a2f8635
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
demo/kitchen-sink/demo.js
View file

@ -121,7 +121,7 @@ var modes = [
new Mode("xml", "XML", ["xml"]), new Mode("xml", "XML", ["xml"]),
new Mode("sh", "SH", ["sh"]), new Mode("sh", "SH", ["sh"]),
new Mode("xquery", "XQuery", ["xq"]), new Mode("xquery", "XQuery", ["xq"]),
new Mode("yaml", "YAML", require("ace/mode/yaml").Mode, ["yaml"]) new Mode("yaml", "YAML", ["yaml"])
]; ];
modesByName = {}; modesByName = {};

4
lib/ace/mode/yaml_highlight_rules.js
View file

@ -57,8 +57,8 @@ var YamlHighlightRules = function() {
token: "variable", token: "variable",
regex: "[&\\*][a-zA-Z0-9-_]+" regex: "[&\\*][a-zA-Z0-9-_]+"
}, { }, {
token: "identifier", token: ["identifier", "text"],
regex: "(\\w+\\s*:)(?:\\w*)" regex: "(\\w+\\s*:)(\\w*)"
}, { }, {
token : "keyword.operator", token : "keyword.operator",
regex : "<<\\w*:\\w*" regex : "<<\\w*:\\w*"