1 files changed, 29 insertions, 7 deletions
diff --git a/queries/python/indents.scm b/queries/python/indents.scm
index ff828cd91..d629c954f 100644
--- a/queries/python/indents.scm
+++ b/queries/python/indents.scm
@@ -1,16 +1,38 @@
 [
-  (function_definition)
+  (list)
+  (tuple)
+  (dictionary)
+  (set)
+
   (if_statement)
+  (for_statement)
+  (while_statement)
   (with_statement)
   (try_statement)
-  (for_statement)
-  (for_in_clause)
+  (import_from_statement)
+
+  (parenthesized_expression)
+  (generator_expression)
+  (list_comprehension)
+  (set_comprehension)
+  (dictionary_comprehension)
+
+  (tuple_pattern)
+  (list_pattern)
+  (argument_list)
+  (parameters)
+  (binary_operator)
+
+  (function_definition)
   (class_definition)
 ] @indent
 
 [
-  "elif"
-  "else"
-  "finally"
-  "except"
+  ")"
+  "]"
+  "}"
+  (elif_clause)
+  (else_clause)
+  (except_clause)
+  (finally_clause)
 ] @branch