From b3a3403e2535102c2cb4e1af93e5233ad8dc106b Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sat, 28 Nov 2020 22:25:27 +0100
Subject: Update Python queries

---
 queries/python/highlights.scm | 10 ++++++++--
 queries/python/locals.scm     | 42 ++++++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 12 deletions(-)

(limited to 'queries/python')

diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 4aaf6c20c..b98fc0cf7 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -224,8 +224,14 @@
   body: (block
           (expression_statement
             (assignment
-              left: (left_hand_side
-                      (identifier) @field)))))
+              left: (identifier) @field))))
+ (#vim-match? @field "^([A-Z])@!.*$"))
+((class_definition
+  body: (block
+          (expression_statement
+            (assignment
+              left: (_ 
+                     (identifier) @field)))))
  (#vim-match? @field "^([A-Z])@!.*$"))
 
 ((class_definition
diff --git a/queries/python/locals.scm b/queries/python/locals.scm
index 2e619f71b..73aa8b090 100644
--- a/queries/python/locals.scm
+++ b/queries/python/locals.scm
@@ -5,8 +5,13 @@
   body: (block
           (expression_statement
             (assignment
-              left: (left_hand_side
-                      (identifier) @definition.field))))) @scope
+              left: (identifier) @definition.field)))) @scope
+(class_definition
+  body: (block
+          (expression_statement
+            (assignment
+              left: (_ 
+                     (identifier) @definition.field))))) @scope
 
 ; Imports
 (aliased_import
@@ -61,15 +66,25 @@
 ;;; Loops
 ; not a scope!
 (for_statement
-  left: (left_hand_side
+  left: (pattern_list
+          (identifier) @definition.var))
+(for_statement
+  left: (tuple_pattern
           (identifier) @definition.var))
+(for_statement
+  left: (identifier) @definition.var)
 
 ; not a scope!
 ;(while_statement) @scope
 
 ; for in list comprehension
 (for_in_clause
-  left: (left_hand_side
+  left: (identifier) @definition.var)
+(for_in_clause
+  left: (tuple_pattern
+          (identifier) @definition.var))
+(for_in_clause
+  left: (pattern_list
           (identifier) @definition.var))
 
 (dictionary_comprehension) @scope
@@ -78,13 +93,20 @@
 
 ;;; Assignments
 
-(left_hand_side
- (identifier) @definition.var)
+(assignment
+ left: (identifier) @definition.var)
+
+(assignment
+ left: (pattern_list
+   (identifier) @definition.var))
+(assignment
+ left: (tuple_pattern
+   (identifier) @definition.var))
 
-(left_hand_side
- (attribute
-  (identifier)
-  (identifier) @definition.field))
+(assignment
+ left: (attribute
+   (identifier)
+   (identifier) @definition.field))
 
 ; Walrus operator  x := 1
 (named_expression
-- 
cgit v1.2.3-70-g09d2