development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update C++ grammar

Browse source
This commit is contained in:
Alex Ross 2020-03-23 10:49:14 +01:00
parent a2ea73efe1
commit 60cc1a28a5
5 changed files with 1615 additions and 3268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/cpp/cgmanifest.json
View file

@ -6,11 +6,11 @@
"git": { "git": {
"name": "jeff-hykin/cpp-textmate-grammar", "name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar", "repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "7d3fe7ab806374a3b11ddd8ac4f674cdff20a647" "commitHash": "213d6b9941e6d0f6a7274306ef2a47ec8d93cc27"
} }
}, },
"license": "MIT", "license": "MIT",
"version": "1.14.23", "version": "1.14.26",
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle." "description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
}, },
{ {

4
extensions/cpp/syntaxes/c.tmLanguage.json
View file

@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.", "If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request." "Once accepted there, we are happy to receive an update request."
], ],
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/85b9008b406cc9d3b1c9e779e94cc071116c8426", "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/b23ed8d4bc4e1db4e7c7c2e8c4699c542c7c6cdf",
"name": "C", "name": "C",
"scopeName": "source.c", "scopeName": "source.c",
"patterns": [ "patterns": [
@ -1028,7 +1028,7 @@
} }
] ]
}, },
"evalutation_context": { "evaluation_context": {
"patterns": [ "patterns": [
{ {
"include": "#function-call-innards" "include": "#function-call-innards"

1864
extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

2937
extensions/cpp/syntaxes/cpp.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

74
extensions/cpp/test/colorize-results/test-80644_cpp.json
View file

@ -265,18 +265,18 @@
}, },
{ {
"c": "Foo", "c": "Foo",
"t": "source.cpp meta.function.definition.special.constructor.cpp entity.name.type.constructor.cpp", "t": "source.cpp entity.name.scope-resolution.function.call.cpp",
"r": { "r": {
"dark_plus": "entity.name.type: #4EC9B0", "dark_plus": "entity.name.scope-resolution: #4EC9B0",
"light_plus": "entity.name.type: #267F99", "light_plus": "entity.name.scope-resolution: #267F99",
"dark_vs": "default: #D4D4D4", "dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000", "light_vs": "default: #000000",
"hc_black": "entity.name.type: #4EC9B0" "hc_black": "entity.name.scope-resolution: #4EC9B0"
} }
}, },
{ {
"c": "::", "c": "::",
"t": "source.cpp meta.function.definition.special.constructor.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp", "t": "source.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -287,7 +287,7 @@
}, },
{ {
"c": "Foo", "c": "Foo",
"t": "source.cpp meta.function.definition.special.constructor.cpp entity.name.function.definition.special.constructor.cpp", "t": "source.cpp entity.name.function.call.cpp",
"r": { "r": {
"dark_plus": "entity.name.function: #DCDCAA", "dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26", "light_plus": "entity.name.function: #795E26",
@ -298,7 +298,7 @@
}, },
{ {
"c": "(", "c": "(",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.parameters.begin.bracket.round.special.constructor.cpp", "t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -309,7 +309,7 @@
}, },
{ {
"c": ")", "c": ")",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.parameters.end.bracket.round.special.constructor.cpp", "t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -319,30 +319,8 @@
} }
}, },
{ {
"c": " ", "c": " : ",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp", "t": "source.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": ":",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.separator.initializers.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": " ",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -353,7 +331,7 @@
}, },
{ {
"c": "a", "c": "a",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp entity.name.function.call.initializer.cpp", "t": "source.cpp entity.name.function.call.cpp",
"r": { "r": {
"dark_plus": "entity.name.function: #DCDCAA", "dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26", "light_plus": "entity.name.function: #795E26",
@ -364,7 +342,7 @@
}, },
{ {
"c": "(", "c": "(",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp", "t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -375,7 +353,7 @@
}, },
{ {
"c": "1", "c": "1",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp", "t": "source.cpp constant.numeric.decimal.cpp",
"r": { "r": {
"dark_plus": "constant.numeric: #B5CEA8", "dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658", "light_plus": "constant.numeric: #098658",
@ -386,7 +364,7 @@
}, },
{ {
"c": ")", "c": ")",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp", "t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -397,7 +375,7 @@
}, },
{ {
"c": ",", "c": ",",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.separator.delimiter.comma.cpp", "t": "source.cpp punctuation.separator.delimiter.comma.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -408,7 +386,7 @@
}, },
{ {
"c": " ", "c": " ",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp comment.line.double-slash.cpp", "t": "source.cpp comment.line.double-slash.cpp",
"r": { "r": {
"dark_plus": "comment: #6A9955", "dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000", "light_plus": "comment: #008000",
@ -419,7 +397,7 @@
}, },
{ {
"c": "//", "c": "//",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp", "t": "source.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
"r": { "r": {
"dark_plus": "comment: #6A9955", "dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000", "light_plus": "comment: #008000",
@ -430,7 +408,7 @@
}, },
{ {
"c": " b(2),", "c": " b(2),",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp comment.line.double-slash.cpp", "t": "source.cpp comment.line.double-slash.cpp",
"r": { "r": {
"dark_plus": "comment: #6A9955", "dark_plus": "comment: #6A9955",
"light_plus": "comment: #008000", "light_plus": "comment: #008000",
@ -441,7 +419,7 @@
}, },
{ {
"c": " ", "c": " ",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp", "t": "source.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -452,7 +430,7 @@
}, },
{ {
"c": "c", "c": "c",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp entity.name.function.call.initializer.cpp", "t": "source.cpp entity.name.function.call.cpp",
"r": { "r": {
"dark_plus": "entity.name.function: #DCDCAA", "dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26", "light_plus": "entity.name.function: #795E26",
@ -463,7 +441,7 @@
}, },
{ {
"c": "(", "c": "(",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp", "t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -474,7 +452,7 @@
}, },
{ {
"c": "3", "c": "3",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp", "t": "source.cpp constant.numeric.decimal.cpp",
"r": { "r": {
"dark_plus": "constant.numeric: #B5CEA8", "dark_plus": "constant.numeric: #B5CEA8",
"light_plus": "constant.numeric: #098658", "light_plus": "constant.numeric: #098658",
@ -485,7 +463,7 @@
}, },
{ {
"c": ")", "c": ")",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp", "t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -496,7 +474,7 @@
}, },
{ {
"c": " ", "c": " ",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp", "t": "source.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -507,7 +485,7 @@
}, },
{ {
"c": "{", "c": "{",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp", "t": "source.cpp meta.block.cpp punctuation.section.block.begin.bracket.curly.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",
@ -518,7 +496,7 @@
}, },
{ {
"c": "}", "c": "}",
"t": "source.cpp meta.function.definition.special.constructor.cpp meta.body.function.definition.special.constructor.cpp punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp", "t": "source.cpp meta.block.cpp punctuation.section.block.end.bracket.curly.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000", "light_plus": "default: #000000",