From eed2dba4ca28ab65c0926b074cbb97d599e5a0c7 Mon Sep 17 00:00:00 2001
From: Em Zhan <zqianem@gmail.com>
Date: Sat, 4 Jul 2026 02:44:35 -0500
Subject: [PATCH] Fix Svelte `<script>` and `<style>` injections (#15846)

* Fix Svelte `<script>` and `<style>` injections

* Update Svelte grammar
---
 languages.toml                        |  2 +-
 runtime/queries/svelte/injections.scm | 80 +++------------------------
 2 files changed, 8 insertions(+), 74 deletions(-)

diff --git a/languages.toml b/languages.toml
index 32fc1516..0a3554e8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1653,7 +1653,7 @@ language-servers = [ "svelteserver" ]
 
 [[grammar]]
 name = "svelte"
-source = { git = "https://github.com/themixednuts/tree-sitter-htmlx", rev = "80c3e698ec7379772c7f2aecb9b4b4c4ac52ff0b", subpath = "crates/tree-sitter-svelte" }
+source = { git = "https://github.com/themixednuts/tree-sitter-htmlx", rev = "c9b9cc35709fff494a3a9e41cd9471b633649e45", subpath = "crates/tree-sitter-svelte" }
 
 [[language]]
 name = "vue"
diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index d40ae322..f4e408b6 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -1,72 +1,18 @@
-; Script elements with TypeScript aliases
-((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (quoted_attribute_value
-        (attribute_value) @_value)))
-  (raw_text) @injection.content)
-  (#match? @_tag "^[Ss][Cc][Rr][Ii][Pp][Tt]$")
-  (#any-of? @_value "ts" "typescript" "text/typescript")
-  (#set! injection.language "typescript"))
-
-; Script elements with explicit language
-((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (attribute_name) @_lang
-      (quoted_attribute_value
-        (attribute_value) @injection.language)))
-  (raw_text) @injection.content)
-  (#eq? @_tag "script")
-  (#eq? @_lang "lang")
-  (#not-any-of? @injection.language "ts" "typescript" "text/typescript"))
-
-; Script content defaults to JavaScript
+; <script> content defaults to JavaScript
 ((element
   (start_tag (tag_name) @_tag)
   (raw_text) @injection.content)
   (#eq? @_tag "script")
   (#set! injection.language "javascript"))
 
-; Style with lang="scss"
+; <style> content defaults to CSS
 ((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (quoted_attribute_value
-        (attribute_value) @_scss)))
-  (raw_text) @injection.content)
-  (#eq? @_tag "style")
-  (#eq? @_scss "scss")
-  (#set! injection.language "scss"))
-
-; Style with lang="sass"
-((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (quoted_attribute_value
-        (attribute_value) @_sass)))
-  (raw_text) @injection.content)
-  (#eq? @_tag "style")
-  (#eq? @_sass "sass")
-  (#set! injection.language "sass"))
-
-; Style with lang="less"
-((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (quoted_attribute_value
-        (attribute_value) @_less)))
+  (start_tag (tag_name) @_tag)
   (raw_text) @injection.content)
   (#eq? @_tag "style")
-  (#eq? @_less "less")
-  (#set! injection.language "less"))
+  (#set! injection.language "css"))
 
-; Style with explicit language
+; <script> or <style> with "lang" attribute
 ((element
   (start_tag
     (tag_name) @_tag
@@ -75,20 +21,8 @@
       (quoted_attribute_value
         (attribute_value) @injection.language)))
   (raw_text) @injection.content)
-  (#eq? @_tag "style")
-  (#eq? @_lang "lang")
-  (#not-any-of? @injection.language "scss" "sass" "less"))
-
-; Style content defaults to CSS when no lang attribute is present
-((element
-  (start_tag
-    (tag_name) @_tag
-    (attribute
-      (attribute_name) @_style_attr)*)
-  (raw_text) @injection.content)
-  (#eq? @_tag "style")
-  (#not-any-of? @_style_attr "lang")
-  (#set! injection.language "css"))
+  (#any-of? @_tag "style" "script")
+  (#eq? @_lang "lang"))
 
 ; Inline style attribute
 ((attribute
-- 
2.51.2