maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Undo change to scope/coloring of #includes in cpp

Browse source
This commit is contained in:
Alex Ross 2019-09-30 11:57:34 +02:00
parent 459f2071e5
commit 09836b5a84
10 changed files with 138 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
extensions/cpp/test/colorize-results/test-23630_cpp.json
View file

@ -3,10 +3,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -14,10 +14,10 @@
"c": "ifndef",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -58,10 +58,10 @@
"c": "#",
"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -102,10 +102,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -113,10 +113,10 @@
"c": "endif",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
}

48
extensions/cpp/test/colorize-results/test-23850_cpp.json
View file

@ -3,10 +3,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -14,10 +14,10 @@
"c": "ifndef",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -47,10 +47,10 @@
"c": "#",
"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -91,10 +91,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -102,10 +102,10 @@
"c": "endif",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
}

16
extensions/cpp/test/colorize-results/test-78769_cpp.json
View file

@ -3,10 +3,10 @@
"c": "#",
"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

32
extensions/cpp/test/colorize-results/test_c.json
View file

@ -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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

32
extensions/cpp/test/colorize-results/test_cc.json
View file

@ -3,10 +3,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.conditional.if.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -14,10 +14,10 @@
"c": "if",
"t": "source.cpp keyword.control.directive.conditional.if.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -652,10 +652,10 @@
"c": "#",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},
@ -663,10 +663,10 @@
"c": "endif",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

32
extensions/cpp/test/colorize-results/test_cpp.json
View file

@ -25,10 +25,10 @@
"c": "#",
"t": "source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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": "keyword.control.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

32
extensions/objective-c/test/colorize-results/test_m.json
View file

@ -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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

32
extensions/objective-c/test/colorize-results/test_mm.json
View file

@ -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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #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.directive: #569CD6",
"light_plus": "keyword.control.directive: #0000FF",
"dark_vs": "keyword.control.directive: #569CD6",
"light_vs": "keyword.control.directive: #0000FF",
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
"dark_vs": "keyword.control: #569CD6",
"light_vs": "keyword.control: #0000FF",
"hc_black": "keyword.control: #C586C0"
}
},

3
extensions/theme-defaults/themes/dark_vs.json
View file

@ -171,8 +171,7 @@
},
{
"scope": [
"meta.preprocessor",
"keyword.control.directive"
"meta.preprocessor"
],
"settings": {
"foreground": "#569cd6"

3
extensions/theme-defaults/themes/light_vs.json
View file

@ -169,8 +169,7 @@
},
{
"scope": [
"meta.preprocessor",
"keyword.control.directive"
"meta.preprocessor"
],
"settings": {
"foreground": "#0000ff"