From 6ba021ba320ee21bd533cd51dc756a6a56f92c4c Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Thu, 19 Sep 2019 11:49:52 +0200 Subject: [PATCH] Add more scopes to themes based on feedback for C++ and discussion Part of #80783 --- .../objective-c/test/colorize-results/test_m.json | 8 ++++---- .../objective-c/test/colorize-results/test_mm.json | 8 ++++---- extensions/theme-defaults/themes/dark_plus.json | 4 +++- extensions/theme-defaults/themes/dark_vs.json | 14 +++++++++++--- extensions/theme-defaults/themes/light_plus.json | 4 +++- extensions/theme-defaults/themes/light_vs.json | 14 +++++++++++--- 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/extensions/objective-c/test/colorize-results/test_m.json b/extensions/objective-c/test/colorize-results/test_m.json index c66e2aee747..a8443d1aee6 100644 --- a/extensions/objective-c/test/colorize-results/test_m.json +++ b/extensions/objective-c/test/colorize-results/test_m.json @@ -2038,10 +2038,10 @@ "c": "-", "t": "source.objc meta.implementation.objc meta.scope.implementation.objc meta.function-with-body.objc meta.block.objc keyword.operator.minus.exponent.decimal.objc", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", + "dark_plus": "keyword.operator.minus.exponent: #B5CEA8", + "light_plus": "keyword.operator.minus.exponent: #09885A", + "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", + "light_vs": "keyword.operator.minus.exponent: #09885A", "hc_black": "keyword.operator: #D4D4D4" } }, diff --git a/extensions/objective-c/test/colorize-results/test_mm.json b/extensions/objective-c/test/colorize-results/test_mm.json index 151025f3009..cc741a7bf19 100644 --- a/extensions/objective-c/test/colorize-results/test_mm.json +++ b/extensions/objective-c/test/colorize-results/test_mm.json @@ -2038,10 +2038,10 @@ "c": "-", "t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp keyword.operator.minus.exponent.decimal.objcpp", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", + "dark_plus": "keyword.operator.minus.exponent: #B5CEA8", + "light_plus": "keyword.operator.minus.exponent: #09885A", + "dark_vs": "keyword.operator.minus.exponent: #B5CEA8", + "light_vs": "keyword.operator.minus.exponent: #09885A", "hc_black": "keyword.operator: #D4D4D4" } }, diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json index 09a4112cd9d..f8a0ff5b7c5 100644 --- a/extensions/theme-defaults/themes/dark_plus.json +++ b/extensions/theme-defaults/themes/dark_plus.json @@ -23,6 +23,7 @@ "support.type", "entity.name.type", "entity.name.namespace", + "entity.other.attribute", "entity.name.scope-resolution", "entity.name.class", "storage.type.numeric.go", @@ -76,7 +77,8 @@ "source.cpp keyword.operator.new", "keyword.operator.delete", "keyword.other.using", - "keyword.other.operator" + "keyword.other.operator", + "entity.name.operator" ], "settings": { "foreground": "#C586C0" diff --git a/extensions/theme-defaults/themes/dark_vs.json b/extensions/theme-defaults/themes/dark_vs.json index 168d923d265..34228835df1 100644 --- a/extensions/theme-defaults/themes/dark_vs.json +++ b/extensions/theme-defaults/themes/dark_vs.json @@ -46,7 +46,9 @@ "scope": [ "constant.numeric", "entity.name.operator.custom-literal.number", - "variable.other.enummember" + "variable.other.enummember", + "keyword.operator.plus.exponent", + "keyword.operator.minus.exponent" ], "settings": { "foreground": "#b5cea8" @@ -213,7 +215,10 @@ } }, { - "scope": "storage.modifier", + "scope": [ + "storage.modifier", + "keyword.operator.noexcept" + ], "settings": { "foreground": "#569cd6" } @@ -302,8 +307,11 @@ "keyword.operator.expression", "keyword.operator.cast", "keyword.operator.sizeof", + "keyword.operator.typeid", + "keyword.operator.alignas", "keyword.operator.instanceof", - "keyword.operator.logical.python" + "keyword.operator.logical.python", + "keyword.operator.wordlike" ], "settings": { "foreground": "#569cd6" diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json index af76a4176b7..c7599d60d57 100644 --- a/extensions/theme-defaults/themes/light_plus.json +++ b/extensions/theme-defaults/themes/light_plus.json @@ -23,6 +23,7 @@ "support.type", "entity.name.type", "entity.name.namespace", + "entity.other.attribute", "entity.name.scope-resolution", "entity.name.class", "storage.type.numeric.go", @@ -76,7 +77,8 @@ "source.cpp keyword.operator.new", "source.cpp keyword.operator.delete", "keyword.other.using", - "keyword.other.operator" + "keyword.other.operator", + "entity.name.operator" ], "settings": { "foreground": "#AF00DB" diff --git a/extensions/theme-defaults/themes/light_vs.json b/extensions/theme-defaults/themes/light_vs.json index c2393f6b05f..96cb7a76fa6 100644 --- a/extensions/theme-defaults/themes/light_vs.json +++ b/extensions/theme-defaults/themes/light_vs.json @@ -46,7 +46,9 @@ "scope": [ "constant.numeric", "entity.name.operator.custom-literal.number", - "variable.other.enummember" + "variable.other.enummember", + "keyword.operator.plus.exponent", + "keyword.operator.minus.exponent" ], "settings": { "foreground": "#09885a" @@ -205,7 +207,10 @@ } }, { - "scope": "storage.modifier", + "scope": [ + "storage.modifier", + "keyword.operator.noexcept" + ], "settings": { "foreground": "#0000ff" } @@ -326,8 +331,11 @@ "keyword.operator.expression", "keyword.operator.cast", "keyword.operator.sizeof", + "keyword.operator.typeid", + "keyword.operator.alignas", "keyword.operator.instanceof", - "keyword.operator.logical.python" + "keyword.operator.logical.python", + "keyword.operator.wordlike" ], "settings": { "foreground": "#0000ff"