Update themes with c++ scopes based on discussion

Part of #80783
2024-07-17 11:07:22 +00:00 · 2019-09-19 11:22:47 +02:00 · 2019-09-19 11:22:47 +02:00 · c1fdabc4f2
parent ba439b2406
commit c1fdabc4f2
12 changed files with 195 additions and 280 deletions
--- a/extensions/cpp/test/colorize-results/test-23630_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23630_cpp.json
@ -3,10 +3,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -14,10 +14,10 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -36,8 +36,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -58,10 +58,10 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -69,10 +69,10 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -91,8 +91,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -102,10 +102,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -113,10 +113,10 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	}
--- a/extensions/cpp/test/colorize-results/test-23850_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23850_cpp.json
@ -3,10 +3,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -14,10 +14,10 @@
 		"c": "ifndef",
 		"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -36,8 +36,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -47,10 +47,10 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -58,10 +58,10 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -80,8 +80,8 @@
 		"c": "_UCRT",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -91,10 +91,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -102,10 +102,10 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	}
--- a/extensions/cpp/test/colorize-results/test-78769_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-78769_cpp.json
@ -3,10 +3,10 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -14,10 +14,10 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -36,8 +36,8 @@
 		"c": "DOCTEST_IMPLEMENT_FIXTURE",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -58,8 +58,8 @@
 		"c": "der",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@ -91,8 +91,8 @@
 		"c": "base",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@ -124,8 +124,8 @@
 		"c": "func",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
@ -157,8 +157,8 @@
 		"c": "decorators",
 		"t": "source.cpp meta.preprocessor.macro.cpp variable.parameter.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "variable: #9CDCFE"
--- a/extensions/cpp/test/colorize-results/test_c.json
+++ b/extensions/cpp/test/colorize-results/test_c.json
@ -69,10 +69,10 @@
 		"c": "#",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c punctuation.definition.directive.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -80,10 +80,10 @@
 		"c": "include",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -135,10 +135,10 @@
 		"c": "#",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c punctuation.definition.directive.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -146,10 +146,10 @@
 		"c": "include",
 		"t": "source.c meta.preprocessor.include.c keyword.control.directive.include.c",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@ -3,10 +3,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -14,10 +14,10 @@
 		"c": "if",
 		"t": "source.cpp keyword.control.directive.conditional.if.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -36,8 +36,8 @@
 		"c": "B4G_DEBUG_CHECK",
 		"t": "source.cpp meta.preprocessor.conditional.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -652,10 +652,10 @@
 		"c": "#",
 		"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -663,10 +663,10 @@
 		"c": "endif",
 		"t": "source.cpp keyword.control.directive.endif.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -751,8 +751,8 @@
 		"c": "obj",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@ -1037,7 +1037,7 @@
 		"c": "x",
 		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.property.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.other.property: #DADADA",
+			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@ -25,10 +25,10 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -36,10 +36,10 @@
 		"c": "include",
 		"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -157,10 +157,10 @@
 		"c": "#",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -168,10 +168,10 @@
 		"c": "define",
 		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
-			"dark_plus": "source.cpp keyword.control.directive: #9B9B9B",
-			"light_plus": "source.cpp keyword.control.directive: #808080",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -190,8 +190,8 @@
 		"c": "EXTERN_C",
 		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
-			"dark_plus": "source.cpp entity.name.function.preprocessor: #C586C0",
-			"light_plus": "source.cpp entity.name.function.preprocessor: #AF00DB",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "meta.preprocessor: #569CD6",
 			"light_vs": "meta.preprocessor: #0000FF",
 			"hc_black": "entity.name.function: #DCDCAA"
@ -817,8 +817,8 @@
 		"c": "x",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
@ -872,8 +872,8 @@
 		"c": "y",
 		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
-			"dark_plus": "source.cpp variable.parameter: #7F7F7F",
-			"light_plus": "source.cpp variable.parameter: #808080",
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "variable: #9CDCFE"
--- a/extensions/objective-c/test/colorize-results/test_m.json
+++ b/extensions/objective-c/test/colorize-results/test_m.json
@ -47,10 +47,10 @@
 		"c": "#",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc punctuation.definition.directive.objc",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -58,10 +58,10 @@
 		"c": "import",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -113,10 +113,10 @@
 		"c": "#",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc punctuation.definition.directive.objc",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -124,10 +124,10 @@
 		"c": "import",
 		"t": "source.objc meta.preprocessor.include.objc keyword.control.directive.import.objc",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
--- a/extensions/objective-c/test/colorize-results/test_mm.json
+++ b/extensions/objective-c/test/colorize-results/test_mm.json
@ -47,10 +47,10 @@
 		"c": "#",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp punctuation.definition.directive.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -58,10 +58,10 @@
 		"c": "import",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -113,10 +113,10 @@
 		"c": "#",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp punctuation.definition.directive.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
@ -124,10 +124,10 @@
 		"c": "import",
 		"t": "source.objcpp meta.preprocessor.include.objcpp keyword.control.directive.import.objcpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
+			"dark_plus": "keyword.control.directive: #569CD6",
+			"light_plus": "keyword.control.directive: #0000FF",
+			"dark_vs": "keyword.control.directive: #569CD6",
+			"light_vs": "keyword.control.directive: #0000FF",
 			"hc_black": "keyword.control: #C586C0"
 		}
 	},
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@ -171,72 +171,11 @@
 				"foreground": "#d7ba7d"
 			}
 		},
-		// Scopes that are potentially C++ only follow
 		{
-			"scope": "source.cpp entity.name",
+			"scope": "entity.name.label",
 			"settings": {
 				"foreground": "#C8C8C8"
 			}
-		},
-		{
-			"scope": "source.cpp keyword.control.directive",
-			"settings": {
-				"foreground": "#9B9B9B"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.function.operator",
-			"settings": {
-				"foreground": "#B4B4B4"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.function.preprocessor",
-			"settings": {
-				"foreground": "#C586C0"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.label",
-			"settings": {
-				"foreground": "#C8C8C8"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.operator.custom-literal",
-			"settings": {
-				"foreground": "#DADADA"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.operator.custom-literal.number",
-			"settings": {
-				"foreground": "#B5CEA8"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.operator.custom-literal.string",
-			"settings": {
-				"foreground": "#ce9178"
-			}
-		},
-		{
-			"scope": "source.cpp variable.other.enummember",
-			"settings": {
-				"foreground": "#B8D7A3"
-			}
-		},
-		{
-			"scope": "source.cpp variable.other.property",
-			"settings": {
-				"foreground": "#DADADA"
-			}
-		},
-		{
-			"scope": "source.cpp variable.parameter",
-			"settings": {
-				"foreground": "#7F7F7F"
-			}
 		}
 	]
 }
--- a/extensions/theme-defaults/themes/dark_vs.json
+++ b/extensions/theme-defaults/themes/dark_vs.json
@ -44,7 +44,9 @@
 		},
 		{
 			"scope": [
-				"constant.numeric"
+				"constant.numeric",
+				"entity.name.operator.custom-literal.number",
+				"variable.other.enummember"
 			],
 			"settings": {
 				"foreground": "#b5cea8"
@ -166,7 +168,10 @@
 			}
 		},
 		{
-			"scope": "meta.preprocessor",
+			"scope": [
+				"meta.preprocessor",
+				"keyword.control.directive"
+			],
 			"settings": {
 				"foreground": "#569cd6"
 			}
@ -214,7 +219,10 @@
 			}
 		},
 		{
-			"scope": "string",
+			"scope": [
+				"string",
+				"entity.name.operator.custom-literal.string",
+			],
 			"settings": {
 				"foreground": "#ce9178"
 			}
@ -347,4 +355,4 @@
 			}
 		}
 	]
-}
+}
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@ -171,54 +171,11 @@
 				"foreground": "#ff0000"
 			}
 		},
-		// Scopes that are potentially C++ only follow
 		{
-			"scope": "source.cpp entity.name",
+			"scope": "entity.name.label",
 			"settings": {
 				"foreground": "#000000"
 			}
-		},
-		{
-			"scope": "source.cpp keyword.control.directive",
-			"settings": {
-				"foreground": "#808080"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.function.operator",
-			"settings": {
-				"foreground": "#008080"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.function.preprocessor",
-			"settings": {
-				"foreground": "#AF00DB"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.label",
-			"settings": {
-				"foreground": "#000000"
-			}
-		},
-		{
-			"scope": "source.cpp entity.name.operator.custom-literal.string",
-			"settings": {
-				"foreground": "#0451a5"
-			}
-		},
-		{
-			"scope": "source.cpp variable.other.enummember",
-			"settings": {
-				"foreground": "#2F4F4F"
-			}
-		},
-		{
-			"scope": "source.cpp variable.parameter",
-			"settings": {
-				"foreground": "#808080"
-			}
 		}
 	]
 }
--- a/extensions/theme-defaults/themes/light_vs.json
+++ b/extensions/theme-defaults/themes/light_vs.json
@ -4,7 +4,10 @@
 	"include": "./light_defaults.json",
 	"tokenColors": [
 		{
-			"scope": ["meta.embedded", "source.groovy.embedded"],
+			"scope": [
+				"meta.embedded",
+				"source.groovy.embedded"
+			],
 			"settings": {
 				"foreground": "#000000ff"
 			}
@ -41,7 +44,9 @@
 		},
 		{
 			"scope": [
-				"constant.numeric"
+				"constant.numeric",
+				"entity.name.operator.custom-literal.number",
+				"variable.other.enummember"
 			],
 			"settings": {
 				"foreground": "#09885a"
@ -161,7 +166,10 @@
 			}
 		},
 		{
-			"scope": "meta.preprocessor",
+			"scope": [
+				"meta.preprocessor",
+				"keyword.control.directive"
+			],
 			"settings": {
 				"foreground": "#0000ff"
 			}
@ -203,7 +211,10 @@
 			}
 		},
 		{
-			"scope": "string",
+			"scope": [
+				"string",
+				"entity.name.operator.custom-literal.string",
+			],
 			"settings": {
 				"foreground": "#a31515"
 			}
@ -368,4 +379,4 @@
 			}
 		}
 	]
-}
+}