From 6d3e24bb89a96d56595b54050eef90a8c8fc5b72 Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 11:14:01 +0200
Subject: [PATCH 1/6] update typescript grammar to latest tag (v0.20.2)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 953a23fcdd85..402ec104b514 100644
--- a/languages.toml
+++ b/languages.toml
@@ -474,7 +474,7 @@ includeInlayVariableTypeHints = true
 
 [[grammar]]
 name = "typescript"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "typescript" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "typescript" }
 
 [[language]]
 name = "tsx"

From 29b06bd5b8ae06f94cc5dde944d1585b1b2d5e88 Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 11:14:56 +0200
Subject: [PATCH 2/6] update svelte grammar to latest tag (v0.11.0)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 402ec104b514..b74cd167f51a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -841,7 +841,7 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
 
 [[grammar]]
 name = "svelte"
-source = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "349a5984513b4a4a9e143a6e746120c6ff6cf6ed" }
+source = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "be7f2e7db1fc19f0852265ec60923fc058380739" }
 
 [[language]]
 name = "vue"

From 01933f7d58f24eff3f37b07fa1a55cd22846acf6 Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 11:42:47 +0200
Subject: [PATCH 3/6] update tsx grammar to latest tag (v0.20.2)

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index b74cd167f51a..27e69a7107f7 100644
--- a/languages.toml
+++ b/languages.toml
@@ -500,7 +500,7 @@ includeInlayVariableTypeHints = true
 
 [[grammar]]
 name = "tsx"
-source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "6aac031ad88dd6317f02ac0bb27d099a553a7d8c", subpath = "tsx" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259", subpath = "tsx" }
 
 [[language]]
 name = "css"

From e7fbaa01c0c07c5c78c7b962babcf3ded39f48f5 Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 12:30:27 +0200
Subject: [PATCH 4/6] added `satisfies`-keyword to typescript highlights

---
 runtime/queries/typescript/highlights.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/runtime/queries/typescript/highlights.scm b/runtime/queries/typescript/highlights.scm
index fc8d110d12ec..d5511059be17 100644
--- a/runtime/queries/typescript/highlights.scm
+++ b/runtime/queries/typescript/highlights.scm
@@ -35,6 +35,7 @@
   "keyof"
   "namespace"
   "override"
+  "satisfies"
 ] @keyword
 
 [

From 5ac8d36d381812b813c37ffeb9027f86af66a54d Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 18:27:46 +0200
Subject: [PATCH 5/6] add css injection that handles attributes, in svelte
 templates

---
 runtime/queries/svelte/injections.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index 04e860cf0841..7695d6731755 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -4,6 +4,12 @@
   (raw_text) @injection.content)
   (#set! injection.language "css"))
 
+((style_element
+  (start_tag
+    (attribute
+      (quoted_attribute_value (attribute_value))))
+  (raw_text) @css))
+
 ((attribute
    (attribute_name) @_attr
    (quoted_attribute_value (attribute_value) @css))

From dc5b0a0956e0228ffa175b50f59bed9e826eec8b Mon Sep 17 00:00:00 2001
From: Jeppe Christiansen <jeppe@codr.dk>
Date: Tue, 25 Apr 2023 21:49:31 +0200
Subject: [PATCH 6/6] add injection, that sets language to scss

---
 runtime/queries/svelte/injections.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/runtime/queries/svelte/injections.scm b/runtime/queries/svelte/injections.scm
index 7695d6731755..65a6e0e41603 100644
--- a/runtime/queries/svelte/injections.scm
+++ b/runtime/queries/svelte/injections.scm
@@ -5,10 +5,14 @@
   (#set! injection.language "css"))
 
 ((style_element
-  (start_tag
-    (attribute
-      (quoted_attribute_value (attribute_value))))
-  (raw_text) @css))
+    (start_tag
+      (attribute
+        (attribute_name) @_attr
+        (quoted_attribute_value (attribute_value) @_lang)))
+    (raw_text) @injection.content)
+  (#eq? @_attr "lang")
+  (#match? @_lang "scss")
+  (#set! injection.language "scss"))
 
 ((attribute
    (attribute_name) @_attr