Skip to content

V
Vscode

徽霖 / Vscode

通知 9
Star 0
Fork 0
V
Vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 91da8dc7 编写于 作者: A Alex Ross
浏览文件
操作

Update C++ grammar for insiders to get hang fix 

Fixes #78769
上级 b0650697
展开全部 隐藏空白更改
内联 并排
Showing with 8027 addition and 7693 deletion
build/npm/update-grammar.js
浏览文件 @ 91da8dc7
......@@ -132,7 +132,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
if (packageJsonPathOverride) {
packageJsonPath += packageJsonPathOverride;
}
packageJsonPath += '/package.json';
packageJsonPath += 'package.json';
for (let i = 0; i < cgmanifestRead.registrations.length; i++) {
if (cgmanifestRead.registrations[i].component.git.repositoryUrl.substr(cgmanifestRead.registrations[i].component.git.repositoryUrl.length - repoId.length, repoId.length) === repoId) {
cgmanifestRead.registrations[i].component.git.commitHash = info.commitSha;
......
extensions/cpp/build/update-grammars.js
浏览文件 @ 91da8dc7
......@@ -6,8 +6,8 @@
var updateGrammar = require('../../../build/npm/update-grammar');
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/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/');
// `source.c.platform` which is still included by other grammars
updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');
......
extensions/cpp/cgmanifest.json
浏览文件 @ 91da8dc7
......@@ -6,7 +6,7 @@
"git": {
"name": "jeff-hykin/cpp-textmate-grammar",
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
"commitHash": "cbd71f90cd9be0f99ddc9b0f65cec62fc3ada6d1"
"commitHash": "218448eb46260864352d569db13be6cb20767e92"
}
},
"license": "MIT",
......
extensions/cpp/syntaxes/c.tmLanguage.json
浏览文件 @ 91da8dc7
......@@ -4,7 +4,7 @@
"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."
],
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/5209e7f9df7661db6f163753141eeb3de6fb02b3",
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/218448eb46260864352d569db13be6cb20767e92",
"name": "C",
"scopeName": "source.c",
"patterns": [
......@@ -1892,7 +1892,7 @@
"name": "entity.name.other.preprocessor.macro.predefined._Float16.c"
},
{
"match": "(\\b__([A-Z_])__\\b)",
"match": "(\\b__([A-Z_]+)__\\b)",
"captures": {
"1": {
"name": "entity.name.other.preprocessor.macro.predefined.probably.$2.c"
......
extensions/cpp/test/colorize-results/test-23630_cpp.json
浏览文件 @ 91da8dc7
[
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -12,7 +12,7 @@
},
{
"c": "ifndef",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -23,23 +23,23 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"hc_black": "meta.preprocessor: #569CD6"
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "_UCRT",
"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp entity.name.function.preprocessor.cpp",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "entity.name.function: #DCDCAA"
}
},
......@@ -100,7 +100,7 @@
},
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -111,7 +111,7 @@
},
{
"c": "endif",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......
extensions/cpp/test/colorize-results/test-23850_cpp.json
浏览文件 @ 91da8dc7
[
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -12,7 +12,7 @@
},
{
"c": "ifndef",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.conditional.ifndef.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -23,23 +23,23 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"hc_black": "meta.preprocessor: #569CD6"
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "_UCRT",
"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp entity.name.function.preprocessor.cpp",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "entity.name.function: #DCDCAA"
}
},
......@@ -89,7 +89,7 @@
},
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -100,7 +100,7 @@
},
{
"c": "endif",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......
extensions/cpp/test/colorize-results/test_cc.json
浏览文件 @ 91da8dc7
[
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.conditional.if.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -12,7 +12,7 @@
},
{
"c": "if",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.conditional.if.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -23,23 +23,23 @@
},
{
"c": " ",
"t": "source.cpp meta.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp",
"r": {
"dark_plus": "meta.preprocessor: #569CD6",
"light_plus": "meta.preprocessor: #0000FF",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"hc_black": "meta.preprocessor: #569CD6"
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "default: #FFFFFF"
}
},
{
"c": "B4G_DEBUG_CHECK",
"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
"t": "source.cpp meta.conditional.preprocessor.cpp entity.name.function.preprocessor.cpp",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
"dark_vs": "meta.preprocessor: #569CD6",
"light_vs": "meta.preprocessor: #0000FF",
"light_plus": "entity.name.function: #795codeE26",
"dark_vs": "default: #D4D4D4",
"light_vs": "default: #000000",
"hc_black": "entity.name.function: #DCDCAA"
}
},
......@@ -650,7 +650,7 @@
},
{
"c": "#",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp punctuation.definition.directive.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -661,7 +661,7 @@
},
{
"c": "endif",
"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
"t": "source.cpp keyword.control.directive.endif.cpp",
"r": {
"dark_plus": "keyword.control: #C586C0",
"light_plus": "keyword.control: #AF00DB",
......@@ -1979,4 +1979,4 @@
"hc_black": "default: #FFFFFF"
}
}
]
\ No newline at end of file
]
extensions/cpp/test/colorize-results/test_cpp.json
浏览文件 @ 91da8dc7
......@@ -276,7 +276,7 @@
},
{
"c": " ",
"t": "source.cpp meta.block.class.cpp meta.head.class.cpp",
"t": "source.cpp meta.block.class.cpp",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或