Skip to content

Commit 35c8bc4

Browse files
mjbvzmjbvz
committed
Further improve colorization of embeded expressions
- Add groovy embedded support - Make high contrast colorization consistent
1 parent 69bc9d6 commit 35c8bc4

20 files changed

Lines changed: 319 additions & 298 deletions

File tree

‎extensions/groovy/test/colorize-results/test_groovy.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9243,11 +9243,11 @@
92439243
"c": "System.currentTimeMillis() - start",
92449244
"t": "source.groovy meta.definition.method.groovy meta.method.body.java string.quoted.double.groovy source.groovy.embedded.source",
92459245
"r": {
9246-
"dark_plus": "string: #CE9178",
9247-
"light_plus": "string: #A31515",
9248-
"dark_vs": "string: #CE9178",
9249-
"light_vs": "string: #A31515",
9250-
"hc_black": "string: #CE9178"
9246+
"dark_plus": "source.groovy.embedded: #D4D4D4",
9247+
"light_plus": "source.groovy.embedded: #000000",
9248+
"dark_vs": "source.groovy.embedded: #D4D4D4",
9249+
"light_vs": "source.groovy.embedded: #000000",
9250+
"hc_black": "source.groovy.embedded: #FFFFFF"
92519251
}
92529252
},
92539253
{

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"light_plus": "meta.embedded: #000000",
3030
"dark_vs": "meta.embedded: #D4D4D4",
3131
"light_vs": "meta.embedded: #000000",
32-
"hc_black": "default: #FFFFFF"
32+
"hc_black": "meta.embedded: #FFFFFF"
3333
}
3434
},
3535
{
@@ -51,7 +51,7 @@
5151
"light_plus": "meta.embedded: #000000",
5252
"dark_vs": "meta.embedded: #D4D4D4",
5353
"light_vs": "meta.embedded: #000000",
54-
"hc_black": "default: #FFFFFF"
54+
"hc_black": "meta.embedded: #FFFFFF"
5555
}
5656
},
5757
{
@@ -106,7 +106,7 @@
106106
"light_plus": "meta.embedded: #000000",
107107
"dark_vs": "meta.embedded: #D4D4D4",
108108
"light_vs": "meta.embedded: #000000",
109-
"hc_black": "default: #FFFFFF"
109+
"hc_black": "meta.embedded: #FFFFFF"
110110
}
111111
},
112112
{
@@ -128,7 +128,7 @@
128128
"light_plus": "meta.embedded: #000000",
129129
"dark_vs": "meta.embedded: #D4D4D4",
130130
"light_vs": "meta.embedded: #000000",
131-
"hc_black": "default: #FFFFFF"
131+
"hc_black": "meta.embedded: #FFFFFF"
132132
}
133133
},
134134
{
@@ -150,7 +150,7 @@
150150
"light_plus": "meta.embedded: #000000",
151151
"dark_vs": "meta.embedded: #D4D4D4",
152152
"light_vs": "meta.embedded: #000000",
153-
"hc_black": "default: #FFFFFF"
153+
"hc_black": "meta.embedded: #FFFFFF"
154154
}
155155
},
156156
{
@@ -194,7 +194,7 @@
194194
"light_plus": "meta.embedded: #000000",
195195
"dark_vs": "meta.embedded: #D4D4D4",
196196
"light_vs": "meta.embedded: #000000",
197-
"hc_black": "default: #FFFFFF"
197+
"hc_black": "meta.embedded: #FFFFFF"
198198
}
199199
},
200200
{
@@ -205,7 +205,7 @@
205205
"light_plus": "meta.embedded: #000000",
206206
"dark_vs": "meta.embedded: #D4D4D4",
207207
"light_vs": "meta.embedded: #000000",
208-
"hc_black": "default: #FFFFFF"
208+
"hc_black": "meta.embedded: #FFFFFF"
209209
}
210210
},
211211
{
@@ -293,7 +293,7 @@
293293
"light_plus": "meta.embedded: #000000",
294294
"dark_vs": "meta.embedded: #D4D4D4",
295295
"light_vs": "meta.embedded: #000000",
296-
"hc_black": "default: #FFFFFF"
296+
"hc_black": "meta.embedded: #FFFFFF"
297297
}
298298
},
299299
{
@@ -315,7 +315,7 @@
315315
"light_plus": "meta.embedded: #000000",
316316
"dark_vs": "meta.embedded: #D4D4D4",
317317
"light_vs": "meta.embedded: #000000",
318-
"hc_black": "default: #FFFFFF"
318+
"hc_black": "meta.embedded: #FFFFFF"
319319
}
320320
},
321321
{
@@ -337,7 +337,7 @@
337337
"light_plus": "meta.embedded: #000000",
338338
"dark_vs": "meta.embedded: #D4D4D4",
339339
"light_vs": "meta.embedded: #000000",
340-
"hc_black": "default: #FFFFFF"
340+
"hc_black": "meta.embedded: #FFFFFF"
341341
}
342342
},
343343
{
@@ -381,7 +381,7 @@
381381
"light_plus": "meta.embedded: #000000",
382382
"dark_vs": "meta.embedded: #D4D4D4",
383383
"light_vs": "meta.embedded: #000000",
384-
"hc_black": "default: #FFFFFF"
384+
"hc_black": "meta.embedded: #FFFFFF"
385385
}
386386
},
387387
{
@@ -392,7 +392,7 @@
392392
"light_plus": "meta.embedded: #000000",
393393
"dark_vs": "meta.embedded: #D4D4D4",
394394
"light_vs": "meta.embedded: #000000",
395-
"hc_black": "default: #FFFFFF"
395+
"hc_black": "meta.embedded: #FFFFFF"
396396
}
397397
},
398398
{

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"light_plus": "meta.embedded: #000000",
6363
"dark_vs": "meta.embedded: #D4D4D4",
6464
"light_vs": "meta.embedded: #000000",
65-
"hc_black": "default: #FFFFFF"
65+
"hc_black": "meta.embedded: #FFFFFF"
6666
}
6767
},
6868
{
@@ -84,7 +84,7 @@
8484
"light_plus": "meta.embedded: #000000",
8585
"dark_vs": "meta.embedded: #D4D4D4",
8686
"light_vs": "meta.embedded: #000000",
87-
"hc_black": "default: #FFFFFF"
87+
"hc_black": "meta.embedded: #FFFFFF"
8888
}
8989
},
9090
{
@@ -139,7 +139,7 @@
139139
"light_plus": "meta.embedded: #000000",
140140
"dark_vs": "meta.embedded: #D4D4D4",
141141
"light_vs": "meta.embedded: #000000",
142-
"hc_black": "default: #FFFFFF"
142+
"hc_black": "meta.embedded: #FFFFFF"
143143
}
144144
},
145145
{
@@ -172,7 +172,7 @@
172172
"light_plus": "meta.embedded: #000000",
173173
"dark_vs": "meta.embedded: #D4D4D4",
174174
"light_vs": "meta.embedded: #000000",
175-
"hc_black": "default: #FFFFFF"
175+
"hc_black": "meta.embedded: #FFFFFF"
176176
}
177177
},
178178
{
@@ -194,7 +194,7 @@
194194
"light_plus": "meta.embedded: #000000",
195195
"dark_vs": "meta.embedded: #D4D4D4",
196196
"light_vs": "meta.embedded: #000000",
197-
"hc_black": "default: #FFFFFF"
197+
"hc_black": "meta.embedded: #FFFFFF"
198198
}
199199
},
200200
{
@@ -359,7 +359,7 @@
359359
"light_plus": "meta.embedded: #000000",
360360
"dark_vs": "meta.embedded: #D4D4D4",
361361
"light_vs": "meta.embedded: #000000",
362-
"hc_black": "default: #FFFFFF"
362+
"hc_black": "meta.embedded: #FFFFFF"
363363
}
364364
},
365365
{
@@ -381,7 +381,7 @@
381381
"light_plus": "meta.embedded: #000000",
382382
"dark_vs": "meta.embedded: #D4D4D4",
383383
"light_vs": "meta.embedded: #000000",
384-
"hc_black": "default: #FFFFFF"
384+
"hc_black": "meta.embedded: #FFFFFF"
385385
}
386386
},
387387
{
@@ -436,7 +436,7 @@
436436
"light_plus": "meta.embedded: #000000",
437437
"dark_vs": "meta.embedded: #D4D4D4",
438438
"light_vs": "meta.embedded: #000000",
439-
"hc_black": "default: #FFFFFF"
439+
"hc_black": "meta.embedded: #FFFFFF"
440440
}
441441
},
442442
{
@@ -458,7 +458,7 @@
458458
"light_plus": "meta.embedded: #000000",
459459
"dark_vs": "meta.embedded: #D4D4D4",
460460
"light_vs": "meta.embedded: #000000",
461-
"hc_black": "default: #FFFFFF"
461+
"hc_black": "meta.embedded: #FFFFFF"
462462
}
463463
},
464464
{
@@ -480,7 +480,7 @@
480480
"light_plus": "meta.embedded: #000000",
481481
"dark_vs": "meta.embedded: #D4D4D4",
482482
"light_vs": "meta.embedded: #000000",
483-
"hc_black": "default: #FFFFFF"
483+
"hc_black": "meta.embedded: #FFFFFF"
484484
}
485485
},
486486
{
@@ -502,7 +502,7 @@
502502
"light_plus": "meta.embedded: #000000",
503503
"dark_vs": "meta.embedded: #D4D4D4",
504504
"light_vs": "meta.embedded: #000000",
505-
"hc_black": "default: #FFFFFF"
505+
"hc_black": "meta.embedded: #FFFFFF"
506506
}
507507
},
508508
{
@@ -524,7 +524,7 @@
524524
"light_plus": "meta.embedded: #000000",
525525
"dark_vs": "meta.embedded: #D4D4D4",
526526
"light_vs": "meta.embedded: #000000",
527-
"hc_black": "default: #FFFFFF"
527+
"hc_black": "meta.embedded: #FFFFFF"
528528
}
529529
},
530530
{
@@ -601,7 +601,7 @@
601601
"light_plus": "meta.embedded: #000000",
602602
"dark_vs": "meta.embedded: #D4D4D4",
603603
"light_vs": "meta.embedded: #000000",
604-
"hc_black": "default: #FFFFFF"
604+
"hc_black": "meta.embedded: #FFFFFF"
605605
}
606606
},
607607
{
@@ -623,7 +623,7 @@
623623
"light_plus": "meta.embedded: #000000",
624624
"dark_vs": "meta.embedded: #D4D4D4",
625625
"light_vs": "meta.embedded: #000000",
626-
"hc_black": "default: #FFFFFF"
626+
"hc_black": "meta.embedded: #FFFFFF"
627627
}
628628
},
629629
{
@@ -678,7 +678,7 @@
678678
"light_plus": "meta.embedded: #000000",
679679
"dark_vs": "meta.embedded: #D4D4D4",
680680
"light_vs": "meta.embedded: #000000",
681-
"hc_black": "default: #FFFFFF"
681+
"hc_black": "meta.embedded: #FFFFFF"
682682
}
683683
},
684684
{
@@ -711,7 +711,7 @@
711711
"light_plus": "meta.embedded: #000000",
712712
"dark_vs": "meta.embedded: #D4D4D4",
713713
"light_vs": "meta.embedded: #000000",
714-
"hc_black": "default: #FFFFFF"
714+
"hc_black": "meta.embedded: #FFFFFF"
715715
}
716716
},
717717
{
@@ -733,7 +733,7 @@
733733
"light_plus": "meta.embedded: #000000",
734734
"dark_vs": "meta.embedded: #D4D4D4",
735735
"light_vs": "meta.embedded: #000000",
736-
"hc_black": "default: #FFFFFF"
736+
"hc_black": "meta.embedded: #FFFFFF"
737737
}
738738
},
739739
{

0 commit comments

Comments
 (0)