Skip to content

Commit de95729

Browse files
aeschliaeschli
committed
[ts] upate grammar, remove meta scopes
1 parent d34c873 commit de95729

21 files changed

Lines changed: 19050 additions & 6740 deletions

‎extensions/html/test/colorize-results/test_html.json‎

Lines changed: 357 additions & 49 deletions
Large diffs are not rendered by default.

‎extensions/jade/test/colorize-results/test_jade.json‎

Lines changed: 198 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
},
156156
{
157157
"c": "100",
158-
"t": "attribute_value.constant.js.meta.numeric.other.tag",
158+
"t": "attribute_value.constant.decimal.js.meta.numeric.other.tag",
159159
"r": {
160160
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
161161
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@@ -177,7 +177,7 @@
177177
},
178178
{
179179
"c": "2",
180-
"t": "attribute_value.constant.js.meta.numeric.other.tag",
180+
"t": "attribute_value.constant.decimal.js.meta.numeric.other.tag",
181181
"r": {
182182
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
183183
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@@ -297,7 +297,7 @@
297297
}
298298
},
299299
{
300-
"c": " maintainer.twitter",
300+
"c": " ",
301301
"t": "js.source",
302302
"r": {
303303
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -307,6 +307,39 @@
307307
"hc_black": ".hc-black .token rgb(255, 255, 255)"
308308
}
309309
},
310+
{
311+
"c": "maintainer",
312+
"t": "js.object.other.source.variable",
313+
"r": {
314+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
315+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
316+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
317+
"light_vs": ".vs .token rgb(0, 0, 0)",
318+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
319+
}
320+
},
321+
{
322+
"c": ".",
323+
"t": "accessor.js.punctuation.source",
324+
"r": {
325+
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
326+
"light_plus": ".vs .token rgb(0, 0, 0)",
327+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
328+
"light_vs": ".vs .token rgb(0, 0, 0)",
329+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
330+
}
331+
},
332+
{
333+
"c": "twitter",
334+
"t": "js.other.property.source.variable",
335+
"r": {
336+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
337+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
338+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
339+
"light_vs": ".vs .token rgb(0, 0, 0)",
340+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
341+
}
342+
},
310343
{
311344
"c": " ",
312345
"t": "",
@@ -419,7 +452,7 @@
419452
},
420453
{
421454
"c": "100",
422-
"t": "attribute_value.constant.js.meta.numeric.other.tag",
455+
"t": "attribute_value.constant.decimal.js.meta.numeric.other.tag",
423456
"r": {
424457
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
425458
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@@ -441,7 +474,7 @@
441474
},
442475
{
443476
"c": "2",
444-
"t": "attribute_value.constant.js.meta.numeric.other.tag",
477+
"t": "attribute_value.constant.decimal.js.meta.numeric.other.tag",
445478
"r": {
446479
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.meta.tag rgb(128, 128, 128)",
447480
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.meta.tag rgb(128, 0, 0)",
@@ -561,7 +594,7 @@
561594
}
562595
},
563596
{
564-
"c": " maintainer.blog",
597+
"c": " ",
565598
"t": "js.source",
566599
"r": {
567600
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -572,8 +605,19 @@
572605
}
573606
},
574607
{
575-
"c": "-",
576-
"t": "js.source",
608+
"c": "maintainer",
609+
"t": "js.object.other.source.variable",
610+
"r": {
611+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
612+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
613+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
614+
"light_vs": ".vs .token rgb(0, 0, 0)",
615+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
616+
}
617+
},
618+
{
619+
"c": ".",
620+
"t": "accessor.js.punctuation.source",
577621
"r": {
578622
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
579623
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -583,8 +627,19 @@
583627
}
584628
},
585629
{
586-
"c": " ",
587-
"t": "expr.js.meta.source.var",
630+
"c": "blog",
631+
"t": "js.other.property.source.variable",
632+
"r": {
633+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
634+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
635+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
636+
"light_vs": ".vs .token rgb(0, 0, 0)",
637+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
638+
}
639+
},
640+
{
641+
"c": "- ",
642+
"t": "js.source",
588643
"r": {
589644
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
590645
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -617,7 +672,7 @@
617672
},
618673
{
619674
"c": "user",
620-
"t": "expr.js.meta.source.var.var-single-variable.variable",
675+
"t": "expr.js.meta.other.readwrite.source.var.var-single-variable.variable",
621676
"r": {
622677
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
623678
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
@@ -627,7 +682,7 @@
627682
}
628683
},
629684
{
630-
"c": " = ",
685+
"c": " ",
631686
"t": "expr.js.meta.source.var.var-single-variable",
632687
"r": {
633688
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -637,9 +692,31 @@
637692
"hc_black": ".hc-black .token rgb(255, 255, 255)"
638693
}
639694
},
695+
{
696+
"c": "=",
697+
"t": "assignment.expr.js.keyword.meta.operator.source.var",
698+
"r": {
699+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.keyword.operator rgb(212, 212, 212)",
700+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.keyword.operator rgb(0, 0, 0)",
701+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.keyword.operator rgb(212, 212, 212)",
702+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.keyword.operator rgb(0, 0, 0)",
703+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.keyword.operator rgb(212, 212, 212)"
704+
}
705+
},
706+
{
707+
"c": " ",
708+
"t": "expr.js.meta.source.var",
709+
"r": {
710+
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
711+
"light_plus": ".vs .token rgb(0, 0, 0)",
712+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
713+
"light_vs": ".vs .token rgb(0, 0, 0)",
714+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
715+
}
716+
},
640717
{
641718
"c": "{",
642-
"t": "block.brace.curly.expr.js.meta.source.var.var-single-variable",
719+
"t": "block.definition.expr.js.meta.object-literal.punctuation.source.var",
643720
"r": {
644721
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
645722
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -650,7 +727,7 @@
650727
},
651728
{
652729
"c": " ",
653-
"t": "block.expr.js.meta.source.var.var-single-variable",
730+
"t": "expr.js.meta.object-literal.source.var",
654731
"r": {
655732
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
656733
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -660,8 +737,8 @@
660737
}
661738
},
662739
{
663-
"c": "name: ",
664-
"t": "block.expr.js.member.meta.object.source.var.var-single-variable",
740+
"c": "name",
741+
"t": "expr.js.key.member.meta.object.object-literal.source.var",
665742
"r": {
666743
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
667744
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -671,8 +748,52 @@
671748
}
672749
},
673750
{
674-
"c": "'John'",
675-
"t": "block.expr.js.member.meta.object.single.source.string.var.var-single-variable",
751+
"c": ":",
752+
"t": "expr.js.key.key-value.member.meta.object.object-literal.punctuation.separator.source.var",
753+
"r": {
754+
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
755+
"light_plus": ".vs .token rgb(0, 0, 0)",
756+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
757+
"light_vs": ".vs .token rgb(0, 0, 0)",
758+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
759+
}
760+
},
761+
{
762+
"c": " ",
763+
"t": "expr.js.member.meta.object.object-literal.source.var",
764+
"r": {
765+
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
766+
"light_plus": ".vs .token rgb(0, 0, 0)",
767+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
768+
"light_vs": ".vs .token rgb(0, 0, 0)",
769+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
770+
}
771+
},
772+
{
773+
"c": "'",
774+
"t": "begin.definition.expr.js.member.meta.object.object-literal.punctuation.quoted.single.source.string.var",
775+
"r": {
776+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
777+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
778+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
779+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string rgb(163, 21, 21)",
780+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
781+
}
782+
},
783+
{
784+
"c": "John",
785+
"t": "expr.js.member.meta.object.object-literal.quoted.single.source.string.var",
786+
"r": {
787+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
788+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
789+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
790+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string rgb(163, 21, 21)",
791+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
792+
}
793+
},
794+
{
795+
"c": "'",
796+
"t": "definition.end.expr.js.member.meta.object.object-literal.punctuation.quoted.single.source.string.var",
676797
"r": {
677798
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
678799
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string rgb(163, 21, 21)",
@@ -683,7 +804,7 @@
683804
},
684805
{
685806
"c": " ",
686-
"t": "block.expr.js.member.meta.object.source.var.var-single-variable",
807+
"t": "expr.js.member.meta.object.object-literal.source.var",
687808
"r": {
688809
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
689810
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -694,7 +815,7 @@
694815
},
695816
{
696817
"c": "}",
697-
"t": "block.brace.curly.expr.js.meta.source.var.var-single-variable",
818+
"t": "block.definition.expr.js.meta.object-literal.punctuation.source.var",
698819
"r": {
699820
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
700821
"light_plus": ".vs .token rgb(0, 0, 0)",
@@ -715,7 +836,7 @@
715836
}
716837
},
717838
{
718-
"c": " user",
839+
"c": " ",
719840
"t": "control.flow.jade.meta",
720841
"r": {
721842
"dark_plus": ".vs-dark .token rgb(212, 212, 212)",
@@ -725,6 +846,17 @@
725846
"hc_black": ".hc-black .token rgb(255, 255, 255)"
726847
}
727848
},
849+
{
850+
"c": "user",
851+
"t": "control.flow.jade.js.meta.other.readwrite.variable",
852+
"r": {
853+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
854+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.variable rgb(0, 16, 128)",
855+
"dark_vs": ".vs-dark .token rgb(212, 212, 212)",
856+
"light_vs": ".vs .token rgb(0, 0, 0)",
857+
"hc_black": ".hc-black .token rgb(255, 255, 255)"
858+
}
859+
},
728860
{
729861
"c": " ",
730862
"t": "",
@@ -814,7 +946,51 @@
814946
}
815947
},
816948
{
817-
"c": "#{user.name}",
949+
"c": "#{",
950+
"t": "block.interpolated.jade.string.text",
951+
"r": {
952+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
953+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.jade rgb(0, 0, 255)",
954+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
955+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string.jade rgb(0, 0, 255)",
956+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
957+
}
958+
},
959+
{
960+
"c": "user",
961+
"t": "block.interpolated.jade.js.object.other.string.text.variable",
962+
"r": {
963+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
964+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.jade rgb(0, 0, 255)",
965+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
966+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string.jade rgb(0, 0, 255)",
967+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
968+
}
969+
},
970+
{
971+
"c": ".",
972+
"t": "accessor.block.interpolated.jade.js.punctuation.string.text",
973+
"r": {
974+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",
975+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.jade rgb(0, 0, 255)",
976+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
977+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string.jade rgb(0, 0, 255)",
978+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
979+
}
980+
},
981+
{
982+
"c": "name",
983+
"t": "block.dom.interpolated.jade.js.property.string.support.text.variable",
984+
"r": {
985+
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.variable rgb(156, 220, 254)",
986+
"light_plus": ".vs.vscode-theme-defaults-themes-light_plus-json .token.string.jade rgb(0, 0, 255)",
987+
"dark_vs": ".vs-dark.vscode-theme-defaults-themes-dark_vs-json .token.string rgb(206, 145, 120)",
988+
"light_vs": ".vs.vscode-theme-defaults-themes-light_vs-json .token.string.jade rgb(0, 0, 255)",
989+
"hc_black": ".hc-black.vscode-theme-defaults-themes-hc_black-json .token.string rgb(206, 145, 120)"
990+
}
991+
},
992+
{
993+
"c": "}",
818994
"t": "block.interpolated.jade.string.text",
819995
"r": {
820996
"dark_plus": ".vs-dark.vscode-theme-defaults-themes-dark_plus-json .token.string rgb(206, 145, 120)",

0 commit comments

Comments
 (0)