Skip to content

Commit 72cb93c

Browse files
aeschliaeschli
committed
[html] update grammar
1 parent 8ae8cd5 commit 72cb93c

2 files changed

Lines changed: 60 additions & 34 deletions

File tree

‎extensions/html/syntaxes/html.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
},
340340
{
341341
"begin": "\\G",
342-
"end": "(?i:(?=/?>|type\\s*=\\s*('|\"|)(?!text/(javascript|ecmascript)|application/((x-)?javascript|ecmascript)|module)\\b))",
342+
"end": "(?i:(?=/?>|type(?=[\\s=])(?!\\s*=\\s*('|\"|)(text/(javascript|ecmascript|babel)|application/((x-)?javascript|ecmascript|babel)|module)[\\s\"'>])))",
343343
"name": "meta.tag.metadata.script.html",
344344
"patterns": [
345345
{
@@ -348,14 +348,17 @@
348348
]
349349
},
350350
{
351-
"begin": "(?=(?i:type\\s*=\\s*('|\"|)(?=text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html))\\b))",
352-
"end": "(<)(?=/(?i:script))",
351+
"begin": "(?=(?i:type\\s*=\\s*('|\"|)(text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>])))",
352+
"end": "((<))(?=/(?i:script))",
353353
"endCaptures": {
354354
"0": {
355355
"name": "meta.tag.metadata.script.html"
356356
},
357357
"1": {
358358
"name": "punctuation.definition.tag.begin.html"
359+
},
360+
"2": {
361+
"name": "text.html.basic"
359362
}
360363
},
361364
"patterns": [
@@ -377,6 +380,7 @@
377380
{
378381
"begin": "(?!\\G)",
379382
"end": "(?=</(?i:script))",
383+
"name": "text.html.basic",
380384
"patterns": [
381385
{
382386
"include": "text.html.basic"
@@ -739,5 +743,5 @@
739743
},
740744
"scopeName": "text.html.basic",
741745
"uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6",
742-
"version": "https://github.com/textmate/html.tmbundle/commit/d66526c5f6b6080358d7bf648654165a4fabf713"
746+
"version": "https://github.com/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93"
743747
}

‎extensions/html/test/colorize-results/25920_html.json‎

Lines changed: 52 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
},
134134
{
135135
"c": "\t",
136-
"t": "text.html.basic meta.embedded.block.html",
136+
"t": "text.html.basic meta.embedded.block.html text.html.basic",
137137
"r": {
138138
"dark_plus": "default: #D4D4D4",
139139
"light_plus": "default: #000000",
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"c": "<",
147-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
147+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
148148
"r": {
149149
"dark_plus": "punctuation.definition.tag: #808080",
150150
"light_plus": "punctuation.definition.tag: #800000",
@@ -155,7 +155,7 @@
155155
},
156156
{
157157
"c": "div",
158-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
158+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
159159
"r": {
160160
"dark_plus": "entity.name.tag: #569CD6",
161161
"light_plus": "entity.name.tag: #800000",
@@ -166,7 +166,7 @@
166166
},
167167
{
168168
"c": " ",
169-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
169+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
170170
"r": {
171171
"dark_plus": "default: #D4D4D4",
172172
"light_plus": "default: #000000",
@@ -177,7 +177,7 @@
177177
},
178178
{
179179
"c": "class",
180-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.other.attribute-name.html",
180+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
181181
"r": {
182182
"dark_plus": "entity.other.attribute-name: #9CDCFE",
183183
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -188,7 +188,7 @@
188188
},
189189
{
190190
"c": "=",
191-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
191+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
192192
"r": {
193193
"dark_plus": "default: #D4D4D4",
194194
"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
199199
},
200200
{
201201
"c": "'",
202-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
202+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
203203
"r": {
204204
"dark_plus": "string: #CE9178",
205205
"light_plus": "string.quoted.single.html: #0000FF",
@@ -210,7 +210,7 @@
210210
},
211211
{
212212
"c": "foo",
213-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html",
213+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
214214
"r": {
215215
"dark_plus": "string: #CE9178",
216216
"light_plus": "string.quoted.single.html: #0000FF",
@@ -221,7 +221,7 @@
221221
},
222222
{
223223
"c": "'",
224-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
224+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
225225
"r": {
226226
"dark_plus": "string: #CE9178",
227227
"light_plus": "string.quoted.single.html: #0000FF",
@@ -232,7 +232,7 @@
232232
},
233233
{
234234
"c": ">",
235-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
235+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
236236
"r": {
237237
"dark_plus": "punctuation.definition.tag: #808080",
238238
"light_plus": "punctuation.definition.tag: #800000",
@@ -243,7 +243,7 @@
243243
},
244244
{
245245
"c": "<",
246-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
246+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
247247
"r": {
248248
"dark_plus": "punctuation.definition.tag: #808080",
249249
"light_plus": "punctuation.definition.tag: #800000",
@@ -254,7 +254,7 @@
254254
},
255255
{
256256
"c": "/",
257-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
257+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
258258
"r": {
259259
"dark_plus": "punctuation.definition.tag: #808080",
260260
"light_plus": "punctuation.definition.tag: #800000",
@@ -265,7 +265,7 @@
265265
},
266266
{
267267
"c": "div",
268-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
268+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
269269
"r": {
270270
"dark_plus": "entity.name.tag: #569CD6",
271271
"light_plus": "entity.name.tag: #800000",
@@ -276,7 +276,7 @@
276276
},
277277
{
278278
"c": ">",
279-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
279+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
280280
"r": {
281281
"dark_plus": "punctuation.definition.tag: #808080",
282282
"light_plus": "punctuation.definition.tag: #800000",
@@ -286,7 +286,18 @@
286286
}
287287
},
288288
{
289-
"c": "</",
289+
"c": "<",
290+
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
291+
"r": {
292+
"dark_plus": "punctuation.definition.tag: #808080",
293+
"light_plus": "punctuation.definition.tag: #800000",
294+
"dark_vs": "punctuation.definition.tag: #808080",
295+
"light_vs": "punctuation.definition.tag: #800000",
296+
"hc_black": "punctuation.definition.tag: #808080"
297+
}
298+
},
299+
{
300+
"c": "/",
290301
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
291302
"r": {
292303
"dark_plus": "punctuation.definition.tag: #808080",
@@ -661,7 +672,7 @@
661672
},
662673
{
663674
"c": "\t",
664-
"t": "text.html.basic meta.embedded.block.html",
675+
"t": "text.html.basic meta.embedded.block.html text.html.basic",
665676
"r": {
666677
"dark_plus": "default: #D4D4D4",
667678
"light_plus": "default: #000000",
@@ -672,7 +683,7 @@
672683
},
673684
{
674685
"c": "<",
675-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
686+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
676687
"r": {
677688
"dark_plus": "punctuation.definition.tag: #808080",
678689
"light_plus": "punctuation.definition.tag: #800000",
@@ -683,7 +694,7 @@
683694
},
684695
{
685696
"c": "div",
686-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
697+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
687698
"r": {
688699
"dark_plus": "entity.name.tag: #569CD6",
689700
"light_plus": "entity.name.tag: #800000",
@@ -694,7 +705,7 @@
694705
},
695706
{
696707
"c": " ",
697-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
708+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
698709
"r": {
699710
"dark_plus": "default: #D4D4D4",
700711
"light_plus": "default: #000000",
@@ -705,7 +716,7 @@
705716
},
706717
{
707718
"c": "class",
708-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.other.attribute-name.html",
719+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.other.attribute-name.html",
709720
"r": {
710721
"dark_plus": "entity.other.attribute-name: #9CDCFE",
711722
"light_plus": "entity.other.attribute-name: #FF0000",
@@ -716,7 +727,7 @@
716727
},
717728
{
718729
"c": "=",
719-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html",
730+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html",
720731
"r": {
721732
"dark_plus": "default: #D4D4D4",
722733
"light_plus": "default: #000000",
@@ -727,7 +738,7 @@
727738
},
728739
{
729740
"c": "'",
730-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
741+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.begin.html",
731742
"r": {
732743
"dark_plus": "string: #CE9178",
733744
"light_plus": "string.quoted.single.html: #0000FF",
@@ -738,7 +749,7 @@
738749
},
739750
{
740751
"c": "foo",
741-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html",
752+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html",
742753
"r": {
743754
"dark_plus": "string: #CE9178",
744755
"light_plus": "string.quoted.single.html: #0000FF",
@@ -749,7 +760,7 @@
749760
},
750761
{
751762
"c": "'",
752-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
763+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html string.quoted.single.html punctuation.definition.string.end.html",
753764
"r": {
754765
"dark_plus": "string: #CE9178",
755766
"light_plus": "string.quoted.single.html: #0000FF",
@@ -760,7 +771,7 @@
760771
},
761772
{
762773
"c": ">",
763-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
774+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
764775
"r": {
765776
"dark_plus": "punctuation.definition.tag: #808080",
766777
"light_plus": "punctuation.definition.tag: #800000",
@@ -771,7 +782,7 @@
771782
},
772783
{
773784
"c": "<",
774-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
785+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html meta.scope.between-tag-pair.html",
775786
"r": {
776787
"dark_plus": "punctuation.definition.tag: #808080",
777788
"light_plus": "punctuation.definition.tag: #800000",
@@ -782,7 +793,7 @@
782793
},
783794
{
784795
"c": "/",
785-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
796+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
786797
"r": {
787798
"dark_plus": "punctuation.definition.tag: #808080",
788799
"light_plus": "punctuation.definition.tag: #800000",
@@ -793,7 +804,7 @@
793804
},
794805
{
795806
"c": "div",
796-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html entity.name.tag.html",
807+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html entity.name.tag.html",
797808
"r": {
798809
"dark_plus": "entity.name.tag: #569CD6",
799810
"light_plus": "entity.name.tag: #800000",
@@ -804,7 +815,7 @@
804815
},
805816
{
806817
"c": ">",
807-
"t": "text.html.basic meta.embedded.block.html meta.tag.any.html punctuation.definition.tag.html",
818+
"t": "text.html.basic meta.embedded.block.html text.html.basic meta.tag.any.html punctuation.definition.tag.html",
808819
"r": {
809820
"dark_plus": "punctuation.definition.tag: #808080",
810821
"light_plus": "punctuation.definition.tag: #800000",
@@ -814,7 +825,18 @@
814825
}
815826
},
816827
{
817-
"c": "</",
828+
"c": "<",
829+
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html text.html.basic",
830+
"r": {
831+
"dark_plus": "punctuation.definition.tag: #808080",
832+
"light_plus": "punctuation.definition.tag: #800000",
833+
"dark_vs": "punctuation.definition.tag: #808080",
834+
"light_vs": "punctuation.definition.tag: #800000",
835+
"hc_black": "punctuation.definition.tag: #808080"
836+
}
837+
},
838+
{
839+
"c": "/",
818840
"t": "text.html.basic meta.embedded.block.html meta.tag.metadata.script.html punctuation.definition.tag.begin.html",
819841
"r": {
820842
"dark_plus": "punctuation.definition.tag: #808080",

0 commit comments

Comments
 (0)