development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get latest cpp grammar updates

Browse source
This commit is contained in:
Alex Ross 2019-04-17 09:32:19 +02:00
parent cb73a8f7a2
commit 7f0f3e4bbb
3 changed files with 27 additions and 27 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": "5381f0d02bd043a279ad6c2e55dc5de6812cb15a" "commitHash": "f5552b7edebe79fee79961f16f2c5459cfee0cf1"
} }
}, },
"license": "MIT", "license": "MIT",
"version": "1.8.0", "version": "1.8.2",
"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."
}, },
{ {

42
extensions/cpp/syntaxes/cpp.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/5381f0d02bd043a279ad6c2e55dc5de6812cb15a", "version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/f5552b7edebe79fee79961f16f2c5459cfee0cf1",
"name": "C++", "name": "C++",
"scopeName": "source.cpp", "scopeName": "source.cpp",
"patterns": [ "patterns": [
@ -280,7 +280,7 @@
"name": "keyword.other.using.directive.cpp" "name": "keyword.other.using.directive.cpp"
}, },
"2": { "2": {
"name": "entity.name.namespace.cpp" "name": "entity.name.type.namespace.cpp"
} }
} }
}, },
@ -294,7 +294,7 @@
}, },
{ {
"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)(?=::)", "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)(?=::)",
"name": "entity.name.namespace.cpp" "name": "entity.name.type.namespace.cpp"
}, },
{ {
"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)", "match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
@ -599,13 +599,13 @@
"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp" "name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
}, },
"2": { "2": {
"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp" "name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
} }
}, },
"end": "(\\))", "end": "(\\))",
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp" "name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
} }
}, },
"patterns": [ "patterns": [
@ -622,13 +622,13 @@
"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp" "name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
}, },
"2": { "2": {
"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp" "name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
} }
}, },
"end": "(\\))", "end": "(\\))",
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp" "name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
} }
}, },
"patterns": [ "patterns": [
@ -645,13 +645,13 @@
"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp" "name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
}, },
"2": { "2": {
"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp" "name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
} }
}, },
"end": "(\\))", "end": "(\\))",
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp" "name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
} }
}, },
"patterns": [ "patterns": [
@ -668,13 +668,13 @@
"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp" "name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
}, },
"2": { "2": {
"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp" "name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
} }
}, },
"end": "(\\))", "end": "(\\))",
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp" "name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
} }
}, },
"patterns": [ "patterns": [
@ -691,13 +691,13 @@
"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp" "name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
}, },
"2": { "2": {
"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp" "name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
} }
}, },
"end": "(\\))", "end": "(\\))",
"endCaptures": { "endCaptures": {
"1": { "1": {
"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp" "name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
} }
}, },
"patterns": [ "patterns": [
@ -1633,7 +1633,7 @@
] ]
}, },
"4": { "4": {
"name": "entity.name.namespace.cpp" "name": "entity.name.type.namespace.cpp"
} }
}, },
"end": "(;)", "end": "(;)",
@ -1668,7 +1668,7 @@
] ]
}, },
"5": { "5": {
"name": "entity.name.namespace.cpp" "name": "entity.name.type.namespace.cpp"
} }
}, },
"end": "(?:(?<=\\})|(?=[;()>\\[\\]=]))", "end": "(?:(?<=\\})|(?=[;()>\\[\\]=]))",
@ -1754,7 +1754,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"
@ -1805,7 +1805,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"
@ -1934,7 +1934,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"
@ -1985,7 +1985,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"
@ -2114,7 +2114,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"
@ -2165,7 +2165,7 @@
"name": "storage.type.modifier.access.$0.cpp" "name": "storage.type.modifier.access.$0.cpp"
}, },
{ {
"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)", "match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
"captures": { "captures": {
"1": { "1": {
"name": "entity.name.type.inherited.cpp" "name": "entity.name.type.inherited.cpp"

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

@ -133,13 +133,13 @@
}, },
{ {
"c": "std", "c": "std",
"t": "source.cpp meta.using-namespace.cpp entity.name.namespace.cpp", "t": "source.cpp meta.using-namespace.cpp entity.name.type.namespace.cpp",
"r": { "r": {
"dark_plus": "default: #D4D4D4", "dark_plus": "entity.name.type: #4EC9B0",
"light_plus": "default: #000000", "light_plus": "entity.name.type: #267F99",
"dark_vs": "default: #D4D4D4", "dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000", "light_vs": "default: #000000",
"hc_black": "default: #FFFFFF" "hc_black": "entity.name.type: #4EC9B0"
} }
}, },
{ {