development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-01 08:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update C grammar locations (#151733)

Browse source 
Fixes #150288
This commit is contained in:
Alex Ross 2022-06-10 15:55:11 +02:00 committed by GitHub
parent 4e285432be
commit bd1abe08c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 1882 additions and 1367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/cpp/build/update-grammars.js
View file

@ -6,12 +6,16 @@
var updateGrammar = require('vscode-grammar-updater');
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/cpp.embedded.macro.tmLanguage.json', './syntaxes/cpp.embedded.macro.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
async function updateGrammars() {
await updateGrammar.update('jeff-hykin/better-c-syntax', 'autogenerated/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master');
await updateGrammar.update('jeff-hykin/better-cpp-syntax', 'autogenerated/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master');
await updateGrammar.update('jeff-hykin/better-cpp-syntax', 'autogenerated/cpp.embedded.macro.tmLanguage.json', './syntaxes/cpp.embedded.macro.tmLanguage.json', undefined, 'master');
updateGrammar.update('NVIDIA/cuda-cpp-grammar', 'syntaxes/cuda-cpp.tmLanguage.json', './syntaxes/cuda-cpp.tmLanguage.json', undefined, 'master');
await updateGrammar.update('NVIDIA/cuda-cpp-grammar', 'syntaxes/cuda-cpp.tmLanguage.json', './syntaxes/cuda-cpp.tmLanguage.json', undefined, 'master');
// `source.c.platform` which is still included by other grammars
updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');
await updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');
}
updateGrammars();

23
extensions/cpp/cgmanifest.json
View file

@ -4,14 +4,27 @@
"component": {
"type": "git",
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "db3f4e4a5d8335b2f6d689bec490c23f8313630f"
"name": "jeff-hykin/better-cpp-syntax",
"repositoryUrl": "https://github.com/jeff-hykin/better-cpp-syntax",
"commitHash": "156fc0eef532928c9dbf22f622d4a8efc7d97a6b"
}
},
"license": "MIT",
"version": "1.15.6",
"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."
"version": "1.15.13",
"description": "The original JSON grammars were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
},
{
"component": {
"type": "git",
"git": {
"name": "jeff-hykin/better-c-syntax",
"repositoryUrl": "https://github.com/jeff-hykin/better-c-syntax",
"commitHash": "34712a6106a4ffb0a04d2fa836fd28ff6c5849a4"
}
},
"license": "MIT",
"version": "1.13.2",
"description": "The original JSON grammars were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
},
{
"component": {

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

7
extensions/objective-c/build/update-grammars.js
View file

@ -6,6 +6,9 @@
var updateGrammar = require('vscode-grammar-updater');
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/objc.tmLanguage.json', './syntaxes/objective-c.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', 'syntaxes/objcpp.tmLanguage.json', './syntaxes/objective-c++.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
async function updateGrammars() {
await updateGrammar.update('jeff-hykin/better-objcpp-syntax', 'autogenerated/objcpp.tmLanguage.json', './syntaxes/objective-c++.tmLanguage.json', undefined, 'master');
await updateGrammar.update('jeff-hykin/better-objc-syntax', 'autogenerated/objc.tmLanguage.json', './syntaxes/objective-c.tmLanguage.json', undefined, 'master');
}
updateGrammars();

21
extensions/objective-c/cgmanifest.json
View file

@ -4,13 +4,26 @@
"component": {
"type": "git",
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "0ef79f098ed80ce5a86be4ed40f99ebcdbac4895"
"name": "jeff-hykin/better-objcpp-syntax",
"repositoryUrl": "https://github.com/jeff-hykin/better-objcpp-syntax",
"commitHash": "5a7eb15eee382dd5aa388bc04fdb60a0d2128e14"
}
},
"license": "MIT",
"version": "1.12.11",
"version": "0.1.0",
"description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the language package https://github.com/jeff-hykin/cpp-textmate-grammar."
},
{
"component": {
"type": "git",
"git": {
"name": "jeff-hykin/better-objc-syntax",
"repositoryUrl": "https://github.com/jeff-hykin/better-objc-syntax",
"commitHash": "119b75fb1f4d3e8726fa62588e3b935e0b719294"
}
},
"license": "MIT",
"version": "0.2.0",
"description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the language package https://github.com/jeff-hykin/cpp-textmate-grammar."
}
],

409
extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

409
extensions/objective-c/syntaxes/objective-c.tmLanguage.json
View file

File diff suppressed because one or more lines are too long

1004
extensions/vscode-colorize-tests/test/colorize-results/test-78769_cpp.json
View file

File diff suppressed because it is too large Load diff

2
extensions/vscode-colorize-tests/test/colorize-results/test_cpp.json
View file

@ -709,7 +709,7 @@
},
{
"c": "*",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.cpp",
"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.arithmetic.cpp",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",

2
extensions/vscode-colorize-tests/test/colorize-results/test_cu.json
View file

@ -2677,7 +2677,7 @@
},
{
"c": "/",
"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.parens.cpp keyword.operator.cpp",
"t": "source.cuda-cpp meta.preprocessor.macro.cuda-cpp meta.parens.cpp keyword.operator.arithmetic.cpp",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",

12
extensions/vscode-colorize-tests/test/colorize-results/test_mm.json
View file

@ -1573,14 +1573,14 @@
},
{
"c": "self",
"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp meta.bracket.square.access.objcpp variable.other.object.access.objcpp",
"t": "source.objcpp meta.implementation.objcpp meta.scope.implementation.objcpp meta.function-with-body.objcpp meta.block.objcpp meta.bracket.square.access.objcpp meta.bracket.square.access.objcpp variable.language.objcpp",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"dark_plus": "variable.language: #569CD6",
"light_plus": "variable.language: #0000FF",
"dark_vs": "variable.language: #569CD6",
"light_vs": "variable.language: #0000FF",
"hc_black": "variable: #9CDCFE",
"hc_light": "variable: #001080"
"hc_light": "variable.language: #0F4A85"
}
},
{