Skip to content

Commit 38c31bc

Browse files
TyriarTyriar
authored
Merge pull request #228250 from microsoft/alexr00/tender-trout
Revert YAML grammar back to textmate/yaml.tmbundle
2 parents 2be7f62 + ef1e8d2 commit 38c31bc

File tree

12 files changed

+818
-4893
lines changed

12 files changed

+818
-4893
lines changed

‎extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"c": "test1",
4-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
4+
"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
55
"r": {
66
"dark_plus": "entity.name.tag: #569CD6",
77
"light_plus": "entity.name.tag: #800000",
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"c": " ",
18-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
18+
"t": "source.yaml",
1919
"r": {
2020
"dark_plus": "default: #D4D4D4",
2121
"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"c": ":",
32-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
32+
"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
3333
"r": {
3434
"dark_plus": "default: #D4D4D4",
3535
"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
4343
},
4444
{
4545
"c": " ",
46-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
46+
"t": "source.yaml",
4747
"r": {
4848
"dark_plus": "default: #D4D4D4",
4949
"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"c": "dsd",
60-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
60+
"t": "source.yaml string.unquoted.plain.out.yaml",
6161
"r": {
6262
"dark_plus": "string: #CE9178",
6363
"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -71,7 +71,7 @@
7171
},
7272
{
7373
"c": "test2",
74-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
74+
"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
7575
"r": {
7676
"dark_plus": "entity.name.tag: #569CD6",
7777
"light_plus": "entity.name.tag: #800000",
@@ -85,7 +85,7 @@
8585
},
8686
{
8787
"c": " ",
88-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
88+
"t": "source.yaml",
8989
"r": {
9090
"dark_plus": "default: #D4D4D4",
9191
"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
9999
},
100100
{
101101
"c": ":",
102-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
102+
"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
103103
"r": {
104104
"dark_plus": "default: #D4D4D4",
105105
"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
113113
},
114114
{
115115
"c": " ",
116-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
116+
"t": "source.yaml",
117117
"r": {
118118
"dark_plus": "default: #D4D4D4",
119119
"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
127127
},
128128
{
129129
"c": "abc-def",
130-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
130+
"t": "source.yaml string.unquoted.plain.out.yaml",
131131
"r": {
132132
"dark_plus": "string: #CE9178",
133133
"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -141,7 +141,7 @@
141141
},
142142
{
143143
"c": "test-3",
144-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
144+
"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
145145
"r": {
146146
"dark_plus": "entity.name.tag: #569CD6",
147147
"light_plus": "entity.name.tag: #800000",
@@ -155,7 +155,7 @@
155155
},
156156
{
157157
"c": " ",
158-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
158+
"t": "source.yaml",
159159
"r": {
160160
"dark_plus": "default: #D4D4D4",
161161
"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"c": ":",
172-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
172+
"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
173173
"r": {
174174
"dark_plus": "default: #D4D4D4",
175175
"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
183183
},
184184
{
185185
"c": " ",
186-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
186+
"t": "source.yaml",
187187
"r": {
188188
"dark_plus": "default: #D4D4D4",
189189
"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
197197
},
198198
{
199199
"c": "abcdef",
200-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
200+
"t": "source.yaml string.unquoted.plain.out.yaml",
201201
"r": {
202202
"dark_plus": "string: #CE9178",
203203
"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -211,7 +211,7 @@
211211
},
212212
{
213213
"c": "test-4",
214-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
214+
"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
215215
"r": {
216216
"dark_plus": "entity.name.tag: #569CD6",
217217
"light_plus": "entity.name.tag: #800000",
@@ -225,7 +225,7 @@
225225
},
226226
{
227227
"c": " ",
228-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
228+
"t": "source.yaml",
229229
"r": {
230230
"dark_plus": "default: #D4D4D4",
231231
"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
239239
},
240240
{
241241
"c": ":",
242-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
242+
"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
243243
"r": {
244244
"dark_plus": "default: #D4D4D4",
245245
"light_plus": "default: #000000",
@@ -253,7 +253,7 @@
253253
},
254254
{
255255
"c": " ",
256-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
256+
"t": "source.yaml",
257257
"r": {
258258
"dark_plus": "default: #D4D4D4",
259259
"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
267267
},
268268
{
269269
"c": "abc-def",
270-
"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
270+
"t": "source.yaml string.unquoted.plain.out.yaml",
271271
"r": {
272272
"dark_plus": "string: #CE9178",
273273
"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -279,4 +279,4 @@
279279
"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
280280
}
281281
}
282-
]
282+
]

0 commit comments

Comments
 (0)