From dd89cafd2bc5ddbb201b6b1ea72ecd11acbe4e31 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 5 Nov 2022 10:31:02 +0100 Subject: fix(rust): update queries to breaking changes * `if_let_expression` was removed in https://github.com/tree-sitter/tree-sitter-rust/pull/152 * `attributes` were reworked in https://github.com/tree-sitter/tree-sitter-rust/pull/163 (no more `meta-item`) --- queries/rust/folds.scm | 1 - queries/rust/highlights.scm | 12 ++++++------ queries/rust/locals.scm | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'queries/rust') diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm index d83351cb4..97cf2eafb 100644 --- a/queries/rust/folds.scm +++ b/queries/rust/folds.scm @@ -14,7 +14,6 @@ (for_expression) (while_expression) (if_expression) - (if_let_expression) (match_expression) (call_expression) diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm index c08912bea..3df682c34 100644 --- a/queries/rust/highlights.scm +++ b/queries/rust/highlights.scm @@ -121,14 +121,14 @@ (macro_definition "macro_rules!" @function.macro) ;; Attribute macros -(attribute_item (meta_item (identifier) @function.macro)) -(meta_item (scoped_identifier (identifier) @function.macro .)) +(attribute_item (attribute (identifier) @function.macro)) +(attribute (scoped_identifier (identifier) @function.macro .)) ;; Derive macros (assume all arguments are types) -(meta_item - (identifier) @_name - arguments: (meta_arguments (meta_item (identifier) @type)) - (#eq? @_name "derive")) +; (attribute +; (identifier) @_name +; arguments: (attribute (attribute (identifier) @type)) +; (#eq? @_name "derive")) ;; Function-like macros (macro_invocation diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm index 010bf4afd..1cefcabf3 100644 --- a/queries/rust/locals.scm +++ b/queries/rust/locals.scm @@ -34,7 +34,7 @@ (tuple_pattern (identifier) @definition.var) -(if_let_expression +(let_condition pattern: (_ (identifier) @definition.var)) @@ -93,7 +93,6 @@ (for_expression) (loop_expression) (if_expression) - (if_let_expression) (match_expression) (match_arm) -- cgit v1.2.3-70-g09d2