Fix microsoft#65649 - fix injection patching in update-grammar.js

roblourens · roblourens · commit 509d693aa72c · 2019-01-03T16:24:11.000-08:00
diff --git a/extensions/php/build/update-grammar.js b/extensions/php/build/update-grammar.js
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-var updateGrammar = require('../../../build/npm/update-grammar');
+const updateGrammar = require('../../../build/npm/update-grammar');
 
 function adaptInjectionScope(grammar) {
 	// we're using the HTML grammar from https://github.com/textmate/html.tmbundle which has moved away from source.js.embedded.html
-	let oldInjectionKey = "text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:source.js.embedded.html";
-	let newInjectionKey = "text.html.php - (meta.embedded | meta.tag), L:text.html.php meta.tag, L:text.html.php source.js";
+	const oldInjectionKey = "text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js.embedded.html - (meta.embedded.block.php | meta.embedded.line.php))";
+	const newInjectionKey = "text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js - (meta.embedded.block.php | meta.embedded.line.php))";
 
-	var injections = grammar.injections;
-	var injection = injections[oldInjectionKey];
-	if (!injections) {
-		throw new Error("Can not find PHP injection");
+	const injections = grammar.injections;
+	const injection = injections[oldInjectionKey];
+	if (!injection) {
+		throw new Error("Can not find PHP injection to patch");
 	}
 	delete injections[oldInjectionKey];
 	injections[newInjectionKey] = injection;
@@ -37,4 +37,3 @@ function fixBadRegex(grammar) {
 
 updateGrammar.update('atom/language-php', 'grammars/php.cson', './syntaxes/php.tmLanguage.json', fixBadRegex);
 updateGrammar.update('atom/language-php', 'grammars/html.cson', './syntaxes/html.tmLanguage.json', adaptInjectionScope);
-
diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
@@ -8,13 +8,6 @@
 	"name": "PHP",
 	"scopeName": "text.html.php",
 	"injections": {
-		"text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js.embedded.html - (meta.embedded.block.php | meta.embedded.line.php))": {
-			"patterns": [
-				{
-					"include": "#php-tag"
-				}
-			]
-		},
 		"L:source.php string.quoted.single.sql.php source.sql.embedded.php": {
 			"patterns": [
 				{
@@ -115,6 +108,13 @@
 					"include": "source.php#interpolation_double_quoted"
 				}
 			]
+		},
+		"text.html.php - (meta.embedded | meta.tag), L:((text.html.php meta.tag) - (meta.embedded.block.php | meta.embedded.line.php)), L:(source.js - (meta.embedded.block.php | meta.embedded.line.php))": {
+			"patterns": [
+				{
+					"include": "#php-tag"
+				}
+			]
 		}
 	},
 	"patterns": [
