From 73be69a17a9ba3c9e98ff8e1a5a7c85a4d06bb77 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Fri, 4 Oct 2024 18:29:10 +0200
Subject: [PATCH 1/2] Add support for PostCSS

---
 Syntaxes/HTML (Astro).sublime-syntax | 26 ++++++++++++++++++++++++++
 tests/syntax_test_style.astro        | 16 ++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/Syntaxes/HTML (Astro).sublime-syntax b/Syntaxes/HTML (Astro).sublime-syntax
index 20ddd9f..adf7376 100644
--- a/Syntaxes/HTML (Astro).sublime-syntax	
+++ b/Syntaxes/HTML (Astro).sublime-syntax	
@@ -221,6 +221,11 @@ contexts:
     - include: style-lang-decider
 
   style-lang-decider:
+    - match: (?i)(?=postcss{{unquoted_attribute_break}}|'postcss'|"postcss")
+      set:
+        - style-postcss
+        - tag-generic-attribute-meta
+        - tag-generic-attribute-value
     - match: (?i)(?=css{{unquoted_attribute_break}}|\'css\'|"css")
       set:
         - style-css
@@ -273,6 +278,27 @@ contexts:
         3: source.less.embedded.html
         4: comment.block.html punctuation.definition.comment.end.html
 
+  style-postcss:
+    - meta_scope: meta.tag.style.begin.html
+    - match: '>'
+      scope: punctuation.definition.tag.end.html
+      set: style-postcss-content
+    - include: style-common
+
+  style-postcss-content:
+    - match: '{{style_content_begin}}'
+      captures:
+        1: comment.block.html punctuation.definition.comment.begin.html
+      pop: 1
+      embed: scope:source.postcss
+      embed_scope: source.postcss.embedded.html
+      escape: '{{style_content_end}}'
+      escape_captures:
+        1: source.postcss.embedded.html
+        2: comment.block.html punctuation.definition.comment.end.html
+        3: source.postcss.embedded.html
+        4: comment.block.html punctuation.definition.comment.end.html
+
   style-sass:
     - meta_scope: meta.tag.style.begin.html
     - match: '>'
diff --git a/tests/syntax_test_style.astro b/tests/syntax_test_style.astro
index 92cb9d0..9adc025 100644
--- a/tests/syntax_test_style.astro
+++ b/tests/syntax_test_style.astro
@@ -182,6 +182,22 @@
 //    ^^^^^ entity.name.tag.style.html
 //         ^ punctuation.definition.tag.end.html
 
+    <style lang="postcss">
+        <!--
+// ^^^^^^^^^ - source.postcss
+//      ^^^^ comment.block.html punctuation.definition.comment.begin.html
+
+// <- source.postcss.embedded.html
+        -->
+//      ^^^ comment.block.html punctuation.definition.comment.end.html - source.postcss
+//         ^ - source.postcss - comment - meta.tag
+    </style>
+// <- - source.postcss - comment - meta.tag
+//^^ - source.postcss - comment - meta.tag
+//  ^^^^^^^^ meta.tag - source.postcss
+//  ^^ punctuation.definition.tag.begin.html
+//    ^^^^^ entity.name.tag.style.html
+//         ^ punctuation.definition.tag.end.html
 
     <style lang="sass">
 //  ^^^^^^^^^^^^^^^^^^^ meta.tag.style.begin.html

From 172ec6621afd5a70395aff316a3d2ae9e711bf97 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@googlemail.com>
Date: Fri, 4 Oct 2024 18:32:15 +0200
Subject: [PATCH 2/2] Fix source.astro scopes

---
 Snippets/component.sublime-snippet   | 2 +-
 Snippets/page_html.sublime-snippet   | 2 +-
 Snippets/page_layout.sublime-snippet | 2 +-
 tests/syntax_test_astro.astro        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Snippets/component.sublime-snippet b/Snippets/component.sublime-snippet
index 2f8b516..3f58c1f 100644
--- a/Snippets/component.sublime-snippet
+++ b/Snippets/component.sublime-snippet
@@ -6,6 +6,6 @@ $1
 $0
 ]]></content>
 	<tabTrigger>component</tabTrigger>
-	<scope>text.html.astro</scope>
+	<scope>source.astro</scope>
 	<description>Component</description>
 </snippet>
diff --git a/Snippets/page_html.sublime-snippet b/Snippets/page_html.sublime-snippet
index f457b1b..f8b334f 100644
--- a/Snippets/page_html.sublime-snippet
+++ b/Snippets/page_html.sublime-snippet
@@ -16,6 +16,6 @@ $1
 </html>
 ]]></content>
 	<tabTrigger>page_html</tabTrigger>
-	<scope>text.html.astro</scope>
+	<scope>source.astro</scope>
 	<description>Page with full HTML</description>
 </snippet>
diff --git a/Snippets/page_layout.sublime-snippet b/Snippets/page_layout.sublime-snippet
index b8a5776..dbae2f9 100644
--- a/Snippets/page_layout.sublime-snippet
+++ b/Snippets/page_layout.sublime-snippet
@@ -8,6 +8,6 @@ import ${1:Layout} from "../layouts/$1.astro"
 </$1>
 ]]></content>
 	<tabTrigger>page_layout</tabTrigger>
-	<scope>text.html.astro</scope>
+	<scope>source.astro</scope>
 	<description>Page from Layout</description>
 </snippet>
diff --git a/tests/syntax_test_astro.astro b/tests/syntax_test_astro.astro
index f53f179..f8941f5 100644
--- a/tests/syntax_test_astro.astro
+++ b/tests/syntax_test_astro.astro
@@ -197,7 +197,7 @@
 //                              ^^ punctuation.definition.tag.end.astro
 
   </Markdown>
-//^^^^^^^^^^^ text.html.astro meta.tag.component.end.astro - text.html.markdown.astro - meta.tag.component meta.tag.component
+//^^^^^^^^^^^ source.astro meta.tag.component.end.astro - text.html.markdown.astro - meta.tag.component meta.tag.component
 //^^ punctuation.definition.tag.begin.astro
 //  ^^^^^^^^ entity.name.tag.component.astro support.class.component.astro
 //          ^ punctuation.definition.tag.end.astro