Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

grammars: Inject HTML into SVG/MathML/raw templates and CSS into `css({ ... })` objects (#65509)

mantou636924f6d4cb
diff --git a/crates/grammars/src/javascript/injections.scm b/crates/grammars/src/javascript/injections.scm
index 9d07511f952..763b44607a6 100644
--- a/crates/grammars/src/javascript/injections.scm
+++ b/crates/grammars/src/javascript/injections.scm
@@ -15,6 +15,16 @@
(string_fragment) @injection.content
(#set! injection.language "css")))
+(call_expression
+ function: (identifier) @_name
+ (#eq? @_name "css")
+ arguments: (arguments
+ (object
+ (pair
+ value: (template_string
+ (string_fragment) @injection.content
+ (#set! injection.language "css"))))))
+
(call_expression
function: (member_expression
object: (identifier) @_obj
@@ -34,7 +44,7 @@
(call_expression
function: (identifier) @_name
- (#eq? @_name "html")
+ (#match? @_name "^(html|svg|mathml|raw)$")
arguments: (template_string) @injection.content
(#set! injection.language "html"))
diff --git a/crates/grammars/src/tsx/injections.scm b/crates/grammars/src/tsx/injections.scm
index fda53263f57..376f129fff6 100644
--- a/crates/grammars/src/tsx/injections.scm
+++ b/crates/grammars/src/tsx/injections.scm
@@ -15,6 +15,16 @@
(string_fragment) @injection.content
(#set! injection.language "css")))
+(call_expression
+ function: (identifier) @_name
+ (#eq? @_name "css")
+ arguments: (arguments
+ (object
+ (pair
+ value: (template_string
+ (string_fragment) @injection.content
+ (#set! injection.language "css"))))))
+
(call_expression
function: (member_expression
object: (identifier) @_obj
@@ -34,7 +44,7 @@
(call_expression
function: (identifier) @_name
- (#eq? @_name "html")
+ (#match? @_name "^(html|svg|mathml|raw)$")
arguments: (template_string
(string_fragment) @injection.content
(#set! injection.language "html")))
diff --git a/crates/grammars/src/typescript/injections.scm b/crates/grammars/src/typescript/injections.scm
index 19ffe697918..6c384deb05a 100644
--- a/crates/grammars/src/typescript/injections.scm
+++ b/crates/grammars/src/typescript/injections.scm
@@ -19,6 +19,16 @@
(string_fragment) @injection.content
(#set! injection.language "css")))
+(call_expression
+ function: (identifier) @_name
+ (#eq? @_name "css")
+ arguments: (arguments
+ (object
+ (pair
+ value: (template_string
+ (string_fragment) @injection.content
+ (#set! injection.language "css"))))))
+
(call_expression
function: (member_expression
object: (identifier) @_obj
@@ -38,7 +48,7 @@
(call_expression
function: (identifier) @_name
- (#eq? @_name "html")
+ (#match? @_name "^(html|svg|mathml|raw)$")
arguments: (template_string) @injection.content
(#set! injection.language "html"))