Merge branch 'st4126'

SublimeText · Nov 2, 2024 · 3e21c2b · 3e21c2b
2 parents 1429d1f + 097a5a7
commit 3e21c2b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/Snippets/component.sublime-snippet b/Snippets/component.sublime-snippet
@@ -6,6 +6,16 @@ $1
 $0
 ]]></content>
 	<tabTrigger>component</tabTrigger>
-	<scope>source.astro</scope>
+	<scope>
+		source.astro
+		- source.astro meta.tag
+		- source.astro meta.embedded
+		- source.astro meta.interpolation
+		- source.astro meta.string
+		- source.astro comment
+		- source.astro source
+		- source.astro string
+		- (text.html.markdown - markup.raw.code-fence source.astro)
+	</scope>
 	<description>Component</description>
 </snippet>
diff --git a/Snippets/page_html.sublime-snippet b/Snippets/page_html.sublime-snippet
@@ -16,6 +16,16 @@ $1
 </html>
 ]]></content>
 	<tabTrigger>page_html</tabTrigger>
-	<scope>source.astro</scope>
+	<scope>
+		source.astro
+		- source.astro meta.tag
+		- source.astro meta.embedded
+		- source.astro meta.interpolation
+		- source.astro meta.string
+		- source.astro comment
+		- source.astro source
+		- source.astro string
+		- (text.html.markdown - markup.raw.code-fence source.astro)
+	</scope>
 	<description>Page with full HTML</description>
 </snippet>
diff --git a/Snippets/page_layout.sublime-snippet b/Snippets/page_layout.sublime-snippet
@@ -8,6 +8,16 @@ import ${1:Layout} from "../layouts/$1.astro"
 </$1>
 ]]></content>
 	<tabTrigger>page_layout</tabTrigger>
-	<scope>source.astro</scope>
+	<scope>
+		source.astro
+		- source.astro meta.tag
+		- source.astro meta.embedded
+		- source.astro meta.interpolation
+		- source.astro meta.string
+		- source.astro comment
+		- source.astro source
+		- source.astro string
+		- (text.html.markdown - markup.raw.code-fence source.astro)
+	</scope>
 	<description>Page from Layout</description>
 </snippet>
diff --git a/Syntaxes/HTML (Astro).sublime-syntax b/Syntaxes/HTML (Astro).sublime-syntax
@@ -28,8 +28,9 @@ contexts:
 
   main:
     - meta_include_prototype: false
+    - meta_scope: text.html.astro meta.template.astro
     - match: ''
-      set: [html, frontmatter]
+      push: [html, frontmatter]
 
   frontmatter:
     - meta_include_prototype: false

diff --git a/tests/syntax_test_astro.astro b/tests/syntax_test_astro.astro
@@ -1,5 +1,7 @@
 // SYNTAX TEST "HTML (Astro).sublime-syntax"
 
+// <- source.astro text.html.astro meta.template.astro
+
   <? <html>
 //^^^^^^^^^ comment.block.astro
 //^^ punctuation.definition.comment.begin.astro