Merge branch 'nvim-treesitter:master' into masterHEADmaster

3 files changed, 32 insertions, 17 deletions

diff --git a/queries/rust/folds.scm b/queries/rust/folds.scm
index d83351cb..97cf2eaf 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 c08912be..c7cd1174 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -25,7 +25,6 @@
 
 (self) @variable.builtin
 
-(lifetime   ["'" (identifier)] @label)
 (loop_label ["'" (identifier)] @label)
 
 
@@ -72,6 +71,9 @@
 (scoped_type_identifier
   path: (identifier) @namespace)
 (scoped_type_identifier
+  path: (identifier) @type
+  (#lua-match? @type "^[A-Z]"))
+(scoped_type_identifier
  (scoped_identifier
   name: (identifier) @namespace))
 ((scoped_identifier
@@ -121,14 +123,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
@@ -169,7 +171,6 @@
 [
   "async"
   "await"
-  "const"
   "default"
   "dyn"
   "enum"
@@ -179,17 +180,26 @@
   "match"
   "move"
   "pub"
-  "ref"
-  "static"
   "struct"
   "trait"
   "type"
   "union"
   "unsafe"
   "where"
-  (mutable_specifier)
 ] @keyword
 
+[
+ "ref"
+ (mutable_specifier)
+] @type.qualifier
+
+[
+ "const"
+ "static"
+] @storageclass
+
+(lifetime ["'" (identifier)] @storageclass.lifetime)
+
 "fn" @keyword.function
 [
   "return"
@@ -201,7 +211,8 @@
 
 (use_list (self) @keyword)
 (scoped_use_list (self) @keyword)
-(scoped_identifier (self) @keyword)
+(scoped_identifier [(crate) (super) (self)] @keyword)
+(visibility_modifier [(crate) (super) (self)] @keyword)
 
 [
   "else"
@@ -216,8 +227,7 @@
   "while"
 ] @repeat
 
-(impl_item
-  "for" @keyword)
+"for" @keyword
 (for_expression
   "for" @repeat)
 
@@ -266,6 +276,8 @@
 (closure_parameters "|"    @punctuation.bracket)
 (type_arguments  ["<" ">"] @punctuation.bracket)
 (type_parameters ["<" ">"] @punctuation.bracket)
+(bracketed_type ["<" ">"] @punctuation.bracket)
+(for_lifetimes ["<" ">"] @punctuation.bracket)
 
 ["," "." ":" "::" ";"] @punctuation.delimiter
 
@@ -273,3 +285,8 @@
 (inner_attribute_item ["!" "#"] @punctuation.special)
 (macro_invocation "!" @function.macro)
 (empty_type "!" @type.builtin)
+
+(macro_invocation macro: (identifier) @_ident @exception "!" @exception
+ (#eq? @_ident "panic"))
+(macro_invocation macro: (identifier) @_ident @exception "!" @exception
+ (#contains? @_ident "assert"))
diff --git a/queries/rust/locals.scm b/queries/rust/locals.scm
index 010bf4af..1cefcabf 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)