Skip to content

Commit a406b85

Browse files
nightwingnightwing
committed
Merge branch 'highlighting/xml'
2 parents e5ce9e7 + ee74fe5 commit a406b85

42 files changed

Lines changed: 1778 additions & 1623 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎demo/kitchen-sink/docs/html.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!DOCTYPE html>
12
<html>
23
<head>
34

‎demo/kitchen-sink/docs/twig.twig‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,30 @@
1-
{% autoescape true %}
2-
{{ var }}
3-
{{ var|raw }} {# var won't be escaped #}
4-
{{ var|escape }} {# var won't be doubled-escaped #}
5-
{% endautoescape %}
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>My Webpage</title>
5+
</head>
6+
<body>
7+
<ul id="navigation">
8+
{% for item in navigation %}
9+
<li><a href="{{ item.href|escape }}">{{ item.caption }}</a></li>
10+
{% endfor %}
11+
</ul>
612

7-
{{ include('twig.html', sandboxed = true) }}
13+
{% if 1 not in [1, 2, 3] %}
814

9-
{{"string #{with} \" escapes" 'another#one' }}
15+
{# is equivalent to #}
16+
{% if not (1 in [1, 2, 3]) %}
17+
18+
{% autoescape true %}
19+
{{ var }}
20+
{{ var|raw }} {# var won't be escaped #}
21+
{{ var|escape }} {# var won't be doubled-escaped #}
22+
{% endautoescape %}
23+
24+
{{ include('twig.html', sandboxed = true) }}
25+
26+
{{"string #{with} \" escapes" 'another#one' }}
27+
<h1>My Webpage</h1>
28+
{{ a_variable }}
29+
</body>
30+
</html>

‎lib/ace/ext/modelist.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var supportedModes = {
6565
Erlang: ["erl|hrl"],
6666
EJS: ["ejs"],
6767
Forth: ["frt|fs|ldr"],
68-
ftl: ["ftl"],
68+
FTL: ["ftl"],
6969
Glsl: ["glsl|frag|vert"],
7070
golang: ["go"],
7171
Groovy: ["groovy"],
@@ -144,7 +144,7 @@ var nameOverrides = {
144144
C_Cpp: "C/C++",
145145
coffee: "CoffeeScript",
146146
HTML_Ruby: "HTML (Ruby)",
147-
ftl: "FreeMarker"
147+
FTL: "FreeMarker"
148148
};
149149
var modesByName = {};
150150
for (var name in supportedModes) {

‎lib/ace/mode/_test/tokens_coldfusion.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
"start"
66
],[
77
"start",
8-
["meta.tag","<"],
9-
["meta.tag.tag-name","cfset"],
8+
["meta.tag.punctuation.begin","<"],
9+
["meta.tag.name","cfset"],
1010
["text"," "],
1111
["entity.other.attribute-name","welcome"],
12-
["keyword.operator","="],
12+
["keyword.operator.separator","="],
1313
["string","\"Hello World!\""],
14-
["meta.tag.r",">"]
14+
["meta.tag.punctuation.end",">"]
1515
],[
1616
"start"
1717
],[
1818
"start",
19-
["meta.tag","<"],
20-
["meta.tag.tag-name","cfoutput"],
21-
["meta.tag.r",">"],
19+
["meta.tag.punctuation.begin","<"],
20+
["meta.tag.name","cfoutput"],
21+
["meta.tag.punctuation.end",">"],
2222
["text","#welcome#"],
23-
["meta.tag","</"],
24-
["meta.tag.tag-name","cfoutput"],
25-
["meta.tag.r",">"]
23+
["meta.tag.punctuation.begin","</"],
24+
["meta.tag.name","cfoutput"],
25+
["meta.tag.punctuation.end",">"]
2626
]]

‎lib/ace/mode/_test/tokens_css.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
"media",
7777
["string","@keyframes blink {"]
7878
],[
79-
"media_ruleset",
79+
["ruleset","media"],
8080
["text"," "],
8181
["constant","0"],
8282
["text","% "],
8383
["paren.lparen","{"]
8484
],[
85-
"media_ruleset",
85+
["ruleset","media"],
8686
["text"," "],
8787
["support.type","opacity"],
8888
["text",": "],
@@ -93,13 +93,13 @@
9393
["text"," "],
9494
["paren.rparen","}"]
9595
],[
96-
"media_ruleset",
96+
["ruleset","media"],
9797
["text"," "],
9898
["constant","40"],
9999
["text","% "],
100100
["paren.lparen","{"]
101101
],[
102-
"media_ruleset",
102+
["ruleset","media"],
103103
["text"," "],
104104
["support.type","opacity"],
105105
["text",": "],
@@ -110,14 +110,14 @@
110110
["text"," "],
111111
["paren.rparen","}"]
112112
],[
113-
"media_ruleset",
113+
["ruleset","media"],
114114
["text"," "],
115115
["constant","40"],
116116
["variable",".5"],
117117
["text","% "],
118118
["paren.lparen","{"]
119119
],[
120-
"media_ruleset",
120+
["ruleset","media"],
121121
["text"," "],
122122
["support.type","opacity"],
123123
["text",": "],
@@ -127,13 +127,13 @@
127127
["text"," "],
128128
["paren.rparen","}"]
129129
],[
130-
"media_ruleset",
130+
["ruleset","media"],
131131
["text"," "],
132132
["constant","100"],
133133
["text","% "],
134134
["paren.lparen","{"]
135135
],[
136-
"media_ruleset",
136+
["ruleset","media"],
137137
["text"," "],
138138
["support.type","opacity"],
139139
["text",": "],

‎lib/ace/mode/_test/tokens_curly.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,48 @@
99
["text","tokenize embedded script"]
1010
],[
1111
"start",
12-
["meta.tag","<"],
13-
["meta.tag.tag-name.script","script"],
12+
["meta.tag.punctuation.begin","<"],
13+
["meta.tag.name.script","script"],
1414
["text"," "],
1515
["entity.other.attribute-name","a"],
16-
["keyword.operator","="],
16+
["keyword.operator.separator","="],
1717
["string","'a'"],
18-
["meta.tag.r",">"],
18+
["meta.tag.punctuation.end",">"],
1919
["storage.type","var"],
20-
["meta.tag","</"],
21-
["meta.tag.tag-name.script","script"],
22-
["meta.tag.r",">"],
20+
["meta.tag.punctuation.begin","</"],
21+
["meta.tag.name.script","script"],
22+
["meta.tag.punctuation.end",">"],
2323
["text","'123'"]
2424
],[
2525
"start",
2626
["text","tokenize multiline attribute value with double quotes"]
2727
],[
28-
"tag_qqstring",
29-
["meta.tag","<"],
30-
["meta.tag.tag-name.anchor","a"],
28+
["qqstring_inner","start_tag_stuff"],
29+
["meta.tag.punctuation.begin","<"],
30+
["meta.tag.name.anchor","a"],
3131
["text"," "],
3232
["entity.other.attribute-name","href"],
33-
["keyword.operator","="],
33+
["keyword.operator.separator","="],
3434
["string","\"abc{{xyz}}"]
3535
],[
3636
"start",
3737
["string","def\""],
38-
["meta.tag.r",">"]
38+
["meta.tag.punctuation.end",">"]
3939
],[
4040
"start",
4141
["text","tokenize multiline attribute value with single quotes"]
4242
],[
43-
"tag_qstring",
44-
["meta.tag","<"],
45-
["meta.tag.tag-name.anchor","a"],
43+
["qstring_inner","start_tag_stuff"],
44+
["meta.tag.punctuation.begin","<"],
45+
["meta.tag.name.anchor","a"],
4646
["text"," "],
4747
["entity.other.attribute-name","href"],
48-
["keyword.operator","="],
48+
["keyword.operator.separator","="],
4949
["string","'abc"]
5050
],[
5151
"start",
5252
["string","def\\\"'"],
53-
["meta.tag.r",">"]
53+
["meta.tag.punctuation.end",">"]
5454
],[
5555
"start"
5656
]]

0 commit comments

Comments
 (0)