summaryrefslogtreecommitdiffstats
path: root/queries/python
diff options
context:
space:
mode:
authorGeorge Harker <george@george-graphics.co.uk>2023-03-19 18:55:48 -0700
committerAmaan Qureshi <amaanq12@gmail.com>2023-03-24 13:07:53 -0400
commitb4fcc611753bd443d30a75c1797a93268faa8aba (patch)
tree47414852a2f687cefe5ef1c42063ec612abbad10 /queries/python
parentrefactor(indent)!: Rework indent, aligned indent (diff)
downloadnvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar.gz
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar.bz2
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar.lz
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar.xz
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.tar.zst
nvim-treesitter-b4fcc611753bd443d30a75c1797a93268faa8aba.zip
split delimiter into open_delimiter and close_delimiter
Diffstat (limited to 'queries/python')
-rw-r--r--queries/python/indents.scm42
1 files changed, 29 insertions, 13 deletions
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index 82933c159..166787f28 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -17,13 +17,19 @@
] @indent
((list) @aligned_indent
- (#set! "delimiter" "[]")
+ (#set! "open_delimiter" "[")
+ (#set! "close_delimiter" "]")
+ (#set! "dedent_lone_close_delimiter" 1)
)
((dictionary) @aligned_indent
- (#set! "delimiter" "{}")
+ (#set! "open_delimiter" "{")
+ (#set! "close_delimiter" "}")
+ (#set! "dedent_lone_close_delimiter" 1)
)
((set) @aligned_indent
- (#set! "delimiter" "{}")
+ (#set! "open_delimiter" "{")
+ (#set! "close_delimiter" "}")
+ (#set! "dedent_lone_close_delimiter" 1)
)
((for_statement) @indent
@@ -44,25 +50,35 @@
(if_statement
condition: (parenthesized_expression) @aligned_indent
- (#set! "delimiter" "()")
- (#set! "avoid_last_matching_next" 1))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")")
+ (#set! "avoid_last_matching_next" 1)
+)
(while_statement
condition: (parenthesized_expression) @aligned_indent
- (#set! "delimiter" "()")
- (#set! "avoid_last_matching_next" 1))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")")
+ (#set! "avoid_last_matching_next" 1)
+)
-(ERROR "(" @aligned_indent (#set! "delimiter" "()") . (_))
+(ERROR "(" @aligned_indent (#set! "open_delimiter" "(") (#set! "close_delimiter" ")") . (_))
((argument_list) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
((parameters) @aligned_indent
- (#set! "delimiter" "()")
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")")
(#set! "avoid_last_matching_next" 1))
((tuple) @aligned_indent
- (#set! "delimiter" "()"))
+ (#set! "open_delimiter" "(")
+ (#set! "close_delimiter" ")"))
-(ERROR "[" @aligned_indent (#set! "delimiter" "[]") . (_))
+(ERROR "[" @aligned_indent (#set! "open_delimiter" "[") (#set! "close_delimiter" "]") . (_))
+(list "]" @indent_end)
-(ERROR "{" @aligned_indent (#set! "delimiter" "{}") . (_))
+(ERROR "{" @aligned_indent (#set! "open_delimiter" "{") (#set! "close_delimiter" "}") . (_))
+(dictionary "}" @indent_end)
+(set "}" @indent_end)
(parenthesized_expression ")" @indent_end)
(generator_expression ")" @indent_end)