[html] issues caused by HTML grammar associating '<' with JS. Fixes #…

…86998
microsoft · Dec 20, 2019 · 18bab62 · 18bab62
1 parent c97c457
commit 18bab62
Show file tree

Hide file tree

Showing 10 changed files with 1,072 additions and 18 deletions.
diff --git a/extensions/html/build/update-grammar.js b/extensions/html/build/update-grammar.js
@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// @ts-check
+'use strict';
+
+var updateGrammar = require('../../../build/npm/update-grammar');
+
+function patchGrammar(grammar) {
+	let patchCount = 0;
+
+	let visit = function (rule, parent) {
+		if (rule.name === 'source.js' || rule.name === 'source.css') {
+			if (parent.parent && parent.parent.property === 'endCaptures') {
+				rule.name = rule.name + '-ignored-vscode';
+				patchCount++;
+			}
+		}
+		for (let property in rule) {
+			let value = rule[property];
+			if (typeof value === 'object') {
+				visit(value, { node: rule, property: property, parent: parent });
+			}
+		}
+	};
+
+	let repository = grammar.repository;
+	for (let key in repository) {
+		visit(repository[key], { node: repository, property: key, parent: undefined });
+	}
+	if (patchCount !== 6) {
+		console.warn(`Expected to patch 6 occurrences of source.js & source.css: Was ${patchCount}`);
+	}
+
+
+	return grammar;
+}
+
+const tsGrammarRepo = 'textmate/html.tmbundle';
+const grammarPath = 'Syntaxes/HTML.plist';
+updateGrammar.update(tsGrammarRepo, grammarPath, './syntaxes/html.tmLanguage.json', grammar => patchGrammar(grammar));
+
+
diff --git a/extensions/html/package.json b/extensions/html/package.json
@@ -9,7 +9,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.tmLanguage.json Syntaxes/HTML%20%28Derivative%29.tmLanguage ./syntaxes/html-derivative.tmLanguage.json"
+    "update-grammar": "node ./build/update-grammar.js"
   },
   "contributes": {
     "languages": [

diff --git a/extensions/html/syntaxes/html.tmLanguage.json b/extensions/html/syntaxes/html.tmLanguage.json
@@ -108,7 +108,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.css"
+													"name": "source.css-ignored-vscode"
 												}
 											},
 											"name": "string.quoted.double.html",
@@ -132,7 +132,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.css"
+													"name": "source.css-ignored-vscode"
 												}
 											},
 											"name": "string.quoted.single.html",
@@ -207,7 +207,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.js"
+													"name": "source.js-ignored-vscode"
 												}
 											},
 											"name": "string.quoted.double.html",
@@ -265,7 +265,7 @@
 													"name": "punctuation.definition.string.end.html"
 												},
 												"1": {
-													"name": "source.js"
+													"name": "source.js-ignored-vscode"
 												}
 											},
 											"name": "string.quoted.single.html",
@@ -1785,7 +1785,7 @@
 									"name": "punctuation.definition.tag.begin.html"
 								},
 								"2": {
-									"name": "source.css"
+									"name": "source.css-ignored-vscode"
 								},
 								"3": {
 									"name": "entity.name.tag.html"
@@ -1892,7 +1892,7 @@
 													"name": "punctuation.definition.tag.begin.html"
 												},
 												"2": {
-													"name": "source.js"
+													"name": "source.js-ignored-vscode"
 												}
 											},
 											"patterns": [

diff --git a/extensions/html/test/colorize-fixtures/test-embedding.html b/extensions/html/test/colorize-fixtures/test-embedding.html
@@ -0,0 +1,6 @@
+<script>console.log('x')</script>
+<style>test { display: none }</style>
+<a onblur="doBlur()" onclick='doClick()' ondrag=doDrag()></a>
+<div style="x { }"></div>
+<div style='y { }'></div>
+<div style=z{}></div>
diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/html/test/colorize-results/12750_html.json
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js-ignored-vscode",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js-ignored-vscode",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",

diff --git a/extensions/html/test/colorize-results/25920_html.json b/extensions/html/test/colorize-results/25920_html.json
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "<",
-		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js",
+		"t": "text.html.derivative meta.embedded.block.html meta.tag.metadata.script.end.html punctuation.definition.tag.begin.html source.js-ignored-vscode",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",