From c7abff185654618f76f5c843af6a21cf38b9ed8c Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 14 Jul 2013 08:49:45 +0400 Subject: [PATCH] use meta.tag.punctuation --- lib/ace/mode/_test/tokens_coldfusion.json | 12 +- lib/ace/mode/_test/tokens_curly.json | 16 +- lib/ace/mode/_test/tokens_ftl.json | 72 +++---- lib/ace/mode/_test/tokens_html.json | 24 +-- lib/ace/mode/_test/tokens_html_ruby.json | 116 +++++------ lib/ace/mode/_test/tokens_jsp.json | 100 ++++----- lib/ace/mode/_test/tokens_liquid.json | 136 ++++++------ lib/ace/mode/_test/tokens_luapage.json | 240 +++++++++++----------- lib/ace/mode/_test/tokens_markdown.json | 8 +- lib/ace/mode/_test/tokens_rhtml.json | 56 ++--- lib/ace/mode/_test/tokens_svg.json | 112 +++++----- lib/ace/mode/_test/tokens_twig.json | 64 +++--- lib/ace/mode/_test/tokens_velocity.json | 32 +-- lib/ace/mode/_test/tokens_xml.json | 24 +-- lib/ace/mode/folding/xml.js | 6 +- lib/ace/mode/html_highlight_rules.js | 8 +- lib/ace/mode/xml_highlight_rules.js | 16 +- 17 files changed, 521 insertions(+), 521 deletions(-) diff --git a/lib/ace/mode/_test/tokens_coldfusion.json b/lib/ace/mode/_test/tokens_coldfusion.json index 3efac612..02f2c3f7 100644 --- a/lib/ace/mode/_test/tokens_coldfusion.json +++ b/lib/ace/mode/_test/tokens_coldfusion.json @@ -5,22 +5,22 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","cfset"], ["text"," "], ["entity.other.attribute-name","welcome"], ["keyword.operator.separator","="], ["string","\"Hello World!\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","cfoutput"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","#welcome#"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_curly.json b/lib/ace/mode/_test/tokens_curly.json index 87e39d42..110574b6 100644 --- a/lib/ace/mode/_test/tokens_curly.json +++ b/lib/ace/mode/_test/tokens_curly.json @@ -9,24 +9,24 @@ ["text","tokenize embedded script"] ],[ "start", - ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","a"], ["keyword.operator.separator","="], ["string","'a'"], - ["punctuation.meta.tag.end.script",">"], + ["meta.tag.punctuation.end",">"], ["storage.type","var"], - ["punctuation.meta.tag.begin.script",""], + ["meta.tag.punctuation.end",">"], ["text","'123'"] ],[ "start", ["text","tokenize multiline attribute value with double quotes"] ],[ ["qqstring_inner","start_tag_stuff"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -35,13 +35,13 @@ ],[ "start", ["string","def\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","tokenize multiline attribute value with single quotes"] ],[ ["qstring_inner","start_tag_stuff"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -50,7 +50,7 @@ ],[ "start", ["string","def\\\"'"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_ftl.json b/lib/ace/mode/_test/tokens_ftl.json index 4a1ee640..c9a7da81 100644 --- a/lib/ace/mode/_test/tokens_ftl.json +++ b/lib/ace/mode/_test/tokens_ftl.json @@ -49,97 +49,97 @@ ["punctuation.doctype.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], ["text"," "], ["entity.other.attribute-name","lang"], ["keyword.operator.separator","="], ["string","\"en-us\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","head"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","meta"], ["text"," "], ["entity.other.attribute-name","charset"], ["keyword.operator.separator","="], ["string","\"utf-8\""], ["text"," "], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["string.interpolated","${"], ["variable","title"], ["keyword.operator","!"], ["string","\"FreeMarker\""], ["string.interpolated","}"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","body"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h1"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Hello "], ["string.interpolated","${"], ["variable","name"], ["keyword.operator","!"], ["string","\"\""], ["string.interpolated","}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Today is: "], ["string.interpolated","${"], ["language.variable",".now"], ["support.function","?date"], ["string.interpolated","}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] @@ -185,9 +185,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","ul"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -202,9 +202,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","li"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["string.interpolated","${"], ["variable","item_index"], ["string.interpolated","}"], @@ -222,9 +222,9 @@ ["constant.numeric","0"], ["paren.rparen","]"], ["string.interpolated","}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -233,9 +233,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] @@ -309,7 +309,7 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.image","img"], ["text"," "], ["entity.other.attribute-name","src"], @@ -320,21 +320,21 @@ ["string.interpolated","}"], ["string",".png\""], ["text"," "], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_html.json b/lib/ace/mode/_test/tokens_html.json index 970ff7d1..794ba26d 100644 --- a/lib/ace/mode/_test/tokens_html.json +++ b/lib/ace/mode/_test/tokens_html.json @@ -1,25 +1,25 @@ [[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","a"], ["keyword.operator.separator","="], ["string","'a'"], - ["punctuation.meta.tag.end.script",">"], + ["meta.tag.punctuation.end",">"], ["storage.type","var"], - ["punctuation.meta.tag.begin.script",""], + ["meta.tag.punctuation.end",">"], ["text","'123'"] ],[ ["qqstring_inner","start_tag_stuff"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -28,10 +28,10 @@ ],[ "start", ["string"," def\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ ["qstring_inner","start_tag_stuff"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -40,12 +40,12 @@ ],[ "start", ["string","def\\'"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_html_ruby.json b/lib/ace/mode/_test/tokens_html_ruby.json index abca936f..2e362ffc 100644 --- a/lib/ace/mode/_test/tokens_html_ruby.json +++ b/lib/ace/mode/_test/tokens_html_ruby.json @@ -1,79 +1,79 @@ [[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h1"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Listing Books"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","table"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","tr"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","th"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Title"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","th"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Summary"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","th"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","th"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","th"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] @@ -93,15 +93,15 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","tr"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["support.ruby_tag","<%="], ["text"," "], ["identifier","book"], @@ -109,15 +109,15 @@ ["identifier","title"], ["text"," "], ["support.ruby_tag","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["support.ruby_tag","<%="], ["text"," "], ["identifier","book"], @@ -125,15 +125,15 @@ ["identifier","content"], ["text"," "], ["support.ruby_tag","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["support.ruby_tag","<%="], ["text"," "], ["support.function","link_to"], @@ -143,15 +143,15 @@ ["identifier","book"], ["text"," "], ["support.ruby_tag","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["support.ruby_tag","<%="], ["text"," "], ["support.function","link_to"], @@ -164,15 +164,15 @@ ["paren.rparen",")"], ["text"," "], ["support.ruby_tag","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["support.ruby_tag","<%="], ["text"," "], ["support.function","link_to"], @@ -194,15 +194,15 @@ ["constant.other.symbol.ruby",":delete"], ["text"," "], ["support.ruby_tag","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["support.ruby_tag","<%"], @@ -212,18 +212,18 @@ ["support.ruby_tag","%>"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","br"], ["text"," "], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ],[ "start", ["text"," "] diff --git a/lib/ace/mode/_test/tokens_jsp.json b/lib/ace/mode/_test/tokens_jsp.json index 2975fc59..cd556e46 100644 --- a/lib/ace/mode/_test/tokens_jsp.json +++ b/lib/ace/mode/_test/tokens_jsp.json @@ -1,19 +1,19 @@ [[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","body"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "js-start", ["text"," "], - ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.script","script"], - ["punctuation.meta.tag.end.script",">"] + ["meta.tag.punctuation.end",">"] ],[ "js-start", ["text"," "], @@ -40,15 +40,15 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin.script",""] + ["meta.tag.punctuation.end",">"] ],[ "css-start", ["text"," "], - ["punctuation.meta.tag.begin.style","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.style","style"], - ["punctuation.meta.tag.end.style",">"] + ["meta.tag.punctuation.end",">"] ],[ ["css-ruleset","css-start"], ["text"," "], @@ -69,17 +69,17 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin.style",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," Today's date: "], @@ -104,9 +104,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -164,29 +164,29 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Select Languages:"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","form"], ["text"," "], ["entity.other.attribute-name","ACTION"], ["keyword.operator.separator","="], ["string","\"jspCheckBox.jsp\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -200,15 +200,15 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\"Java\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," Java"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","BR"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -222,15 +222,15 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\".NET\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," .NET"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","BR"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -244,15 +244,15 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\"PHP\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," PHP"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","BR"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -266,15 +266,15 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\"C/C++\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," C/C++"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","BR"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -288,15 +288,15 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\"PERL\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," PERL "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","BR"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], @@ -306,13 +306,13 @@ ["entity.other.attribute-name","value"], ["keyword.operator.separator","="], ["string","\"Submit\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -424,12 +424,12 @@ ["meta.tag","%>"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_liquid.json b/lib/ace/mode/_test/tokens_liquid.json index 0be7a718..a87c051d 100644 --- a/lib/ace/mode/_test/tokens_liquid.json +++ b/lib/ace/mode/_test/tokens_liquid.json @@ -41,13 +41,13 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","ul"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"products\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -65,15 +65,15 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","li"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["variable","{{"], ["text"," "], ["identifier","product"], @@ -81,9 +81,9 @@ ["identifier","title"], ["text"," "], ["variable","}}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," Only "], @@ -101,9 +101,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["variable","{{"], ["text"," "], ["identifier","product"], @@ -117,17 +117,17 @@ ["constant.numeric","200"], ["text"," "], ["variable","}}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -139,9 +139,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -153,18 +153,18 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Filters"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text"," The word \"tobi\" in uppercase: "], ["variable","{{"], ["text"," "], @@ -174,14 +174,14 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","The word \"tobi\" has "], ["variable","{{"], ["text"," "], @@ -191,14 +191,14 @@ ["text"," "], ["variable","}}"], ["text"," letters! "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Change \"Hello world\" to \"Hi world\": "], ["variable","{{"], ["text"," "], @@ -212,14 +212,14 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","The date today is "], ["variable","{{"], ["text"," "], @@ -231,27 +231,27 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","If"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -292,27 +292,27 @@ ["variable","%}"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Case"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -392,27 +392,27 @@ ["variable","%}"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","For Loops"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -446,27 +446,27 @@ ["variable","%}"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Tables"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -543,9 +543,9 @@ ["variable","%}"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_luapage.json b/lib/ace/mode/_test/tokens_luapage.json index 7c9e1085..5750ec2e 100644 --- a/lib/ace/mode/_test/tokens_luapage.json +++ b/lib/ace/mode/_test/tokens_luapage.json @@ -12,9 +12,9 @@ ["punctuation.doctype.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ ["lua-bracketedComment",2,"lua-start"], ["keyword","<%"], @@ -33,23 +33,23 @@ ["keyword","%>"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","head"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Reference"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","link"], ["text"," "], ["entity.other.attribute-name","rel"], @@ -77,123 +77,123 @@ ["keyword.operator.separator","="], ["string","\"text/css\""], ["text"," "], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ],[ "start", ["text","\t"], ["comment",""] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","body"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"container\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"product\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"product_logo\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"product_name\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","big"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","b"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"product_description\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"main\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"navigation\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","<%="], @@ -219,22 +219,22 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"content\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -263,22 +263,22 @@ ["keyword","then%>"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Modules"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","table"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"module_list\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["comment",""] @@ -303,20 +303,20 @@ ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","tr"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"name\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -337,26 +337,26 @@ ["paren.rparen",")"], ["keyword","%>"], ["string","\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["keyword","<%="], ["identifier","modulename"], ["keyword","%>"], - ["punctuation.meta.tag.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"summary\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["keyword","<%="], ["identifier","doc"], ["text","."], @@ -367,23 +367,23 @@ ["text","."], ["identifier","summary"], ["keyword","%>"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","<%end%>"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","<%end%>"] @@ -417,22 +417,22 @@ ["keyword","then%>"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h2"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Files"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","table"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"file_list\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["comment",""] @@ -457,20 +457,20 @@ ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","tr"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"name\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -489,43 +489,43 @@ ["paren.rparen",")"], ["keyword","%>"], ["string","\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["keyword","<%="], ["identifier","filepath"], ["keyword","%>"], - ["punctuation.meta.tag.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], ["keyword.operator.separator","="], ["string","\"summary\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","<%end%>"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","<%end%>"] @@ -533,45 +533,45 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"about\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","\t"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], ["keyword.operator.separator","="], ["string","\"http://validator.w3.org/check?uri=referer\""], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.image","img"], ["text"," "], ["entity.other.attribute-name","src"], @@ -590,40 +590,40 @@ ["keyword.operator.separator","="], ["string","\"88\""], ["text"," "], - ["punctuation.meta.tag.end","/>"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," "], ["comment",""], ["text","\t"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_markdown.json b/lib/ace/mode/_test/tokens_markdown.json index 769dfea7..37edf183 100644 --- a/lib/ace/mode/_test/tokens_markdown.json +++ b/lib/ace/mode/_test/tokens_markdown.json @@ -81,13 +81,13 @@ ],[ "start", ["text","in plain text "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","b"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","http://ace.ajaxorg.com"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","b"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "allowBlock" ],[ diff --git a/lib/ace/mode/_test/tokens_rhtml.json b/lib/ace/mode/_test/tokens_rhtml.json index 4aee9702..6dca1c51 100644 --- a/lib/ace/mode/_test/tokens_rhtml.json +++ b/lib/ace/mode/_test/tokens_rhtml.json @@ -1,55 +1,55 @@ [[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","head"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Title"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","body"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","This is an R HTML document. When you click the "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","b"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Knit HTML"], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.end",">"], ["text"," button a web page will be generated that includes both content as well as the output of any embedded R code chunks within the document. You can embed an R code chunk like this:"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -68,13 +68,13 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","p"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","You can also embed plots, for example:"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -93,14 +93,14 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_svg.json b/lib/ace/mode/_test/tokens_svg.json index 671f2918..f92fbbb6 100644 --- a/lib/ace/mode/_test/tokens_svg.json +++ b/lib/ace/mode/_test/tokens_svg.json @@ -1,9 +1,9 @@ [[ - "punctuation.meta.tag.begin", - ["punctuation.meta.tag.begin","<"], + "meta.tag.punctuation.begin0", + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","svg"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","width"], ["keyword.operator.separator","="], @@ -13,7 +13,7 @@ ["keyword.operator.separator","="], ["string","\"600\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","xmlns"], ["keyword.operator.separator","="], @@ -24,41 +24,41 @@ ["entity.other.attribute-name","onload"], ["keyword.operator.separator","="], ["string","\"StartAnimation(evt)\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Test Tube Progress Bar"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","desc"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","Created for the Web Directions SVG competition"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "js-no_regex", ["text"," "], - ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","type"], ["keyword.operator.separator","="], ["string","\"text/ecmascript\""], - ["punctuation.meta.tag.end.script",">"], + ["meta.tag.punctuation.end",">"], ["string.begin",""], - ["punctuation.meta.tag.begin.script",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","rect"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","fill"], ["keyword.operator.separator","="], ["string","\"#2e3436\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","fill-rule"], ["keyword.operator.separator","="], ["string","\"nonzero\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","stroke-width"], ["keyword.operator.separator","="], ["string","\"3\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","y"], ["keyword.operator.separator","="], ["string","\"0\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","x"], ["keyword.operator.separator","="], ["string","\"0\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","height"], ["keyword.operator.separator","="], ["string","\"600\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","width"], ["keyword.operator.separator","="], @@ -547,34 +547,34 @@ ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"rect3590\""], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ],[ "start" ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","text"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","style"], ["keyword.operator.separator","="], ["string","\"font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","x"], ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","y"], ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], @@ -585,38 +585,38 @@ ["entity.other.attribute-name","display"], ["keyword.operator.separator","="], ["string","\"none\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," Hickory,"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","text"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","style"], ["keyword.operator.separator","="], ["string","\"font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","x"], ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","y"], ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], @@ -627,38 +627,38 @@ ["entity.other.attribute-name","display"], ["keyword.operator.separator","="], ["string","\"none\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," dickory,"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","text"] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","style"], ["keyword.operator.separator","="], ["string","\"font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","x"], ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","y"], ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "punctuation.meta.tag.begin", + "meta.tag.punctuation.begin0", ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], @@ -669,16 +669,16 @@ ["entity.other.attribute-name","display"], ["keyword.operator.separator","="], ["string","\"none\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," dock!"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_twig.json b/lib/ace/mode/_test/tokens_twig.json index 54deb6d2..328b3927 100644 --- a/lib/ace/mode/_test/tokens_twig.json +++ b/lib/ace/mode/_test/tokens_twig.json @@ -6,47 +6,47 @@ ["punctuation.doctype.end",">"] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","html"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","head"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","title"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","My Webpage"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","body"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","ul"], ["text"," "], ["entity.other.attribute-name","id"], ["keyword.operator.separator","="], ["string","\"navigation\""], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -64,10 +64,10 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","li"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], @@ -83,7 +83,7 @@ ["text"," "], ["variable.other.readwrite.local.twig","}}"], ["string","\""], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["variable.other.readwrite.local.twig","{{"], ["text"," "], ["identifier","item"], @@ -91,12 +91,12 @@ ["identifier","caption"], ["text"," "], ["variable.other.readwrite.local.twig","}}"], - ["punctuation.meta.tag.begin",""], - ["punctuation.meta.tag.begin",""], + ["meta.tag.punctuation.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -108,9 +108,9 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ @@ -258,13 +258,13 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","h1"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","My Webpage"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -276,12 +276,12 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_velocity.json b/lib/ace/mode/_test/tokens_velocity.json index b734b4e7..3eb7a9ab 100644 --- a/lib/ace/mode/_test/tokens_velocity.json +++ b/lib/ace/mode/_test/tokens_velocity.json @@ -26,15 +26,15 @@ ],[ "start", ["text"," "], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","li"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["variable","${"], ["identifier","item"], ["variable","}"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["keyword","#end"] @@ -68,9 +68,9 @@ "start" ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","ul"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text"," "], @@ -128,16 +128,16 @@ ["keyword","#end"] ],[ "start", - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "js-start", - ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.script","script"], - ["punctuation.meta.tag.end.script",">"] + ["meta.tag.punctuation.end",">"] ],[ "js-comment_regex_allowed", ["text"," "], @@ -216,16 +216,16 @@ ["paren.rparen","}"] ],[ "start", - ["punctuation.meta.tag.begin.script",""] + ["meta.tag.punctuation.end",">"] ],[ "start" ],[ "css-start", - ["punctuation.meta.tag.begin.style","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name.style","style"], - ["punctuation.meta.tag.end.style",">"] + ["meta.tag.punctuation.end",">"] ],[ ["css-comment","css-start"], ["text"," "], @@ -275,7 +275,7 @@ ["paren.rparen","}"] ],[ "start", - ["punctuation.meta.tag.begin.style",""] + ["meta.tag.punctuation.end",">"] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_xml.json b/lib/ace/mode/_test/tokens_xml.json index 40c67a5d..70f73093 100644 --- a/lib/ace/mode/_test/tokens_xml.json +++ b/lib/ace/mode/_test/tokens_xml.json @@ -1,36 +1,36 @@ [[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","Juhu"], - ["punctuation.meta.tag.end",">"], + ["meta.tag.punctuation.end",">"], ["text","//Juhu Kinners"], - ["punctuation.meta.tag.begin",""] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","test: two tags in the same lines should be in separate tokens\""] ],[ "start", - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","Juhu"], - ["punctuation.meta.tag.end",">"], - ["punctuation.meta.tag.begin","<"], + ["meta.tag.punctuation.end",">"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","Kinners"], - ["punctuation.meta.tag.end",">"] + ["meta.tag.punctuation.end",">"] ],[ "start", ["text","test: multiline attributes\""] ],[ - ["qqstring_inner","punctuation.meta.tag.begin"], - ["punctuation.meta.tag.begin","<"], + ["qqstring_inner","meta.tag.punctuation.begin"], + ["meta.tag.punctuation.begin","<"], ["meta.tag.name","copy"], ["text"," "], ["entity.other.attribute-name","set"], ["keyword.operator.separator","="], ["string","\"{"] ],[ - ["qqstring_inner","punctuation.meta.tag.begin"], + ["qqstring_inner","meta.tag.punctuation.begin"], ["string","}\""], ["text"," "], ["entity.other.attribute-name","undo"], @@ -39,5 +39,5 @@ ],[ "start", ["string","}\""], - ["punctuation.meta.tag.end","/>"] + ["meta.tag.punctuation.end","/>"] ]] \ No newline at end of file diff --git a/lib/ace/mode/folding/xml.js b/lib/ace/mode/folding/xml.js index 61d103f1..5e8e4b9a 100644 --- a/lib/ace/mode/folding/xml.js +++ b/lib/ace/mode/folding/xml.js @@ -68,7 +68,7 @@ oop.inherits(FoldMode, BaseFoldMode); var value = ""; for (var i = 0; i < tokens.length; i++) { var token = tokens[i]; - if (token.type.indexOf("meta.tag") !== -1) + if (token.type.lastIndexOf("meta.tag", 0) === 0) value += token.value; else value += lang.stringRepeat(" ", token.value.length); @@ -105,7 +105,7 @@ oop.inherits(FoldMode, BaseFoldMode); var start; do { - if (token.type.indexOf("meta.tag") !== -1) { + if (token.type.lastIndexOf("meta.tag", 0) === 0) { if (!start) { var start = { row: iterator.getCurrentTokenRow(), @@ -138,7 +138,7 @@ oop.inherits(FoldMode, BaseFoldMode); var end; do { - if (token.type.indexOf("meta.tag") !== -1) { + if (token.type.lastIndexOf("meta.tag", 0) === 0) { if (!end) { end = { row: iterator.getCurrentTokenRow(), diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index fdd7ec6e..96e666b0 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -85,7 +85,7 @@ var HtmlHighlightRules = function() { tag: [{ token : function(start, tag) { var group = tagMap[tag]; - return ["punctuation.meta.tag.begin", + return ["meta.tag.punctuation.begin", "meta.tag.name" + (group ? "." + group : "")]; }, regex : "(<)([-_a-zA-Z0-9:]+)", @@ -93,7 +93,7 @@ var HtmlHighlightRules = function() { }, { token : function(start, tag) { var group = tagMap[tag]; - return ["punctuation.meta.tag.begin", + return ["meta.tag.punctuation.begin", "meta.tag.name" + (group ? "." + group : "")]; }, regex : "(", next : "start"} + {token : "meta.tag.punctuation.end", regex : "/?>", next : "start"} ], end_tag_stuff: [ {include : "space"}, - {token : "punctuation.meta.tag.end", regex : ">", next : "start"} + {token : "meta.tag.punctuation.end", regex : ">", next : "start"} ] }); diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index d194b8e7..ad31c8e2 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -107,18 +107,18 @@ var XmlHighlightRules = function(normalize) { ], tag : [{ - token : ["punctuation.meta.tag.begin", "meta.tag.name"], + token : ["meta.tag.punctuation.begin", "meta.tag.name"], regex : "(<)((?:[-_a-zA-Z0-9]+:)?[-_a-zA-Z0-9]+)", next: [ {include : "attributes"}, - {token : "punctuation.meta.tag.end", regex : "/?>", next : "start"} + {token : "meta.tag.punctuation.end", regex : "/?>", next : "start"} ] }, { - token : ["punctuation.meta.tag.begin", "meta.tag.name"], + token : ["meta.tag.punctuation.begin", "meta.tag.name"], regex : "(", next : "start"} + {token : "meta.tag.punctuation.end", regex : ">", next : "start"} ] }], @@ -177,18 +177,18 @@ var XmlHighlightRules = function(normalize) { this.embedTagRules = function(HighlightRules, prefix, tag){ this.$rules.tag.unshift({ - token : ["punctuation.meta.tag.begin." + tag, "meta.tag.name." + tag], + token : ["meta.tag.punctuation.begin", "meta.tag.name." + tag], regex : "(<)(" + tag + ")", next: [ {include : "space"}, {include : "attributes"}, - {token : "punctuation.meta.tag.end." + tag, regex : "/?>", next : prefix + "start"} + {token : "meta.tag.punctuation.end", regex : "/?>", next : prefix + "start"} ] }); this.$rules[tag + "-end"] = [ {include : "space"}, - {token : "punctuation.meta.tag.end." + tag, regex : ">", next: "start", + {token : "meta.tag.punctuation.end", regex : ">", next: "start", onMatch : function(value, currentState, stack) { stack.splice(0); return this.token; @@ -196,7 +196,7 @@ var XmlHighlightRules = function(normalize) { ] this.embedRules(HighlightRules, prefix, [{ - token: ["punctuation.meta.tag.begin." + tag, "meta.tag.name." + tag], + token: ["meta.tag.punctuation.begin", "meta.tag.name." + tag], regex : "(