diff --git a/lib/ace/mode/_test/tokens_coldfusion.json b/lib/ace/mode/_test/tokens_coldfusion.json index e636d3cf..1f38507a 100644 --- a/lib/ace/mode/_test/tokens_coldfusion.json +++ b/lib/ace/mode/_test/tokens_coldfusion.json @@ -4,23 +4,31 @@ ],[ "start" ],[ - "start", - ["meta.tag","<"], - ["meta.tag.tag-name","cfset"], - ["text"," "], - ["entity.other.attribute-name","welcome"], - ["keyword.operator","="], - ["string","\"Hello World!\""], - ["meta.tag.r",">"] + "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","cfoutput"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","cfset"], + ["text"," "], + ["entity.other.attribute-name","welcome"], + ["keyword.operator.separator","="], + ["string","\"Hello World!\""], + ["punctuation.meta.tag.end",">"] +],[ + "start" +],[ + "start" +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","cfoutput"], + ["punctuation.meta.tag.end",">"], ["text","#welcome#"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_css.json b/lib/ace/mode/_test/tokens_css.json index 244f0a03..e1a7ba05 100644 --- a/lib/ace/mode/_test/tokens_css.json +++ b/lib/ace/mode/_test/tokens_css.json @@ -76,13 +76,13 @@ "media", ["string","@keyframes blink {"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["constant","0"], ["text","% "], ["paren.lparen","{"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["support.type","opacity"], ["text",": "], @@ -93,13 +93,13 @@ ["text"," "], ["paren.rparen","}"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["constant","40"], ["text","% "], ["paren.lparen","{"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["support.type","opacity"], ["text",": "], @@ -110,14 +110,14 @@ ["text"," "], ["paren.rparen","}"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["constant","40"], ["variable",".5"], ["text","% "], ["paren.lparen","{"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["support.type","opacity"], ["text",": "], @@ -127,13 +127,13 @@ ["text"," "], ["paren.rparen","}"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["constant","100"], ["text","% "], ["paren.lparen","{"] ],[ - "media_ruleset", + ["ruleset","media"], ["text"," "], ["support.type","opacity"], ["text",": "], diff --git a/lib/ace/mode/_test/tokens_curly.json b/lib/ace/mode/_test/tokens_curly.json index 14144479..87e39d42 100644 --- a/lib/ace/mode/_test/tokens_curly.json +++ b/lib/ace/mode/_test/tokens_curly.json @@ -9,48 +9,48 @@ ["text","tokenize embedded script"] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name.script","script"], + ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","a"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","'a'"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end.script",">"], ["storage.type","var"], - ["meta.tag",""], + ["punctuation.meta.tag.begin.script",""], ["text","'123'"] ],[ "start", ["text","tokenize multiline attribute value with double quotes"] ],[ - "tag_qqstring", - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["qqstring_inner","start_tag_stuff"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"abc{{xyz}}"] ],[ "start", ["string","def\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text","tokenize multiline attribute value with single quotes"] ],[ - "tag_qstring", - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["qstring_inner","start_tag_stuff"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","'abc"] ],[ "start", ["string","def\\\"'"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.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 19773674..4a1ee640 100644 --- a/lib/ace/mode/_test/tokens_ftl.json +++ b/lib/ace/mode/_test/tokens_ftl.json @@ -28,13 +28,13 @@ ["text"," "], ["keyword","/>"] ],[ - "comment", + "ftl-dcomment", ["comment","<#--"] ],[ - "comment", + "ftl-dcomment", ["comment"," FreeMarker comment"] ],[ - "comment", + "ftl-dcomment", ["comment"," ${abc} <#assign a=12 />"] ],[ "start", @@ -43,100 +43,103 @@ "start" ],[ "start", - ["xml-pe",""] + ["punctuation.doctype.begin",""] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","html"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","html"], ["text"," "], ["entity.other.attribute-name","lang"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"en-us\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","head"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","head"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","meta"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","meta"], ["text"," "], ["entity.other.attribute-name","charset"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"utf-8\""], ["text"," "], - ["meta.tag.r","/>"] + ["punctuation.meta.tag.end","/>"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","title"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","title"], + ["punctuation.meta.tag.end",">"], ["string.interpolated","${"], ["variable","title"], ["keyword.operator","!"], ["string","\"FreeMarker\""], ["string.interpolated","}"], - ["meta.tag","<"], - ["meta.tag.tag-name","title"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","title"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","body"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","body"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","h1"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h1"], + ["punctuation.meta.tag.end",">"], ["text","Hello "], ["string.interpolated","${"], ["variable","name"], ["keyword.operator","!"], ["string","\"\""], ["string.interpolated","}"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","Today is: "], ["string.interpolated","${"], ["language.variable",".now"], ["support.function","?date"], ["string.interpolated","}"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "] @@ -182,9 +185,9 @@ ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","ul"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","ul"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], @@ -199,9 +202,9 @@ ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","li"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","li"], + ["punctuation.meta.tag.end",">"], ["string.interpolated","${"], ["variable","item_index"], ["string.interpolated","}"], @@ -219,9 +222,9 @@ ["constant.numeric","0"], ["paren.rparen","]"], ["string.interpolated","}"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "], @@ -230,9 +233,9 @@ ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "] @@ -306,32 +309,32 @@ ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.image","img"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.image","img"], ["text"," "], ["entity.other.attribute-name","src"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"images/"], ["string.interpolated","${"], ["variable","user.id"], ["string.interpolated","}"], ["string",".png\""], ["text"," "], - ["meta.tag.r","/>"] + ["punctuation.meta.tag.end","/>"] ],[ "start", ["text"," "] ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "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 726c704f..970ff7d1 100644 --- a/lib/ace/mode/_test/tokens_html.json +++ b/lib/ace/mode/_test/tokens_html.json @@ -1,51 +1,51 @@ [[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","html"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","html"], + ["punctuation.meta.tag.end",">"] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name.script","script"], + ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","a"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","'a'"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end.script",">"], ["storage.type","var"], - ["meta.tag",""], + ["punctuation.meta.tag.begin.script",""], ["text","'123'"] ],[ - "tag_qqstring", - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["qqstring_inner","start_tag_stuff"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"abc"] ],[ "start", ["string"," def\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ - "tag_qstring", - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["qstring_inner","start_tag_stuff"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","'abc"] ],[ "start", ["string","def\\'"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_jsp.json b/lib/ace/mode/_test/tokens_jsp.json index b57e5d12..2975fc59 100644 --- a/lib/ace/mode/_test/tokens_jsp.json +++ b/lib/ace/mode/_test/tokens_jsp.json @@ -1,19 +1,19 @@ [[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","html"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","html"], + ["punctuation.meta.tag.end",">"] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","body"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","body"], + ["punctuation.meta.tag.end",">"] ],[ "js-start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.script","script"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.name.script","script"], + ["punctuation.meta.tag.end.script",">"] ],[ "js-start", ["text"," "], @@ -40,23 +40,23 @@ ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin.script",""] ],[ "css-start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.style","style"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin.style","<"], + ["meta.tag.name.style","style"], + ["punctuation.meta.tag.end.style",">"] ],[ - "css-ruleset", + ["css-ruleset","css-start"], ["text"," "], ["variable",".class"], ["text"," "], ["paren.lparen","{"] ],[ - "css-ruleset", + ["css-ruleset","css-start"], ["text"," "], ["support.type","background"], ["text",": "], @@ -69,17 +69,17 @@ ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin.style",""] ],[ "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," Today's date: "], @@ -104,9 +104,9 @@ ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "], @@ -164,155 +164,155 @@ ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["text","Select Languages:"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","form"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","form"], ["text"," "], ["entity.other.attribute-name","ACTION"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"jspCheckBox.jsp\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"checkbox\""], ["text"," "], ["entity.other.attribute-name","name"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"id\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"Java\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["text"," Java"], - ["meta.tag","<"], - ["meta.tag.tag-name","BR"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","BR"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"checkbox\""], ["text"," "], ["entity.other.attribute-name","name"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"id\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\".NET\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["text"," .NET"], - ["meta.tag","<"], - ["meta.tag.tag-name","BR"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","BR"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"checkbox\""], ["text"," "], ["entity.other.attribute-name","name"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"id\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"PHP\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["text"," PHP"], - ["meta.tag","<"], - ["meta.tag.tag-name","BR"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","BR"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"checkbox\""], ["text"," "], ["entity.other.attribute-name","name"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"id\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"C/C++\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["text"," C/C++"], - ["meta.tag","<"], - ["meta.tag.tag-name","BR"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","BR"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"checkbox\""], ["text"," "], ["entity.other.attribute-name","name"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"id\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"PERL\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["text"," PERL "], - ["meta.tag","<"], - ["meta.tag.tag-name","BR"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","BR"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name.form","input"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.form","input"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"submit\""], ["text"," "], ["entity.other.attribute-name","value"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"Submit\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ @@ -424,12 +424,12 @@ ["meta.tag","%>"] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ]] \ 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 c218b08e..bd5b085c 100644 --- a/lib/ace/mode/_test/tokens_liquid.json +++ b/lib/ace/mode/_test/tokens_liquid.json @@ -3,51 +3,83 @@ ["text","The following examples can be found in full at http://liquidmarkup.org/"] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text","Liquid is an extraction from the e-commerce system Shopify."] +],[ + "start" ],[ "start", ["text","Shopify powers many thousands of e-commerce stores which all call for unique designs."] +],[ + "start" ],[ "start", ["text","For this we developed Liquid which allows our customers complete design freedom while"] +],[ + "start" ],[ "start", ["text","maintaining the integrity of our servers."] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text","Liquid has been in production use since June 2006 and is now used by many other"] +],[ + "start" ],[ "start", ["text","hosted web applications."] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text","It was developed for usage in Ruby on Rails web applications and integrates seamlessly"] +],[ + "start" ],[ "start", ["text","as a plugin but it also works excellently as a stand alone library."] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text","Here's what it looks like:"] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","ul"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","ul"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"products\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], @@ -62,18 +94,22 @@ ["identifier","products"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","li"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","li"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["variable","{{"], ["text"," "], ["identifier","product"], @@ -81,9 +117,11 @@ ["identifier","title"], ["text"," "], ["variable","}}"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text"," Only "], @@ -98,12 +136,16 @@ ["variable","}}"] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["variable","{{"], ["text"," "], ["identifier","product"], @@ -117,17 +159,23 @@ ["constant.numeric","200"], ["text"," "], ["variable","}}"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" ],[ "start" ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text"," "], @@ -136,12 +184,20 @@ ["keyword","endfor"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ @@ -152,19 +208,25 @@ ],[ "start" ],[ - "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], - ["text","Filters"], - ["meta.tag",""] + "start" +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], + ["text","Filters"], + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text"," The word \"tobi\" in uppercase: "], ["variable","{{"], ["text"," "], @@ -174,14 +236,16 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","The word \"tobi\" has "], ["variable","{{"], ["text"," "], @@ -191,14 +255,16 @@ ["text"," "], ["variable","}}"], ["text"," letters! "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","Change \"Hello world\" to \"Hi world\": "], ["variable","{{"], ["text"," "], @@ -212,14 +278,16 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","The date today is "], ["variable","{{"], ["text"," "], @@ -231,27 +299,37 @@ ["text"," "], ["variable","}}"], ["text"," "], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["text","If"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], @@ -279,9 +357,13 @@ ["text"," "], ["variable","%}"], ["text"," "] +],[ + "start" ],[ "start", ["text"," hi marc or tobi"] +],[ + "start" ],[ "start", ["text"," "], @@ -290,29 +372,41 @@ ["keyword","endif"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["text","Case"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], @@ -323,6 +417,8 @@ ["identifier","template"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], @@ -333,9 +429,13 @@ ["string","'index'"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," Welcome"] +],[ + "start" ],[ "start", ["text"," "], @@ -346,6 +446,8 @@ ["string","'product'"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], @@ -366,6 +468,8 @@ ["identifier","title"], ["text"," "], ["variable","}}"] +],[ + "start" ],[ "start", ["text"," "], @@ -374,6 +478,8 @@ ["keyword","else"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], @@ -382,6 +488,8 @@ ["identifier","page_title"], ["text"," "], ["variable","}}"] +],[ + "start" ],[ "start", ["text"," "], @@ -390,29 +498,41 @@ ["keyword","endcase"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["text","For Loops"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], @@ -428,6 +548,8 @@ ["text"," "], ["variable","%}"], ["text"," "] +],[ + "start" ],[ "start", ["text"," "], @@ -436,6 +558,8 @@ ["identifier","item"], ["text"," "], ["variable","}}"] +],[ + "start" ],[ "start", ["text"," "], @@ -444,29 +568,41 @@ ["keyword","endfor"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], ["text","Tables"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], @@ -485,6 +621,8 @@ ["constant.numeric","3"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], @@ -497,6 +635,8 @@ ["identifier","col_first"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," First column: "], @@ -507,6 +647,8 @@ ["identifier","variable"], ["text"," "], ["variable","}}"] +],[ + "start" ],[ "start", ["text"," "], @@ -515,6 +657,8 @@ ["keyword","else"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," Different column: "], @@ -525,6 +669,8 @@ ["identifier","variable"], ["text"," "], ["variable","}}"] +],[ + "start" ],[ "start", ["text"," "], @@ -533,6 +679,8 @@ ["keyword","endif"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", ["text"," "], @@ -541,11 +689,15 @@ ["keyword","endtablerow"], ["text"," "], ["variable","%}"] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "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 d63f30e9..a460be29 100644 --- a/lib/ace/mode/_test/tokens_luapage.json +++ b/lib/ace/mode/_test/tokens_luapage.json @@ -1,68 +1,81 @@ [[ - "tag_embed_attribute_list", + "doctype", ["text",""], - ["meta.tag","<"], - ["text","!"], - ["entity.other.attribute-name","DOCTYPE"], - ["text"," "], - ["entity.other.attribute-name","html"], - ["text"," "], - ["entity.other.attribute-name","PUBLIC"], - ["text"," "], + ["punctuation.doctype.begin",""] + ["punctuation.doctype.end",">"] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","html"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","html"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ ["lua-bracketedComment",4,"lua-start"], ["keyword","<%"], ["text"," "], ["comment","--[[--"] +],[ + ["lua-bracketedComment",4,"lua-start"] ],[ ["lua-bracketedComment",4,"lua-start"], ["comment"," index.lp from the Kepler Project's LuaDoc HTML doclet."] +],[ + ["lua-bracketedComment",4,"lua-start"] ],[ ["lua-bracketedComment",4,"lua-start"], ["comment"," http://keplerproject.github.com/luadoc/"] +],[ + ["lua-bracketedComment",4,"lua-start"] ],[ "start", ["comment","--]]"], ["text"," "], ["keyword","%>"] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","head"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","head"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","title"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","title"], + ["punctuation.meta.tag.end",">"], ["text","Reference"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","link"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","link"], ["text"," "], ["entity.other.attribute-name","rel"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"stylesheet\""], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\""], ["keyword","<%="], ["identifier","luadoc"], @@ -76,123 +89,161 @@ ["string","\"luadoc.css\""], ["paren.rparen",")"], ["keyword","%>"], - ["text","\" type=\"text/css\" />"] + ["string","\""], + ["text"," "], + ["entity.other.attribute-name","type"], + ["keyword.operator.separator","="], + ["string","\"text/css\""], + ["text"," "], + ["punctuation.meta.tag.end","/>"] +],[ + "start" ],[ "start", ["text","\t"], ["comment",""] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","body"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","body"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"container\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" +],[ + "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"product\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"product_logo\""], - ["meta.tag.r",">"], - ["meta.tag",""] + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"product_name\""], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name","big"], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name","b"], - ["meta.tag.r",">"], - ["meta.tag",""], - ["meta.tag",""], - ["meta.tag",""] + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","big"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","b"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin",""], + ["punctuation.meta.tag.begin",""], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"product_description\""], - ["meta.tag.r",">"], - ["meta.tag",""] + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""] ],[ "start" ],[ - "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], - ["text"," "], - ["entity.other.attribute-name","id"], - ["keyword.operator","="], - ["string","\"main\""], - ["meta.tag.r",">"] + "start" ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], + ["string","\"main\""], + ["punctuation.meta.tag.end",">"] +],[ + "start" +],[ + "start" +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], + ["text"," "], + ["entity.other.attribute-name","id"], + ["keyword.operator.separator","="], ["string","\"navigation\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["keyword","<%="], @@ -216,24 +267,38 @@ ["keyword","%>"] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"content\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start" ],[ @@ -261,26 +326,34 @@ ["text"," "], ["keyword","then%>"] ],[ - "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], - ["text","Modules"], - ["meta.tag",""] + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name.table","table"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], + ["text","Modules"], + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","table"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"module_list\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["comment",""] +],[ + "start" ],[ "start", ["keyword","<%for"], @@ -299,27 +372,31 @@ ["paren.rparen",")"], ["text"," "], ["keyword","do%>"] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","tr"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","tr"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text","\t\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","td"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"name\""], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\""], ["keyword","<%="], ["identifier","luadoc"], @@ -335,26 +412,29 @@ ["identifier","doc"], ["paren.rparen",")"], ["keyword","%>"], - ["text","\">"], + ["string","\""], + ["punctuation.meta.tag.end",">"], ["keyword","<%="], ["identifier","modulename"], ["keyword","%>"], - ["meta.tag",""], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","td"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"summary\""], - ["meta.tag.r",">"], + ["punctuation.meta.tag.end",">"], ["keyword","<%="], ["identifier","doc"], ["text","."], @@ -365,23 +445,31 @@ ["text","."], ["identifier","summary"], ["keyword","%>"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["keyword","<%end%>"] +],[ + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["keyword","<%end%>"] @@ -391,6 +479,14 @@ "start" ],[ "start" +],[ + "start" +],[ + "start" +],[ + "start" +],[ + "start" ],[ "start", ["keyword","<%if"], @@ -414,26 +510,34 @@ ["text"," "], ["keyword","then%>"] ],[ - "start", - ["meta.tag","<"], - ["meta.tag.tag-name","h2"], - ["meta.tag.r",">"], - ["text","Files"], - ["meta.tag",""] + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name.table","table"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","h2"], + ["punctuation.meta.tag.end",">"], + ["text","Files"], + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","table"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"file_list\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["comment",""] +],[ + "start" ],[ "start", ["keyword","<%for"], @@ -452,27 +556,31 @@ ["paren.rparen",")"], ["text"," "], ["keyword","do%>"] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","tr"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","tr"], + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text","\t\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","td"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"name\""], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\""], ["keyword","<%="], ["identifier","luadoc"], @@ -486,43 +594,42 @@ ["identifier","filepath"], ["paren.rparen",")"], ["keyword","%>"], - ["text","\">"], + ["string","\""], + ["punctuation.meta.tag.end",">"], ["keyword","<%="], ["identifier","filepath"], ["keyword","%>"], - ["meta.tag",""], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t\t"], - ["meta.tag","<"], - ["meta.tag.tag-name.table","td"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.table","td"], ["text"," "], ["entity.other.attribute-name","class"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"summary\""], - ["meta.tag.r",">"], - ["meta.tag",""] + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ - "start", - ["keyword","<%end%>"] -],[ - "start", - ["meta.tag",""] + "start" ],[ "start", ["keyword","<%end%>"] @@ -530,97 +637,135 @@ "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start", + ["keyword","<%end%>"] +],[ + "start" +],[ + "start" +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","div"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","div"], ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"about\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] +],[ + "start" ],[ "start", ["text","\t"], - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name.anchor","a"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.anchor","a"], ["text"," "], ["entity.other.attribute-name","href"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"http://validator.w3.org/check?uri=referer\""], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name.image","img"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name.image","img"], ["text"," "], ["entity.other.attribute-name","src"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"http://www.w3.org/Icons/valid-xhtml10\""], ["text"," "], ["entity.other.attribute-name","alt"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"Valid XHTML 1.0!\""], ["text"," "], ["entity.other.attribute-name","height"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"31\""], ["text"," "], ["entity.other.attribute-name","width"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"88\""], ["text"," "], - ["meta.tag.r","/>"], - ["meta.tag",""], - ["meta.tag",""] + ["punctuation.meta.tag.end","/>"], + ["punctuation.meta.tag.begin",""], + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""] ],[ "start" +],[ + "start" +],[ + "start" ],[ "start", - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["text"," "], ["comment",""], ["text","\t"] ],[ - "start", - ["meta.tag",""] + "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] +],[ + "start" +],[ + "start", + ["punctuation.meta.tag.begin",""] +],[ + "start" ],[ "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 91f7f992..12b7cde6 100644 --- a/lib/ace/mode/_test/tokens_markdown.json +++ b/lib/ace/mode/_test/tokens_markdown.json @@ -80,13 +80,13 @@ ],[ "start", ["text","in plain text "], - ["meta.tag","<"], - ["meta.tag.tag-name","b"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","b"], + ["punctuation.meta.tag.end",">"], ["text","http://ace.ajaxorg.com"], - ["meta.tag","<"], - ["meta.tag.tag-name","b"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","b"], + ["punctuation.meta.tag.end",">"] ],[ "allowBlock" ],[ diff --git a/lib/ace/mode/_test/tokens_rhtml.json b/lib/ace/mode/_test/tokens_rhtml.json index e3c1fdf1..4aee9702 100644 --- a/lib/ace/mode/_test/tokens_rhtml.json +++ b/lib/ace/mode/_test/tokens_rhtml.json @@ -1,55 +1,55 @@ [[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","html"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","html"], + ["punctuation.meta.tag.end",">"] ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","head"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","head"], + ["punctuation.meta.tag.end",">"] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","title"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","title"], + ["punctuation.meta.tag.end",">"], ["text","Title"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","body"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","body"], + ["punctuation.meta.tag.end",">"] ],[ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","This is an R HTML document. When you click the "], - ["meta.tag","<"], - ["meta.tag.tag-name","b"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","b"], + ["punctuation.meta.tag.end",">"], ["text","Knit HTML"], - ["meta.tag",""], + ["punctuation.meta.tag.begin",""], ["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:"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ @@ -68,13 +68,13 @@ "start" ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","p"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","p"], + ["punctuation.meta.tag.end",">"], ["text","You can also embed plots, for example:"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ @@ -93,14 +93,14 @@ "start" ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "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 efaa0fca..671f2918 100644 --- a/lib/ace/mode/_test/tokens_svg.json +++ b/lib/ace/mode/_test/tokens_svg.json @@ -1,68 +1,65 @@ [[ - "tag_embed_attribute_list", - ["meta.tag","<"], - ["meta.tag.tag-name","svg"] + "punctuation.meta.tag.begin", + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","svg"] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","width"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"800\""], ["text"," "], ["entity.other.attribute-name","height"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"600\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","xmlns"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"http://www.w3.org/2000/svg\""] ],[ "start", ["text"," "], ["entity.other.attribute-name","onload"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"StartAnimation(evt)\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start" ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","title"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","title"], + ["punctuation.meta.tag.end",">"], ["text","Test Tube Progress Bar"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","desc"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","desc"], + ["punctuation.meta.tag.end",">"], ["text","Created for the Web Directions SVG competition"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start" ],[ - "js-start", + "js-no_regex", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","script"], + ["punctuation.meta.tag.begin.script","<"], + ["meta.tag.name.script","script"], ["text"," "], ["entity.other.attribute-name","type"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"text/ecmascript\""], - ["meta.tag.r",">"], - ["keyword.operator",""], + ["string.begin",""], - ["meta.tag",""] + ["string.end","]]>"], + ["punctuation.meta.tag.begin.script",""] ],[ "start" ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","rect"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","rect"] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","fill"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"#2e3436\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","fill-rule"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"nonzero\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","stroke-width"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"3\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","y"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"0\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","x"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"0\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","height"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"600\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","width"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"800\""] ],[ "start", ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"rect3590\""], - ["meta.tag.r","/>"] + ["punctuation.meta.tag.end","/>"] ],[ "start" ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","text"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","text"] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","style"], - ["keyword.operator","="], + ["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\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","x"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","y"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"hickory\""] ],[ "start", ["text"," "], ["entity.other.attribute-name","display"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"none\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," Hickory,"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","text"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","text"] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","style"], - ["keyword.operator","="], + ["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\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","x"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","y"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"dickory\""] ],[ "start", ["text"," "], ["entity.other.attribute-name","display"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"none\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," dickory,"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], - ["meta.tag","<"], - ["meta.tag.tag-name","text"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","text"] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","style"], - ["keyword.operator","="], + ["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\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","x"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"50\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","y"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"350\""] ],[ - "tag_embed_attribute_list", + "punctuation.meta.tag.begin", ["text"," "], ["entity.other.attribute-name","id"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"dock\""] ],[ "start", ["text"," "], ["entity.other.attribute-name","display"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"none\""], - ["meta.tag.r",">"] + ["punctuation.meta.tag.end",">"] ],[ "start", ["text"," dock!"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ]] \ 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 f7c1ed64..40c67a5d 100644 --- a/lib/ace/mode/_test/tokens_xml.json +++ b/lib/ace/mode/_test/tokens_xml.json @@ -1,43 +1,43 @@ [[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","Juhu"], - ["meta.tag.r",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","Juhu"], + ["punctuation.meta.tag.end",">"], ["text","//Juhu Kinners"], - ["meta.tag",""] + ["punctuation.meta.tag.begin",""] ],[ "start", ["text","test: two tags in the same lines should be in separate tokens\""] ],[ "start", - ["meta.tag","<"], - ["meta.tag.tag-name","Juhu"], - ["meta.tag.r",">"], - ["meta.tag","<"], - ["meta.tag.tag-name","Kinners"], - ["meta.tag.r",">"] + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","Juhu"], + ["punctuation.meta.tag.end",">"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","Kinners"], + ["punctuation.meta.tag.end",">"] ],[ "start", ["text","test: multiline attributes\""] ],[ - "tag_qqstring", - ["meta.tag","<"], - ["meta.tag.tag-name","copy"], + ["qqstring_inner","punctuation.meta.tag.begin"], + ["punctuation.meta.tag.begin","<"], + ["meta.tag.name","copy"], ["text"," "], ["entity.other.attribute-name","set"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"{"] ],[ - "tag_qqstring", + ["qqstring_inner","punctuation.meta.tag.begin"], ["string","}\""], ["text"," "], ["entity.other.attribute-name","undo"], - ["keyword.operator","="], + ["keyword.operator.separator","="], ["string","\"{"] ],[ "start", ["string","}\""], - ["meta.tag.r","/>"] + ["punctuation.meta.tag.end","/>"] ]] \ No newline at end of file