Merge pull request microsoft#80657 from KapitanOczywisty/patch-1

roblourens · web-flow · commit ea10827333d2 · 2019-09-15T12:24:51.000-07:00
Fix PHP in HTML style tags
diff --git a/extensions/php/build/update-grammar.js b/extensions/php/build/update-grammar.js
@@ -8,8 +8,9 @@ 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
+	// also we need to add source.css scope for PHP code in <style> tags, which are handled differently in atom
 	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))";
+	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)), L:(source.css - (meta.embedded.block.php | meta.embedded.line.php))";
 
 	const injections = grammar.injections;
 	const injection = injections[oldInjectionKey];
diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
@@ -109,7 +109,7 @@
 				}
 			]
 		},
-		"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))": {
+		"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)), L:(source.css - (meta.embedded.block.php | meta.embedded.line.php))": {
 			"patterns": [
 				{
 					"include": "#php-tag"

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@`
`109`	`109`	`}`
`110`	`110`	`]`
`111`	`111`	`},`
`112`		`- "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))": {`
	`112`	`+ "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)), L:(source.css - (meta.embedded.block.php \| meta.embedded.line.php))": {`
`113`	`113`	`"patterns": [`
`114`	`114`	`{`
`115`	`115`	`"include": "#php-tag"`