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

fix #2452 . is a valid XML tagname character

Browse source
This commit is contained in:
nightwing 2015-04-19 20:05:25 +04:00
commit 685ba18451
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ var HtmlHighlightRules = function() {
include : "tag_whitespace" include : "tag_whitespace"
}, { }, {
token : "entity.other.attribute-name.xml", token : "entity.other.attribute-name.xml",
regex : "[-_a-zA-Z0-9:]+" regex : "[-_a-zA-Z0-9:.]+"
}, { }, {
token : "keyword.operator.attribute-equals.xml", token : "keyword.operator.attribute-equals.xml",
regex : "=", regex : "=",
@ -89,7 +89,7 @@ var HtmlHighlightRules = function() {
return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml", return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
"meta.tag" + (group ? "." + group : "") + ".tag-name.xml"]; "meta.tag" + (group ? "." + group : "") + ".tag-name.xml"];
}, },
regex : "(</?)([-_a-zA-Z0-9:]+)", regex : "(</?)([-_a-zA-Z0-9:.]+)",
next: "tag_stuff" next: "tag_stuff"
}], }],
tag_stuff: [ tag_stuff: [

6
lib/ace/mode/xml_highlight_rules.js
View file

@ -35,8 +35,10 @@ var oop = require("../lib/oop");
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
var XmlHighlightRules = function(normalize) { var XmlHighlightRules = function(normalize) {
// http://www.w3.org/TR/REC-xml/#NT-NameChar
var tagRegex = "[a-zA-Z][-_a-zA-Z0-9]*"; // NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
// NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
this.$rules = { this.$rules = {
start : [ start : [