Skip to content

Commit 91da8dc

Browse files
alexr00alexr00
committed
Update C++ grammar for insiders to get hang fix
Fixes microsoft#78769
1 parent b065069 commit 91da8dc

9 files changed

Lines changed: 8027 additions & 7693 deletions

File tree

‎build/npm/update-grammar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
132132
if (packageJsonPathOverride) {
133133
packageJsonPath += packageJsonPathOverride;
134134
}
135-
packageJsonPath += '/package.json';
135+
packageJsonPath += 'package.json';
136136
for (let i = 0; i < cgmanifestRead.registrations.length; i++) {
137137
if (cgmanifestRead.registrations[i].component.git.repositoryUrl.substr(cgmanifestRead.registrations[i].component.git.repositoryUrl.length - repoId.length, repoId.length) === repoId) {
138138
cgmanifestRead.registrations[i].component.git.commitHash = info.commitSha;

‎extensions/cpp/build/update-grammars.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
var updateGrammar = require('../../../build/npm/update-grammar');
88

9-
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
10-
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master', 'source/languages/cpp');
9+
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/c.tmLanguage.json', './syntaxes/c.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
10+
updateGrammar.update('jeff-hykin/cpp-textmate-grammar', '/syntaxes/cpp.tmLanguage.json', './syntaxes/cpp.tmLanguage.json', undefined, 'master', 'source/languages/cpp/');
1111

1212
// `source.c.platform` which is still included by other grammars
1313
updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');

‎extensions/cpp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "cbd71f90cd9be0f99ddc9b0f65cec62fc3ada6d1"
9+
"commitHash": "218448eb46260864352d569db13be6cb20767e92"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/cpp/syntaxes/c.tmLanguage.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/5209e7f9df7661db6f163753141eeb3de6fb02b3",
7+
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/218448eb46260864352d569db13be6cb20767e92",
88
"name": "C",
99
"scopeName": "source.c",
1010
"patterns": [
@@ -1892,7 +1892,7 @@
18921892
"name": "entity.name.other.preprocessor.macro.predefined._Float16.c"
18931893
},
18941894
{
1895-
"match": "(\\b__([A-Z_])__\\b)",
1895+
"match": "(\\b__([A-Z_]+)__\\b)",
18961896
"captures": {
18971897
"1": {
18981898
"name": "entity.name.other.preprocessor.macro.predefined.probably.$2.c"

0 commit comments

Comments
 (0)