Skip to content

Commit dc2f6ec

Browse files
mjbvzmjbvz
committed
Improve colorization of embedded start end puctuators across languages
1 parent 3d314e2 commit dc2f6ec

11 files changed

Lines changed: 70 additions & 78 deletions

File tree

‎extensions/coffeescript/test/colorize-results/test-regex_coffee.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -454,11 +454,11 @@
454454
"c": "#{",
455455
"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
456456
"r": {
457-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
458-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
459-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
460-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
461-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
457+
"dark_plus": "punctuation.section.embedded: #569CD6",
458+
"light_plus": "punctuation.section.embedded: #0000FF",
459+
"dark_vs": "punctuation.section.embedded: #569CD6",
460+
"light_vs": "punctuation.section.embedded: #0000FF",
461+
"hc_black": "punctuation.section.embedded: #569CD6"
462462
}
463463
},
464464
{
@@ -476,11 +476,11 @@
476476
"c": "}",
477477
"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
478478
"r": {
479-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
480-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
481-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
482-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
483-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
479+
"dark_plus": "punctuation.section.embedded: #569CD6",
480+
"light_plus": "punctuation.section.embedded: #0000FF",
481+
"dark_vs": "punctuation.section.embedded: #569CD6",
482+
"light_vs": "punctuation.section.embedded: #0000FF",
483+
"hc_black": "punctuation.section.embedded: #569CD6"
484484
}
485485
},
486486
{

‎extensions/coffeescript/test/colorize-results/test_coffee.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,11 @@
311311
"c": "#{",
312312
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
313313
"r": {
314-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
315-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
316-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
317-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
318-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
314+
"dark_plus": "punctuation.section.embedded: #569CD6",
315+
"light_plus": "punctuation.section.embedded: #0000FF",
316+
"dark_vs": "punctuation.section.embedded: #569CD6",
317+
"light_vs": "punctuation.section.embedded: #0000FF",
318+
"hc_black": "punctuation.section.embedded: #569CD6"
319319
}
320320
},
321321
{
@@ -333,11 +333,11 @@
333333
"c": "}",
334334
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
335335
"r": {
336-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
337-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
338-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
339-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
340-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
336+
"dark_plus": "punctuation.section.embedded: #569CD6",
337+
"light_plus": "punctuation.section.embedded: #0000FF",
338+
"dark_vs": "punctuation.section.embedded: #569CD6",
339+
"light_vs": "punctuation.section.embedded: #0000FF",
340+
"hc_black": "punctuation.section.embedded: #569CD6"
341341
}
342342
},
343343
{
@@ -575,11 +575,11 @@
575575
"c": "#{",
576576
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
577577
"r": {
578-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
579-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
580-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
581-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
582-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
578+
"dark_plus": "punctuation.section.embedded: #569CD6",
579+
"light_plus": "punctuation.section.embedded: #0000FF",
580+
"dark_vs": "punctuation.section.embedded: #569CD6",
581+
"light_vs": "punctuation.section.embedded: #0000FF",
582+
"hc_black": "punctuation.section.embedded: #569CD6"
583583
}
584584
},
585585
{
@@ -597,11 +597,11 @@
597597
"c": "}",
598598
"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
599599
"r": {
600-
"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
601-
"light_plus": "punctuation.section.embedded.coffee: #0000FF",
602-
"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
603-
"light_vs": "punctuation.section.embedded.coffee: #0000FF",
604-
"hc_black": "punctuation.section.embedded.coffee: #569CD6"
600+
"dark_plus": "punctuation.section.embedded: #569CD6",
601+
"light_plus": "punctuation.section.embedded: #0000FF",
602+
"dark_vs": "punctuation.section.embedded: #569CD6",
603+
"light_vs": "punctuation.section.embedded: #0000FF",
604+
"hc_black": "punctuation.section.embedded: #569CD6"
605605
}
606606
},
607607
{

‎extensions/javascript/test/colorize-results/test_jsx.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,11 +1664,11 @@
16641664
"c": "{",
16651665
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.begin.js",
16661666
"r": {
1667-
"dark_plus": "meta.embedded: #D4D4D4",
1668-
"light_plus": "meta.embedded: #000000",
1669-
"dark_vs": "meta.embedded: #D4D4D4",
1670-
"light_vs": "meta.embedded: #000000",
1671-
"hc_black": "default: #FFFFFF"
1667+
"dark_plus": "punctuation.section.embedded: #569CD6",
1668+
"light_plus": "punctuation.section.embedded: #0000FF",
1669+
"dark_vs": "punctuation.section.embedded: #569CD6",
1670+
"light_vs": "punctuation.section.embedded: #0000FF",
1671+
"hc_black": "punctuation.section.embedded: #569CD6"
16721672
}
16731673
},
16741674
{
@@ -1686,11 +1686,11 @@
16861686
"c": "}",
16871687
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.end.js",
16881688
"r": {
1689-
"dark_plus": "meta.embedded: #D4D4D4",
1690-
"light_plus": "meta.embedded: #000000",
1691-
"dark_vs": "meta.embedded: #D4D4D4",
1692-
"light_vs": "meta.embedded: #000000",
1693-
"hc_black": "default: #FFFFFF"
1689+
"dark_plus": "punctuation.section.embedded: #569CD6",
1690+
"light_plus": "punctuation.section.embedded: #0000FF",
1691+
"dark_vs": "punctuation.section.embedded: #569CD6",
1692+
"light_vs": "punctuation.section.embedded: #0000FF",
1693+
"hc_black": "punctuation.section.embedded: #569CD6"
16941694
}
16951695
},
16961696
{
@@ -1862,11 +1862,11 @@
18621862
"c": "{",
18631863
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.begin.js",
18641864
"r": {
1865-
"dark_plus": "meta.embedded: #D4D4D4",
1866-
"light_plus": "meta.embedded: #000000",
1867-
"dark_vs": "meta.embedded: #D4D4D4",
1868-
"light_vs": "meta.embedded: #000000",
1869-
"hc_black": "default: #FFFFFF"
1865+
"dark_plus": "punctuation.section.embedded: #569CD6",
1866+
"light_plus": "punctuation.section.embedded: #0000FF",
1867+
"dark_vs": "punctuation.section.embedded: #569CD6",
1868+
"light_vs": "punctuation.section.embedded: #0000FF",
1869+
"hc_black": "punctuation.section.embedded: #569CD6"
18701870
}
18711871
},
18721872
{
@@ -1906,11 +1906,11 @@
19061906
"c": "}",
19071907
"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.end.js",
19081908
"r": {
1909-
"dark_plus": "meta.embedded: #D4D4D4",
1910-
"light_plus": "meta.embedded: #000000",
1911-
"dark_vs": "meta.embedded: #D4D4D4",
1912-
"light_vs": "meta.embedded: #000000",
1913-
"hc_black": "default: #FFFFFF"
1909+
"dark_plus": "punctuation.section.embedded: #569CD6",
1910+
"light_plus": "punctuation.section.embedded: #0000FF",
1911+
"dark_vs": "punctuation.section.embedded: #569CD6",
1912+
"light_vs": "punctuation.section.embedded: #0000FF",
1913+
"hc_black": "punctuation.section.embedded: #569CD6"
19141914
}
19151915
},
19161916
{

‎extensions/php/test/colorize-results/issue-28354_php.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"light_plus": "punctuation.section.embedded.begin.php: #800000",
7474
"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
7575
"light_vs": "punctuation.section.embedded.begin.php: #800000",
76-
"hc_black": "default: #FFFFFF"
76+
"hc_black": "punctuation.section.embedded: #569CD6"
7777
}
7878
},
7979
{
@@ -458,7 +458,7 @@
458458
"light_plus": "punctuation.section.embedded.end.php: #800000",
459459
"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
460460
"light_vs": "punctuation.section.embedded.end.php: #800000",
461-
"hc_black": "default: #FFFFFF"
461+
"hc_black": "punctuation.section.embedded: #569CD6"
462462
}
463463
},
464464
{
@@ -469,7 +469,7 @@
469469
"light_plus": "punctuation.section.embedded.end.php: #800000",
470470
"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
471471
"light_vs": "punctuation.section.embedded.end.php: #800000",
472-
"hc_black": "default: #FFFFFF"
472+
"hc_black": "punctuation.section.embedded: #569CD6"
473473
}
474474
},
475475
{

‎extensions/php/test/colorize-results/test_php.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
"light_plus": "punctuation.section.embedded.begin.php: #800000",
228228
"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
229229
"light_vs": "punctuation.section.embedded.begin.php: #800000",
230-
"hc_black": "default: #FFFFFF"
230+
"hc_black": "punctuation.section.embedded: #569CD6"
231231
}
232232
},
233233
{
@@ -3549,7 +3549,7 @@
35493549
"light_plus": "punctuation.section.embedded.end.php: #800000",
35503550
"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
35513551
"light_vs": "punctuation.section.embedded.end.php: #800000",
3552-
"hc_black": "default: #FFFFFF"
3552+
"hc_black": "punctuation.section.embedded: #569CD6"
35533553
}
35543554
},
35553555
{
@@ -3560,7 +3560,7 @@
35603560
"light_plus": "punctuation.section.embedded.end.php: #800000",
35613561
"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
35623562
"light_vs": "punctuation.section.embedded.end.php: #800000",
3563-
"hc_black": "default: #FFFFFF"
3563+
"hc_black": "punctuation.section.embedded: #569CD6"
35643564
}
35653565
},
35663566
{

‎extensions/ruby/test/colorize-results/test_rb.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,11 +2258,11 @@
22582258
"c": "#{",
22592259
"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.begin.ruby",
22602260
"r": {
2261-
"dark_plus": "meta.embedded: #D4D4D4",
2262-
"light_plus": "meta.embedded: #000000",
2263-
"dark_vs": "meta.embedded: #D4D4D4",
2264-
"light_vs": "meta.embedded: #000000",
2265-
"hc_black": "string: #CE9178"
2261+
"dark_plus": "punctuation.section.embedded: #569CD6",
2262+
"light_plus": "punctuation.section.embedded: #0000FF",
2263+
"dark_vs": "punctuation.section.embedded: #569CD6",
2264+
"light_vs": "punctuation.section.embedded: #0000FF",
2265+
"hc_black": "punctuation.section.embedded: #569CD6"
22662266
}
22672267
},
22682268
{
@@ -2280,11 +2280,11 @@
22802280
"c": "}",
22812281
"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby source.ruby",
22822282
"r": {
2283-
"dark_plus": "meta.embedded: #D4D4D4",
2284-
"light_plus": "meta.embedded: #000000",
2285-
"dark_vs": "meta.embedded: #D4D4D4",
2286-
"light_vs": "meta.embedded: #000000",
2287-
"hc_black": "string: #CE9178"
2283+
"dark_plus": "punctuation.section.embedded: #569CD6",
2284+
"light_plus": "punctuation.section.embedded: #0000FF",
2285+
"dark_vs": "punctuation.section.embedded: #569CD6",
2286+
"light_vs": "punctuation.section.embedded: #0000FF",
2287+
"hc_black": "punctuation.section.embedded: #569CD6"
22882288
}
22892289
},
22902290
{

‎extensions/theme-defaults/themes/dark_vs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
"scope": [
253253
"punctuation.definition.template-expression.begin",
254254
"punctuation.definition.template-expression.end",
255-
"punctuation.section.embedded.coffee"
255+
"punctuation.section.embedded"
256256
],
257257
"settings": {
258258
"foreground": "#569cd6"

‎extensions/theme-defaults/themes/hc_black_defaults.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
"scope": [
232232
"punctuation.definition.template-expression.begin",
233233
"punctuation.definition.template-expression.end",
234-
"punctuation.section.embedded.coffee"
234+
"punctuation.section.embedded"
235235
],
236236
"settings": {
237237
"foreground": "#569cd6"

‎extensions/theme-defaults/themes/light_vs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
"scope": [
249249
"punctuation.definition.template-expression.begin",
250250
"punctuation.definition.template-expression.end",
251-
"punctuation.section.embedded.coffee"
251+
"punctuation.section.embedded"
252252
],
253253
"settings": {
254254
"foreground": "#0000ff"

‎extensions/theme-monokai/themes/monokai-color-theme.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"name": "Template Definition",
122122
"scope": [
123123
"punctuation.definition.template-expression",
124-
"punctuation.section.embedded.coffee"
124+
"punctuation.section.embedded"
125125
],
126126
"settings": {
127127
"foreground": "#F92672"

0 commit comments

Comments
 (0)