From 05ae617e1c27ec1541290aeda9973a868eddad3a Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Sat, 17 May 2025 08:47:07 -0400 Subject: [PATCH] queries: Reorder Slint and HTML injections in Rust This fixes injections of Slint and HTML in Rust macros. These patterns must be moved after the generic `(macro_invocation (token_tree))` pattern since they are more specific, and later patterns now take priority. See . --- runtime/queries/rust/injections.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/runtime/queries/rust/injections.scm b/runtime/queries/rust/injections.scm index 42ca12b5b..1f83c6e7b 100644 --- a/runtime/queries/rust/injections.scm +++ b/runtime/queries/rust/injections.scm @@ -5,6 +5,16 @@ (#set! injection.language "markdown-rustdoc") (#set! injection.combined)) +((macro_invocation + (token_tree) @injection.content) + (#set! injection.language "rust") + (#set! injection.include-children)) + +((macro_rule + (token_tree) @injection.content) + (#set! injection.language "rust") + (#set! injection.include-children)) + ((macro_invocation macro: [ @@ -29,16 +39,6 @@ (#set! injection.language "slint") (#set! injection.include-children)) -((macro_invocation - (token_tree) @injection.content) - (#set! injection.language "rust") - (#set! injection.include-children)) - -((macro_rule - (token_tree) @injection.content) - (#set! injection.language "rust") - (#set! injection.include-children)) - ((macro_invocation macro: [