aboutsummaryrefslogtreecommitdiffstats
path: root/queries/python
diff options
context:
space:
mode:
authorStephan Seitz <stephan.seitz@fau.de>2020-11-28 22:25:27 +0100
committerThomas Vigouroux <tomvig38@gmail.com>2020-11-30 11:19:22 +0100
commitb3a3403e2535102c2cb4e1af93e5233ad8dc106b (patch)
tree353e3f877f035e409e6bd6d161b4279929a4a3f9 /queries/python
parentUpdate teal queries (diff)
downloadnvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar.gz
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar.bz2
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar.lz
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar.xz
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.tar.zst
nvim-treesitter-b3a3403e2535102c2cb4e1af93e5233ad8dc106b.zip
Update Python queries
Diffstat (limited to 'queries/python')
-rw-r--r--queries/python/highlights.scm10
-rw-r--r--queries/python/locals.scm42
2 files changed, 40 insertions, 12 deletions
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