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

Exclude strings from HTML grammar patch (#168306)

Browse Source 
Fixes #160549
This commit is contained in:
Alex Ross 2022-12-07 14:44:00 +01:00 committed by GitHub
parent f7c5c0dbab
commit 4532436315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/html/build/update-grammar.mjs
View File

@ -11,7 +11,7 @@ function patchGrammar(grammar) {
let visit = function (rule, parent) { let visit = function (rule, parent) {
if (rule.name === 'source.js' || rule.name === 'source.css') { if (rule.name === 'source.js' || rule.name === 'source.css') {
if (parent.parent && parent.parent.property === 'endCaptures') { if (parent.node[0].name !== 'punctuation.definition.string.end.html' && parent.parent && parent.parent.property === 'endCaptures') {
rule.name = rule.name + '-ignored-vscode'; rule.name = rule.name + '-ignored-vscode';
patchCount++; patchCount++;
} }
@ -28,8 +28,8 @@ function patchGrammar(grammar) {
for (let key in repository) { for (let key in repository) {
visit(repository[key], { node: repository, property: key, parent: undefined }); visit(repository[key], { node: repository, property: key, parent: undefined });
} }
if (patchCount !== 6) { if (patchCount !== 2) {
console.warn(`Expected to patch 6 occurrences of source.js & source.css: Was ${patchCount}`); console.warn(`Expected to patch 2 occurrences of source.js & source.css: Was ${patchCount}`);
} }

8
extensions/html/syntaxes/html.tmLanguage.json
View File

@ -108,7 +108,7 @@
"name": "punctuation.definition.string.end.html" "name": "punctuation.definition.string.end.html"
}, },
"1": { "1": {
"name": "source.css-ignored-vscode" "name": "source.css"
} }
}, },
"name": "string.quoted.double.html", "name": "string.quoted.double.html",
@ -132,7 +132,7 @@
"name": "punctuation.definition.string.end.html" "name": "punctuation.definition.string.end.html"
}, },
"1": { "1": {
"name": "source.css-ignored-vscode" "name": "source.css"
} }
}, },
"name": "string.quoted.single.html", "name": "string.quoted.single.html",
@ -207,7 +207,7 @@
"name": "punctuation.definition.string.end.html" "name": "punctuation.definition.string.end.html"
}, },
"1": { "1": {
"name": "source.js-ignored-vscode" "name": "source.js"
} }
}, },
"name": "string.quoted.double.html", "name": "string.quoted.double.html",
@ -265,7 +265,7 @@
"name": "punctuation.definition.string.end.html" "name": "punctuation.definition.string.end.html"
}, },
"1": { "1": {
"name": "source.js-ignored-vscode" "name": "source.js"
} }
}, },
"name": "string.quoted.single.html", "name": "string.quoted.single.html",