From 845fa13b416abd6ee5cf34c5ffbbfa7bf12d0575 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 14 Sep 2017 14:45:16 -0700 Subject: [PATCH] Tweak colorization of regexp for light+ and dark+ --- .../colorize-results/test-regex_coffee.json | 16 ++-- .../test/colorize-results/test_coffee.json | 36 ++++----- .../make/test/colorize-results/makefile.json | 20 ++--- .../perl/test/colorize-results/test2_pl.json | 16 ++-- .../perl/test/colorize-results/test_pl.json | 36 ++++----- extensions/php/package.json | 2 +- .../colorize-results/issue-28354_php.json | 8 +- .../python/test/colorize-results/test_py.json | 76 +++++++++---------- .../ruby/test/colorize-results/test_rb.json | 16 ++-- .../scss/test/colorize-results/test_scss.json | 12 +-- .../theme-defaults/themes/dark_plus.json | 39 +++++++--- .../theme-defaults/themes/light_plus.json | 31 ++++++-- 12 files changed, 170 insertions(+), 138 deletions(-) diff --git a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json index 909a6112f35..445fab1f1c2 100644 --- a/extensions/coffeescript/test/colorize-results/test-regex_coffee.json +++ b/extensions/coffeescript/test/colorize-results/test-regex_coffee.json @@ -69,8 +69,8 @@ "c": "(", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -80,8 +80,8 @@ "c": "\\d", "t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.character-class.regexp: #D16969", + "light_plus": "constant.character.character-class.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -91,8 +91,8 @@ "c": "+", "t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -102,8 +102,8 @@ "c": ")", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" diff --git a/extensions/coffeescript/test/colorize-results/test_coffee.json b/extensions/coffeescript/test/colorize-results/test_coffee.json index 4320ae579e6..a36d10633bf 100644 --- a/extensions/coffeescript/test/colorize-results/test_coffee.json +++ b/extensions/coffeescript/test/colorize-results/test_coffee.json @@ -1378,8 +1378,8 @@ "c": "(", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -1389,8 +1389,8 @@ "c": "\\d", "t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.character-class.regexp: #D16969", + "light_plus": "constant.character.character-class.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -1400,8 +1400,8 @@ "c": "+", "t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -1411,8 +1411,8 @@ "c": ")", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -1466,8 +1466,8 @@ "c": "(", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -1477,8 +1477,8 @@ "c": "\\w", "t": "source.coffee string.regexp.coffee meta.group.regexp constant.character.character-class.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.character-class.regexp: #D16969", + "light_plus": "constant.character.character-class.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -1488,8 +1488,8 @@ "c": "*", "t": "source.coffee string.regexp.coffee meta.group.regexp keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -1499,8 +1499,8 @@ "c": ")", "t": "source.coffee string.regexp.coffee meta.group.regexp punctuation.definition.group.regexp", "r": { - "dark_plus": "punctuation.definition.group.regexp: #D7BA7D", - "light_plus": "punctuation.definition.group.regexp: #FF0000", + "dark_plus": "punctuation.definition.group.regexp: #CE9178", + "light_plus": "punctuation.definition.group.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -1554,8 +1554,8 @@ "c": "$", "t": "source.coffee string.regexp.coffee keyword.control.anchor.regexp", "r": { - "dark_plus": "keyword.control.anchor.regexp: #C586C0", - "light_plus": "keyword.control.anchor.regexp: #09885A", + "dark_plus": "keyword.control.anchor.regexp: #DCDCAA", + "light_plus": "keyword.control.anchor.regexp: #FF0000", "dark_vs": "keyword.control: #569CD6", "light_vs": "keyword.control: #0000FF", "hc_black": "keyword.control: #C586C0" diff --git a/extensions/make/test/colorize-results/makefile.json b/extensions/make/test/colorize-results/makefile.json index 1fb93bab87c..94d9b456703 100644 --- a/extensions/make/test/colorize-results/makefile.json +++ b/extensions/make/test/colorize-results/makefile.json @@ -135,8 +135,8 @@ "c": "\\", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6" @@ -278,8 +278,8 @@ "c": "\\", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6" @@ -322,8 +322,8 @@ "c": "\\", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile comment.line.number-sign.makefile constant.character.escape.continuation.makefile", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "comment: #608B4E", "light_vs": "comment: #008000", "hc_black": "constant.character: #569CD6" @@ -377,8 +377,8 @@ "c": "\\", "t": "source.makefile comment.line.number-sign.makefile constant.character.escape.continuation.makefile", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "comment: #608B4E", "light_vs": "comment: #008000", "hc_black": "constant.character: #569CD6" @@ -553,8 +553,8 @@ "c": "\\", "t": "source.makefile meta.scope.target.makefile meta.scope.prerequisites.makefile constant.character.escape.continuation.makefile", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "default: #D4D4D4", "light_vs": "default: #000000", "hc_black": "constant.character: #569CD6" diff --git a/extensions/perl/test/colorize-results/test2_pl.json b/extensions/perl/test/colorize-results/test2_pl.json index af312ff8930..bf690458af4 100644 --- a/extensions/perl/test/colorize-results/test2_pl.json +++ b/extensions/perl/test/colorize-results/test2_pl.json @@ -1301,8 +1301,8 @@ "c": "\\d\\d\\d", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -1323,8 +1323,8 @@ "c": "\\d\\d", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -1345,8 +1345,8 @@ "c": "\\d\\d", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -1774,8 +1774,8 @@ "c": "\\d", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" diff --git a/extensions/perl/test/colorize-results/test_pl.json b/extensions/perl/test/colorize-results/test_pl.json index 8062166dc5c..e6551c2c639 100644 --- a/extensions/perl/test/colorize-results/test_pl.json +++ b/extensions/perl/test/colorize-results/test_pl.json @@ -388,8 +388,8 @@ "c": "\\s", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -410,8 +410,8 @@ "c": "\\s", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -432,8 +432,8 @@ "c": "\\(", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -454,8 +454,8 @@ "c": "\\)", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -476,8 +476,8 @@ "c": "\\)", "t": "source.perl string.regexp.find.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -674,8 +674,8 @@ "c": "\\n", "t": "source.perl string.quoted.double.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -949,8 +949,8 @@ "c": "\\n", "t": "source.perl string.quoted.double.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -1444,8 +1444,8 @@ "c": "\\n", "t": "source.perl string.quoted.double.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -2280,8 +2280,8 @@ "c": "\\n", "t": "source.perl string.quoted.double.perl constant.character.escape.perl", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" diff --git a/extensions/php/package.json b/extensions/php/package.json index e3b313bb321..3f50c17669b 100644 --- a/extensions/php/package.json +++ b/extensions/php/package.json @@ -27,7 +27,7 @@ "PHP", "php" ], - "firstLine": "^#!/.*\\bphp\\b", + "firstLine": "^#!/.*\\bphp\\b", "mimetypes": [ "application/x-php" ], diff --git a/extensions/php/test/colorize-results/issue-28354_php.json b/extensions/php/test/colorize-results/issue-28354_php.json index 5f1b87f3834..10314265464 100644 --- a/extensions/php/test/colorize-results/issue-28354_php.json +++ b/extensions/php/test/colorize-results/issue-28354_php.json @@ -278,8 +278,8 @@ "c": "\\'", "t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -377,8 +377,8 @@ "c": "\\'", "t": "text.html.php meta.embedded.block.html source.js meta.embedded.block.php source.php string.quoted.single.php constant.character.escape.php", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" diff --git a/extensions/python/test/colorize-results/test_py.json b/extensions/python/test/colorize-results/test_py.json index ef8d364c52b..235958f078f 100644 --- a/extensions/python/test/colorize-results/test_py.json +++ b/extensions/python/test/colorize-results/test_py.json @@ -5294,8 +5294,8 @@ "c": "(", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5305,8 +5305,8 @@ "c": "[", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp punctuation.character.set.begin.regexp constant.other.set.regexp", "r": { - "dark_plus": "meta.character.set.regexp: #D7BA7D", - "light_plus": "meta.character.set.regexp: #FF0000", + "dark_plus": "punctuation.character.set.begin.regexp: #CE9178", + "light_plus": "punctuation.character.set.begin.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5316,8 +5316,8 @@ "c": "0-9-", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp constant.character.set.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.set.regexp: #D16969", + "light_plus": "constant.character.set.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -5327,8 +5327,8 @@ "c": "]", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp punctuation.character.set.end.regexp constant.other.set.regexp", "r": { - "dark_plus": "meta.character.set.regexp: #D7BA7D", - "light_plus": "meta.character.set.regexp: #FF0000", + "dark_plus": "punctuation.character.set.end.regexp: #CE9178", + "light_plus": "punctuation.character.set.end.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5338,8 +5338,8 @@ "c": "*", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -5349,8 +5349,8 @@ "c": ")", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.end.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5371,8 +5371,8 @@ "c": "*", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -5382,8 +5382,8 @@ "c": "(", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5393,8 +5393,8 @@ "c": "[", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp punctuation.character.set.begin.regexp constant.other.set.regexp", "r": { - "dark_plus": "meta.character.set.regexp: #D7BA7D", - "light_plus": "meta.character.set.regexp: #FF0000", + "dark_plus": "punctuation.character.set.begin.regexp: #CE9178", + "light_plus": "punctuation.character.set.begin.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5404,8 +5404,8 @@ "c": "A-Za-z", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp constant.character.set.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.set.regexp: #D16969", + "light_plus": "constant.character.set.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -5415,8 +5415,8 @@ "c": "]", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python meta.character.set.regexp punctuation.character.set.end.regexp constant.other.set.regexp", "r": { - "dark_plus": "meta.character.set.regexp: #D7BA7D", - "light_plus": "meta.character.set.regexp: #FF0000", + "dark_plus": "punctuation.character.set.end.regexp: #CE9178", + "light_plus": "punctuation.character.set.end.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5426,8 +5426,8 @@ "c": "+", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -5437,8 +5437,8 @@ "c": ")", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.end.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5470,8 +5470,8 @@ "c": "+", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -5481,8 +5481,8 @@ "c": "(", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -5503,8 +5503,8 @@ "c": "*", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python keyword.operator.quantifier.regexp", "r": { - "dark_plus": "keyword.operator.quantifier.regexp: #D4D4D4", - "light_plus": "keyword.operator.quantifier.regexp: #0000FF", + "dark_plus": "keyword.operator.quantifier.regexp: #D7BA7D", + "light_plus": "keyword.operator.quantifier.regexp: #000000", "dark_vs": "keyword.operator: #D4D4D4", "light_vs": "keyword.operator: #000000", "hc_black": "keyword.operator: #D4D4D4" @@ -5514,8 +5514,8 @@ "c": ")", "t": "source.python meta.function-call.python meta.function-call.arguments.python string.regexp.quoted.single.python support.other.parenthesis.regexp punctuation.parenthesis.end.regexp", "r": { - "dark_plus": "support.other.parenthesis.regexp: #D7BA7D", - "light_plus": "support.other.parenthesis.regexp: #FF0000", + "dark_plus": "support.other.parenthesis.regexp: #CE9178", + "light_plus": "support.other.parenthesis.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -6504,8 +6504,8 @@ "c": "[", "t": "source.python string.regexp.quoted.multi.python meta.character.set.regexp punctuation.character.set.begin.regexp constant.other.set.regexp", "r": { - "dark_plus": "meta.character.set.regexp: #D7BA7D", - "light_plus": "meta.character.set.regexp: #FF0000", + "dark_plus": "punctuation.character.set.begin.regexp: #CE9178", + "light_plus": "punctuation.character.set.begin.regexp: #D16969", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "string.regexp: #D16969" @@ -6515,8 +6515,8 @@ "c": "1,2)`` leads to", "t": "source.python string.regexp.quoted.multi.python meta.character.set.regexp constant.character.set.regexp", "r": { - "dark_plus": "constant.character: #569CD6", - "light_plus": "constant.character: #0000FF", + "dark_plus": "constant.character.set.regexp: #D16969", + "light_plus": "constant.character.set.regexp: #811F3F", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" diff --git a/extensions/ruby/test/colorize-results/test_rb.json b/extensions/ruby/test/colorize-results/test_rb.json index 005f04f37c3..996dbbf0192 100644 --- a/extensions/ruby/test/colorize-results/test_rb.json +++ b/extensions/ruby/test/colorize-results/test_rb.json @@ -2500,8 +2500,8 @@ "c": "\\d", "t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -2522,8 +2522,8 @@ "c": "\\.\\d", "t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -2544,8 +2544,8 @@ "c": "\\.\\d", "t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" @@ -2577,8 +2577,8 @@ "c": "\\.\\d", "t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby meta.group.regexp.ruby constant.character.escape.ruby", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string.regexp: #D16969", "light_vs": "string.regexp: #811F3F", "hc_black": "constant.character: #569CD6" diff --git a/extensions/scss/test/colorize-results/test_scss.json b/extensions/scss/test/colorize-results/test_scss.json index 301d6fc35fd..cc598d4c7a2 100644 --- a/extensions/scss/test/colorize-results/test_scss.json +++ b/extensions/scss/test/colorize-results/test_scss.json @@ -20716,8 +20716,8 @@ "c": "\\\\", "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-list.scss meta.property-value.scss string.quoted.single.scss constant.character.escape.scss", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -20837,8 +20837,8 @@ "c": "\\'", "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss string.quoted.single.scss constant.character.escape.scss", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" @@ -20914,8 +20914,8 @@ "c": "\\\"", "t": "source.css.scss meta.at-rule.each.scss meta.at-rule.while.scss meta.property-list.scss meta.property-value.scss string.quoted.double.scss constant.character.escape.scss", "r": { - "dark_plus": "constant.character.escape: #C586C0", - "light_plus": "constant.character.escape: #FF0000", + "dark_plus": "constant.character.escape: #D7BA7D", + "light_plus": "constant.character.escape: #A31515", "dark_vs": "string: #CE9178", "light_vs": "string: #A31515", "hc_black": "constant.character: #569CD6" diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json index 55052a69d66..6fdfb2263ce 100644 --- a/extensions/theme-defaults/themes/dark_plus.json +++ b/extensions/theme-defaults/themes/dark_plus.json @@ -103,28 +103,44 @@ } }, { + "name": "Regular expression groups", "scope": [ "punctuation.definition.group.regexp", "punctuation.definition.group.assertion.regexp", "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp", - "meta.character.set.regexp" + "support.other.parenthesis.regexp" ], "settings": { - "foreground": "#d7ba7d" + "foreground": "#CE9178" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#d16969" + } + }, + { + "scope": [ + "keyword.operator.or.regexp", + "keyword.control.anchor.regexp" + ], + "settings": { + "foreground": "#DCDCAA" } }, { "scope": "keyword.operator.quantifier.regexp", "settings": { - "foreground": "#d4d4d4" - } - }, - { - "scope": "keyword.control.anchor.regexp", - "settings": { - "foreground": "#C586C0" + "foreground": "#d7ba7d" } }, { @@ -136,9 +152,8 @@ { "scope": "constant.character.escape", "settings": { - "foreground": "#C586C0" + "foreground": "#d7ba7d" } } - ] } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json index b533627c9f2..3d5775ecec5 100644 --- a/extensions/theme-defaults/themes/light_plus.json +++ b/extensions/theme-defaults/themes/light_plus.json @@ -103,28 +103,44 @@ } }, { + "name": "Regular expression groups", "scope": [ "punctuation.definition.group.regexp", "punctuation.definition.group.assertion.regexp", "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp", - "meta.character.set.regexp" + "support.other.parenthesis.regexp" ], "settings": { - "foreground": "#ff0000" + "foreground": "#d16969" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#811f3f" } }, { "scope": "keyword.operator.quantifier.regexp", "settings": { - "foreground": "#0000ff" + "foreground": "#000000" } }, { - "scope": "keyword.control.anchor.regexp", + "scope": [ + "keyword.operator.or.regexp", + "keyword.control.anchor.regexp" + ], "settings": { - "foreground": "#09885a" + "foreground": "#ff0000" } }, { @@ -136,8 +152,9 @@ { "scope": "constant.character.escape", "settings": { - "foreground": "#ff0000" + "foreground": "#a31515" } } + ] } \ No newline at end of file