Skip to content

Commit

Permalink
Undo change to scope/coloring of #includes in cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
alexr00 committed Sep 30, 2019
1 parent 459f207 commit 09836b5
Show file tree
Hide file tree
Showing 10 changed files with 138 additions and 140 deletions.
48 changes: 24 additions & 24 deletions extensions/cpp/test/colorize-results/test-23630_cpp.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -58,21 +58,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -102,21 +102,21 @@
"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"
}
},
{
"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"
}
}
Expand Down
48 changes: 24 additions & 24 deletions extensions/cpp/test/colorize-results/test-23850_cpp.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -47,21 +47,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -91,21 +91,21 @@
"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"
}
},
{
"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"
}
}
Expand Down
16 changes: 8 additions & 8 deletions extensions/cpp/test/colorize-results/test-78769_cpp.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"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"
}
},
{
"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"
}
},
Expand Down
32 changes: 16 additions & 16 deletions extensions/cpp/test/colorize-results/test_c.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -135,21 +135,21 @@
"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"
}
},
{
"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"
}
},
Expand Down
32 changes: 16 additions & 16 deletions extensions/cpp/test/colorize-results/test_cc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -652,21 +652,21 @@
"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"
}
},
{
"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"
}
},
Expand Down
32 changes: 16 additions & 16 deletions extensions/cpp/test/colorize-results/test_cpp.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
"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"
}
},
{
"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"
}
},
Expand Down Expand Up @@ -157,21 +157,21 @@
"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"
}
},
{
"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"
}
},
Expand Down
Loading

0 comments on commit 09836b5

Please sign in to comment.