Skip to content

Commit 845fa13

Browse files
committed
Tweak colorization of regexp for light+ and dark+
1 parent 65d00e6 commit 845fa13

12 files changed

Lines changed: 167 additions & 135 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
"c": "(",
7070
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
7171
"r": {
72-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
73-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
72+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
73+
"light_plus": "punctuation.definition.group.regexp: #D16969",
7474
"dark_vs": "string.regexp: #D16969",
7575
"light_vs": "string.regexp: #811F3F",
7676
"hc_black": "string.regexp: #D16969"
@@ -80,8 +80,8 @@
8080
"c": "\\d",
8181
"t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp",
8282
"r": {
83-
"dark_plus": "constant.character: #569CD6",
84-
"light_plus": "constant.character: #0000FF",
83+
"dark_plus": "constant.character.character-class.regexp: #D16969",
84+
"light_plus": "constant.character.character-class.regexp: #811F3F",
8585
"dark_vs": "string.regexp: #D16969",
8686
"light_vs": "string.regexp: #811F3F",
8787
"hc_black": "constant.character: #569CD6"
@@ -91,8 +91,8 @@
9191
"c": "+",
9292
"t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp",
9393
"r": {
94-
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
95-
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
94+
"dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D",
95+
"light_plus": "keyword.operator.quantifier.regexp: #000000",
9696
"dark_vs": "keyword.operator: #D4D4D4",
9797
"light_vs": "keyword.operator: #000000",
9898
"hc_black": "keyword.operator: #D4D4D4"
@@ -102,8 +102,8 @@
102102
"c": ")",
103103
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
104104
"r": {
105-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
106-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
105+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
106+
"light_plus": "punctuation.definition.group.regexp: #D16969",
107107
"dark_vs": "string.regexp: #D16969",
108108
"light_vs": "string.regexp: #811F3F",
109109
"hc_black": "string.regexp: #D16969"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,8 +1378,8 @@
13781378
"c": "(",
13791379
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
13801380
"r": {
1381-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1382-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
1381+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
1382+
"light_plus": "punctuation.definition.group.regexp: #D16969",
13831383
"dark_vs": "string.regexp: #D16969",
13841384
"light_vs": "string.regexp: #811F3F",
13851385
"hc_black": "string.regexp: #D16969"
@@ -1389,8 +1389,8 @@
13891389
"c": "\\d",
13901390
"t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp",
13911391
"r": {
1392-
"dark_plus": "constant.character: #569CD6",
1393-
"light_plus": "constant.character: #0000FF",
1392+
"dark_plus": "constant.character.character-class.regexp: #D16969",
1393+
"light_plus": "constant.character.character-class.regexp: #811F3F",
13941394
"dark_vs": "string.regexp: #D16969",
13951395
"light_vs": "string.regexp: #811F3F",
13961396
"hc_black": "constant.character: #569CD6"
@@ -1400,8 +1400,8 @@
14001400
"c": "+",
14011401
"t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp",
14021402
"r": {
1403-
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
1404-
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
1403+
"dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D",
1404+
"light_plus": "keyword.operator.quantifier.regexp: #000000",
14051405
"dark_vs": "keyword.operator: #D4D4D4",
14061406
"light_vs": "keyword.operator: #000000",
14071407
"hc_black": "keyword.operator: #D4D4D4"
@@ -1411,8 +1411,8 @@
14111411
"c": ")",
14121412
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
14131413
"r": {
1414-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1415-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
1414+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
1415+
"light_plus": "punctuation.definition.group.regexp: #D16969",
14161416
"dark_vs": "string.regexp: #D16969",
14171417
"light_vs": "string.regexp: #811F3F",
14181418
"hc_black": "string.regexp: #D16969"
@@ -1466,8 +1466,8 @@
14661466
"c": "(",
14671467
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
14681468
"r": {
1469-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1470-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
1469+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
1470+
"light_plus": "punctuation.definition.group.regexp: #D16969",
14711471
"dark_vs": "string.regexp: #D16969",
14721472
"light_vs": "string.regexp: #811F3F",
14731473
"hc_black": "string.regexp: #D16969"
@@ -1477,8 +1477,8 @@
14771477
"c": "\\w",
14781478
"t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp",
14791479
"r": {
1480-
"dark_plus": "constant.character: #569CD6",
1481-
"light_plus": "constant.character: #0000FF",
1480+
"dark_plus": "constant.character.character-class.regexp: #D16969",
1481+
"light_plus": "constant.character.character-class.regexp: #811F3F",
14821482
"dark_vs": "string.regexp: #D16969",
14831483
"light_vs": "string.regexp: #811F3F",
14841484
"hc_black": "constant.character: #569CD6"
@@ -1488,8 +1488,8 @@
14881488
"c": "*",
14891489
"t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp",
14901490
"r": {
1491-
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
1492-
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
1491+
"dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D",
1492+
"light_plus": "keyword.operator.quantifier.regexp: #000000",
14931493
"dark_vs": "keyword.operator: #D4D4D4",
14941494
"light_vs": "keyword.operator: #000000",
14951495
"hc_black": "keyword.operator: #D4D4D4"
@@ -1499,8 +1499,8 @@
14991499
"c": ")",
15001500
"t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp",
15011501
"r": {
1502-
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1503-
"light_plus": "punctuation.definition.group.regexp: #FF0000",
1502+
"dark_plus": "punctuation.definition.group.regexp: #CE9178",
1503+
"light_plus": "punctuation.definition.group.regexp: #D16969",
15041504
"dark_vs": "string.regexp: #D16969",
15051505
"light_vs": "string.regexp: #811F3F",
15061506
"hc_black": "string.regexp: #D16969"
@@ -1554,8 +1554,8 @@
15541554
"c": "$",
15551555
"t": "source.coffee string.regexp.coffee keyword.control.anchor.regexp",
15561556
"r": {
1557-
"dark_plus": "keyword.control.anchor.regexp: #C586C0",
1558-
"light_plus": "keyword.control.anchor.regexp: #09885A",
1557+
"dark_plus": "keyword.control.anchor.regexp: #DCDCAA",
1558+
"light_plus": "keyword.control.anchor.regexp: #FF0000",
15591559
"dark_vs": "keyword.control: #569CD6",
15601560
"light_vs": "keyword.control: #0000FF",
15611561
"hc_black": "keyword.control: #C586C0"

extensions/make/test/colorize-results/makefile.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
"c": "\\",
136136
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile",
137137
"r": {
138-
"dark_plus": "constant.character.escape: #C586C0",
139-
"light_plus": "constant.character.escape: #FF0000",
138+
"dark_plus": "constant.character.escape: #D7BA7D",
139+
"light_plus": "constant.character.escape: #A31515",
140140
"dark_vs": "default: #D4D4D4",
141141
"light_vs": "default: #000000",
142142
"hc_black": "constant.character: #569CD6"
@@ -278,8 +278,8 @@
278278
"c": "\\",
279279
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile",
280280
"r": {
281-
"dark_plus": "constant.character.escape: #C586C0",
282-
"light_plus": "constant.character.escape: #FF0000",
281+
"dark_plus": "constant.character.escape: #D7BA7D",
282+
"light_plus": "constant.character.escape: #A31515",
283283
"dark_vs": "default: #D4D4D4",
284284
"light_vs": "default: #000000",
285285
"hc_black": "constant.character: #569CD6"
@@ -322,8 +322,8 @@
322322
"c": "\\",
323323
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile comment.line.number-sign.makefile constant.character.escape.continuation.makefile",
324324
"r": {
325-
"dark_plus": "constant.character.escape: #C586C0",
326-
"light_plus": "constant.character.escape: #FF0000",
325+
"dark_plus": "constant.character.escape: #D7BA7D",
326+
"light_plus": "constant.character.escape: #A31515",
327327
"dark_vs": "comment: #608B4E",
328328
"light_vs": "comment: #008000",
329329
"hc_black": "constant.character: #569CD6"
@@ -377,8 +377,8 @@
377377
"c": "\\",
378378
"t": "source.makefile comment.line.number-sign.makefile constant.character.escape.continuation.makefile",
379379
"r": {
380-
"dark_plus": "constant.character.escape: #C586C0",
381-
"light_plus": "constant.character.escape: #FF0000",
380+
"dark_plus": "constant.character.escape: #D7BA7D",
381+
"light_plus": "constant.character.escape: #A31515",
382382
"dark_vs": "comment: #608B4E",
383383
"light_vs": "comment: #008000",
384384
"hc_black": "constant.character: #569CD6"
@@ -553,8 +553,8 @@
553553
"c": "\\",
554554
"t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile",
555555
"r": {
556-
"dark_plus": "constant.character.escape: #C586C0",
557-
"light_plus": "constant.character.escape: #FF0000",
556+
"dark_plus": "constant.character.escape: #D7BA7D",
557+
"light_plus": "constant.character.escape: #A31515",
558558
"dark_vs": "default: #D4D4D4",
559559
"light_vs": "default: #000000",
560560
"hc_black": "constant.character: #569CD6"

extensions/perl/test/colorize-results/test2_pl.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,8 +1301,8 @@
13011301
"c": "\\d\\d\\d",
13021302
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
13031303
"r": {
1304-
"dark_plus": "constant.character.escape: #C586C0",
1305-
"light_plus": "constant.character.escape: #FF0000",
1304+
"dark_plus": "constant.character.escape: #D7BA7D",
1305+
"light_plus": "constant.character.escape: #A31515",
13061306
"dark_vs": "string.regexp: #D16969",
13071307
"light_vs": "string.regexp: #811F3F",
13081308
"hc_black": "constant.character: #569CD6"
@@ -1323,8 +1323,8 @@
13231323
"c": "\\d\\d",
13241324
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
13251325
"r": {
1326-
"dark_plus": "constant.character.escape: #C586C0",
1327-
"light_plus": "constant.character.escape: #FF0000",
1326+
"dark_plus": "constant.character.escape: #D7BA7D",
1327+
"light_plus": "constant.character.escape: #A31515",
13281328
"dark_vs": "string.regexp: #D16969",
13291329
"light_vs": "string.regexp: #811F3F",
13301330
"hc_black": "constant.character: #569CD6"
@@ -1345,8 +1345,8 @@
13451345
"c": "\\d\\d",
13461346
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
13471347
"r": {
1348-
"dark_plus": "constant.character.escape: #C586C0",
1349-
"light_plus": "constant.character.escape: #FF0000",
1348+
"dark_plus": "constant.character.escape: #D7BA7D",
1349+
"light_plus": "constant.character.escape: #A31515",
13501350
"dark_vs": "string.regexp: #D16969",
13511351
"light_vs": "string.regexp: #811F3F",
13521352
"hc_black": "constant.character: #569CD6"
@@ -1774,8 +1774,8 @@
17741774
"c": "\\d",
17751775
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
17761776
"r": {
1777-
"dark_plus": "constant.character.escape: #C586C0",
1778-
"light_plus": "constant.character.escape: #FF0000",
1777+
"dark_plus": "constant.character.escape: #D7BA7D",
1778+
"light_plus": "constant.character.escape: #A31515",
17791779
"dark_vs": "string.regexp: #D16969",
17801780
"light_vs": "string.regexp: #811F3F",
17811781
"hc_black": "constant.character: #569CD6"

extensions/perl/test/colorize-results/test_pl.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@
388388
"c": "\\s",
389389
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
390390
"r": {
391-
"dark_plus": "constant.character.escape: #C586C0",
392-
"light_plus": "constant.character.escape: #FF0000",
391+
"dark_plus": "constant.character.escape: #D7BA7D",
392+
"light_plus": "constant.character.escape: #A31515",
393393
"dark_vs": "string.regexp: #D16969",
394394
"light_vs": "string.regexp: #811F3F",
395395
"hc_black": "constant.character: #569CD6"
@@ -410,8 +410,8 @@
410410
"c": "\\s",
411411
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
412412
"r": {
413-
"dark_plus": "constant.character.escape: #C586C0",
414-
"light_plus": "constant.character.escape: #FF0000",
413+
"dark_plus": "constant.character.escape: #D7BA7D",
414+
"light_plus": "constant.character.escape: #A31515",
415415
"dark_vs": "string.regexp: #D16969",
416416
"light_vs": "string.regexp: #811F3F",
417417
"hc_black": "constant.character: #569CD6"
@@ -432,8 +432,8 @@
432432
"c": "\\(",
433433
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
434434
"r": {
435-
"dark_plus": "constant.character.escape: #C586C0",
436-
"light_plus": "constant.character.escape: #FF0000",
435+
"dark_plus": "constant.character.escape: #D7BA7D",
436+
"light_plus": "constant.character.escape: #A31515",
437437
"dark_vs": "string.regexp: #D16969",
438438
"light_vs": "string.regexp: #811F3F",
439439
"hc_black": "constant.character: #569CD6"
@@ -454,8 +454,8 @@
454454
"c": "\\)",
455455
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
456456
"r": {
457-
"dark_plus": "constant.character.escape: #C586C0",
458-
"light_plus": "constant.character.escape: #FF0000",
457+
"dark_plus": "constant.character.escape: #D7BA7D",
458+
"light_plus": "constant.character.escape: #A31515",
459459
"dark_vs": "string.regexp: #D16969",
460460
"light_vs": "string.regexp: #811F3F",
461461
"hc_black": "constant.character: #569CD6"
@@ -476,8 +476,8 @@
476476
"c": "\\)",
477477
"t": "source.perl string.regexp.find.perl constant.character.escape.perl",
478478
"r": {
479-
"dark_plus": "constant.character.escape: #C586C0",
480-
"light_plus": "constant.character.escape: #FF0000",
479+
"dark_plus": "constant.character.escape: #D7BA7D",
480+
"light_plus": "constant.character.escape: #A31515",
481481
"dark_vs": "string.regexp: #D16969",
482482
"light_vs": "string.regexp: #811F3F",
483483
"hc_black": "constant.character: #569CD6"
@@ -674,8 +674,8 @@
674674
"c": "\\n",
675675
"t": "source.perl string.quoted.double.perl constant.character.escape.perl",
676676
"r": {
677-
"dark_plus": "constant.character.escape: #C586C0",
678-
"light_plus": "constant.character.escape: #FF0000",
677+
"dark_plus": "constant.character.escape: #D7BA7D",
678+
"light_plus": "constant.character.escape: #A31515",
679679
"dark_vs": "string: #CE9178",
680680
"light_vs": "string: #A31515",
681681
"hc_black": "constant.character: #569CD6"
@@ -949,8 +949,8 @@
949949
"c": "\\n",
950950
"t": "source.perl string.quoted.double.perl constant.character.escape.perl",
951951
"r": {
952-
"dark_plus": "constant.character.escape: #C586C0",
953-
"light_plus": "constant.character.escape: #FF0000",
952+
"dark_plus": "constant.character.escape: #D7BA7D",
953+
"light_plus": "constant.character.escape: #A31515",
954954
"dark_vs": "string: #CE9178",
955955
"light_vs": "string: #A31515",
956956
"hc_black": "constant.character: #569CD6"
@@ -1444,8 +1444,8 @@
14441444
"c": "\\n",
14451445
"t": "source.perl string.quoted.double.perl constant.character.escape.perl",
14461446
"r": {
1447-
"dark_plus": "constant.character.escape: #C586C0",
1448-
"light_plus": "constant.character.escape: #FF0000",
1447+
"dark_plus": "constant.character.escape: #D7BA7D",
1448+
"light_plus": "constant.character.escape: #A31515",
14491449
"dark_vs": "string: #CE9178",
14501450
"light_vs": "string: #A31515",
14511451
"hc_black": "constant.character: #569CD6"
@@ -2280,8 +2280,8 @@
22802280
"c": "\\n",
22812281
"t": "source.perl string.quoted.double.perl constant.character.escape.perl",
22822282
"r": {
2283-
"dark_plus": "constant.character.escape: #C586C0",
2284-
"light_plus": "constant.character.escape: #FF0000",
2283+
"dark_plus": "constant.character.escape: #D7BA7D",
2284+
"light_plus": "constant.character.escape: #A31515",
22852285
"dark_vs": "string: #CE9178",
22862286
"light_vs": "string: #A31515",
22872287
"hc_black": "constant.character: #569CD6"

extensions/php/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"PHP",
2828
"php"
2929
],
30-
"firstLine": "^#!/.*\\bphp\\b",
30+
"firstLine": "^#!/.*\\bphp\\b",
3131
"mimetypes": [
3232
"application/x-php"
3333
],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@
278278
"c": "\\'",
279279
"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php",
280280
"r": {
281-
"dark_plus": "constant.character.escape: #C586C0",
282-
"light_plus": "constant.character.escape: #FF0000",
281+
"dark_plus": "constant.character.escape: #D7BA7D",
282+
"light_plus": "constant.character.escape: #A31515",
283283
"dark_vs": "string: #CE9178",
284284
"light_vs": "string: #A31515",
285285
"hc_black": "constant.character: #569CD6"
@@ -377,8 +377,8 @@
377377
"c": "\\'",
378378
"t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php",
379379
"r": {
380-
"dark_plus": "constant.character.escape: #C586C0",
381-
"light_plus": "constant.character.escape: #FF0000",
380+
"dark_plus": "constant.character.escape: #D7BA7D",
381+
"light_plus": "constant.character.escape: #A31515",
382382
"dark_vs": "string: #CE9178",
383383
"light_vs": "string: #A31515",
384384
"hc_black": "constant.character: #569CD6"

0 commit comments

Comments
 (0)