From dd02755bfc215d1cbd43d9621ba8dad2fc6dabce Mon Sep 17 00:00:00 2001
From: KapitanOczywisty <44417092+KapitanOczywisty@users.noreply.github.com>
Date: Tue, 10 Sep 2019 19:13:03 +0200
Subject: [PATCH 1/2] Fix PHP in HTML style tags

---
 extensions/php/build/update-grammar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/php/build/update-grammar.js b/extensions/php/build/update-grammar.js
index 58b1207a4a200..da01c30d40df5 100644
--- 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];

From f57f8f70632c1dc5b156248fb07078fce3ba7d0e Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Sun, 15 Sep 2019 12:23:31 -0700
Subject: [PATCH 2/2] Update grammar files

---
 extensions/php/syntaxes/html.tmLanguage.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json
index 6a37157d02408..09d631c14c2fb 100644
--- 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"