Merge branch 'main' into tyriar/257822__share

Author: Tyriar

extensions/razor/build/update-grammar.mjs

@@ -8,6 +8,32 @@ import * as vscodeGrammarUpdater from 'vscode-grammar-updater';
 
 function patchGrammar(grammar) {
 	grammar.scopeName = 'text.html.cshtml';
+
+	let patchCount = 0;
+
+	let visit = function (rule, parent) {
+		if (rule.include?.startsWith('text.html.basic')) {
+			patchCount++;
+			rule.include = 'text.html.derivative';
+		}
+		for (let property in rule) {
+			let value = rule[property	];
+			if (typeof value === 'object') {
+				visit(value, { node: rule, property: property, parent: parent });
+			}
+		}
+	};
+
+	let roots = [grammar.repository, grammar.patterns];
+	for (let root of roots) {
+		for (let key in root) {
+			visit(root[key], { node: root, property: key, parent: undefined });
+		}
+	}
+	if (patchCount !== 4) {
+		console.warn(`Expected to patch 4 occurrences of text.html.basic: Was ${patchCount}`);
+	}
+
 	return grammar;
 }
 

extensions/razor/syntaxes/cshtml.tmLanguage.json

@@ -34,7 +34,7 @@
 			"include": "#razor-control-structures"
 		},
 		{
-			"include": "text.html.basic"
+			"include": "text.html.derivative"
 		}
 	],
 	"repository": {
@@ -155,7 +155,7 @@
 							"include": "#razor-control-structures"
 						},
 						{
-							"include": "text.html.basic"
+							"include": "text.html.derivative"
 						}
 					]
 				}
@@ -239,7 +239,7 @@
 			},
 			"patterns": [
 				{
-					"include": "text.html.basic#attribute"
+					"include": "text.html.derivative"
 				}
 			],
 			"end": "/?>",
@@ -286,7 +286,7 @@
 							"include": "#razor-control-structures"
 						},
 						{
-							"include": "text.html.basic#attribute"
+							"include": "text.html.derivative"
 						}
 					]
 				},