Skip to content

Commit 3864be5

Browse files
committed
Add rules for regex groups to vs dark+ and light+ themes
1 parent b411fb2 commit 3864be5

5 files changed

Lines changed: 76 additions & 30 deletions

File tree

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

Lines changed: 6 additions & 6 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": "string.regexp: #D16969",
73-
"light_plus": "string.regexp: #811F3F",
72+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
73+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
7474
"dark_vs": "string.regexp: #D16969",
7575
"light_vs": "string.regexp: #811F3F",
7676
"hc_black": "string.regexp: #D16969"
@@ -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: #D4D4D4",
95-
"light_plus": "keyword.operator: #000000",
94+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
95+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
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": "string.regexp: #D16969",
106-
"light_plus": "string.regexp: #811F3F",
105+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
106+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
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: 14 additions & 14 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": "string.regexp: #D16969",
1382-
"light_plus": "string.regexp: #811F3F",
1381+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1382+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
13831383
"dark_vs": "string.regexp: #D16969",
13841384
"light_vs": "string.regexp: #811F3F",
13851385
"hc_black": "string.regexp: #D16969"
@@ -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: #D4D4D4",
1404-
"light_plus": "keyword.operator: #000000",
1403+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
1404+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
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": "string.regexp: #D16969",
1415-
"light_plus": "string.regexp: #811F3F",
1414+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1415+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
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": "string.regexp: #D16969",
1470-
"light_plus": "string.regexp: #811F3F",
1469+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1470+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
14711471
"dark_vs": "string.regexp: #D16969",
14721472
"light_vs": "string.regexp: #811F3F",
14731473
"hc_black": "string.regexp: #D16969"
@@ -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: #D4D4D4",
1492-
"light_plus": "keyword.operator: #000000",
1491+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
1492+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
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": "string.regexp: #D16969",
1503-
"light_plus": "string.regexp: #811F3F",
1502+
"dark_plus": "punctuation.definition.group.regexp: #D7BA7D",
1503+
"light_plus": "punctuation.definition.group.regexp: #FF0000",
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: #C586C0",
1558-
"light_plus": "keyword.control: #AF00DB",
1557+
"dark_plus": "keyword.control.anchor.regexp: #C586C0",
1558+
"light_plus": "keyword.control.anchor.regexp: #09885A",
15591559
"dark_vs": "keyword.control: #569CD6",
15601560
"light_vs": "keyword.control: #0000FF",
15611561
"hc_black": "keyword.control: #C586C0"

extensions/python/test/colorize-results/test_py.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5338,8 +5338,8 @@
53385338
"c": "*",
53395339
"t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp",
53405340
"r": {
5341-
"dark_plus": "keyword.operator: #D4D4D4",
5342-
"light_plus": "keyword.operator: #000000",
5341+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
5342+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
53435343
"dark_vs": "keyword.operator: #D4D4D4",
53445344
"light_vs": "keyword.operator: #000000",
53455345
"hc_black": "keyword.operator: #D4D4D4"
@@ -5371,8 +5371,8 @@
53715371
"c": "*",
53725372
"t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp",
53735373
"r": {
5374-
"dark_plus": "keyword.operator: #D4D4D4",
5375-
"light_plus": "keyword.operator: #000000",
5374+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
5375+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
53765376
"dark_vs": "keyword.operator: #D4D4D4",
53775377
"light_vs": "keyword.operator: #000000",
53785378
"hc_black": "keyword.operator: #D4D4D4"
@@ -5426,8 +5426,8 @@
54265426
"c": "+",
54275427
"t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp",
54285428
"r": {
5429-
"dark_plus": "keyword.operator: #D4D4D4",
5430-
"light_plus": "keyword.operator: #000000",
5429+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
5430+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
54315431
"dark_vs": "keyword.operator: #D4D4D4",
54325432
"light_vs": "keyword.operator: #000000",
54335433
"hc_black": "keyword.operator: #D4D4D4"
@@ -5470,8 +5470,8 @@
54705470
"c": "+",
54715471
"t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp",
54725472
"r": {
5473-
"dark_plus": "keyword.operator: #D4D4D4",
5474-
"light_plus": "keyword.operator: #000000",
5473+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
5474+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
54755475
"dark_vs": "keyword.operator: #D4D4D4",
54765476
"light_vs": "keyword.operator: #000000",
54775477
"hc_black": "keyword.operator: #D4D4D4"
@@ -5503,8 +5503,8 @@
55035503
"c": "*",
55045504
"t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp",
55055505
"r": {
5506-
"dark_plus": "keyword.operator: #D4D4D4",
5507-
"light_plus": "keyword.operator: #000000",
5506+
"dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4",
5507+
"light_plus": "keyword.operator.quantifier.regexp: #0000FF",
55085508
"dark_vs": "keyword.operator: #D4D4D4",
55095509
"light_vs": "keyword.operator: #000000",
55105510
"hc_black": "keyword.operator: #D4D4D4"

extensions/theme-defaults/themes/dark_plus.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,29 @@
101101
"settings": {
102102
"foreground": "#CE9178"
103103
}
104+
},
105+
{
106+
"scope": [
107+
"punctuation.definition.group.regexp",
108+
"punctuation.definition.group.assertion.regexp",
109+
"punctuation.definition.character-class.regexp",
110+
"keyword.operator.negation.regexp"
111+
],
112+
"settings": {
113+
"foreground": "#d7ba7d"
114+
}
115+
},
116+
{
117+
"scope": "keyword.operator.quantifier.regexp",
118+
"settings": {
119+
"foreground": "#d4d4d4"
120+
}
121+
},
122+
{
123+
"scope": "keyword.control.anchor.regexp",
124+
"settings": {
125+
"foreground": "#C586C0"
126+
}
104127
}
105128
]
106129
}

extensions/theme-defaults/themes/light_plus.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,29 @@
101101
"settings": {
102102
"foreground": "#0451a5"
103103
}
104+
},
105+
{
106+
"scope": [
107+
"punctuation.definition.group.regexp",
108+
"punctuation.definition.group.assertion.regexp",
109+
"punctuation.definition.character-class.regexp",
110+
"keyword.operator.negation.regexp"
111+
],
112+
"settings": {
113+
"foreground": "#ff0000"
114+
}
115+
},
116+
{
117+
"scope": "keyword.operator.quantifier.regexp",
118+
"settings": {
119+
"foreground": "#0000ff"
120+
}
121+
},
122+
{
123+
"scope": "keyword.control.anchor.regexp",
124+
"settings": {
125+
"foreground": "#09885a"
126+
}
104127
}
105128
]
106129
}

0 commit comments

Comments
 (0)