1 files changed, 89 insertions, 43 deletions

diff --git a/queries/bitbake/indents.scm b/queries/bitbake/indents.scm
index 01d8aeb3c..ee60d0fda 100644
--- a/queries/bitbake/indents.scm
+++ b/queries/bitbake/indents.scm
@@ -1,76 +1,101 @@
 [
   (import_from_statement)
-
   (parenthesized_expression)
   (generator_expression)
   (list_comprehension)
   (set_comprehension)
   (dictionary_comprehension)
-
   (tuple_pattern)
   (list_pattern)
   (binary_operator)
-
   (lambda)
-
   (concatenated_string)
 ] @indent.begin
 
 ((list) @indent.align
- (#set! indent.open_delimiter "[")
- (#set! indent.close_delimiter "]")
-)
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]"))
+
 ((dictionary) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
+
 ((set) @indent.align
- (#set! indent.open_delimiter "{")
- (#set! indent.close_delimiter "}")
-)
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}"))
 
 ((for_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((if_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((while_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 ((try_statement) @indent.begin
- (#set! indent.immediate 1))
-(ERROR "try" ":" @indent.begin (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
+(ERROR
+  "try"
+  ":" @indent.begin
+  (#set! indent.immediate 1))
+
 ((python_function_definition) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
+
 (function_definition) @indent.begin
+
 (anonymous_python_function) @indent.begin
+
 ((with_statement) @indent.begin
- (#set! indent.immediate 1))
+  (#set! indent.immediate 1))
 
 (if_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
+
 (while_statement
   condition: (parenthesized_expression) @indent.align
   (#set! indent.open_delimiter "(")
   (#set! indent.close_delimiter ")")
   (#set! indent.avoid_last_matching_next 1))
 
-(ERROR "(" @indent.align (#set! indent.open_delimiter "(") (#set! indent.close_delimiter ")") . (_)) 
+(ERROR
+  "(" @indent.align
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  .
+  (_))
+
 ((argument_list) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
+
 ((parameters) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")")
- (#set! indent.avoid_last_matching_next 1))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")")
+  (#set! indent.avoid_last_matching_next 1))
+
 ((tuple) @indent.align
- (#set! indent.open_delimiter "(")
- (#set! indent.close_delimiter ")"))
+  (#set! indent.open_delimiter "(")
+  (#set! indent.close_delimiter ")"))
 
-(ERROR "[" @indent.align (#set! indent.open_delimiter "[") (#set! indent.close_delimiter "]") . (_)) 
+(ERROR
+  "[" @indent.align
+  (#set! indent.open_delimiter "[")
+  (#set! indent.close_delimiter "]")
+  .
+  (_))
 
-(ERROR "{" @indent.align (#set! indent.open_delimiter "{") (#set! indent.close_delimiter "}") . (_)) 
+(ERROR
+  "{" @indent.align
+  (#set! indent.open_delimiter "{")
+  (#set! indent.close_delimiter "}")
+  .
+  (_))
 
 [
   (break_statement)
@@ -78,24 +103,43 @@
 ] @indent.dedent
 
 (ERROR
-  (_) @indent.branch ":" .
+  (_) @indent.branch
+  ":"
+  .
   (#lua-match? @indent.branch "^else"))
 
 (ERROR
-  (_) @indent.branch @indent.dedent ":" .
+  (_) @indent.branch @indent.dedent
+  ":"
+  .
   (#lua-match? @indent.branch "^elif"))
 
-(parenthesized_expression ")" @indent.end)
-(generator_expression ")" @indent.end)
-(list_comprehension "]" @indent.end)
-(set_comprehension "}" @indent.end)
-(dictionary_comprehension "}" @indent.end)
+(parenthesized_expression
+  ")" @indent.end)
+
+(generator_expression
+  ")" @indent.end)
+
+(list_comprehension
+  "]" @indent.end)
+
+(set_comprehension
+  "}" @indent.end)
+
+(dictionary_comprehension
+  "}" @indent.end)
+
+(tuple_pattern
+  ")" @indent.end)
+
+(list_pattern
+  "]" @indent.end)
 
-(tuple_pattern ")" @indent.end)
-(list_pattern "]" @indent.end)
+(function_definition
+  "}" @indent.end)
 
-(function_definition "}" @indent.end)
-(anonymous_python_function "}" @indent.end)
+(anonymous_python_function
+  "}" @indent.end)
 
 (return_statement
   [
@@ -107,10 +151,12 @@
         "}"
         "]"
       ] @indent.end .)
-    (attribute 
+    (attribute
       attribute: (_) @indent.end)
     (call
-      arguments: (_ ")" @indent.end))
+      arguments:
+        (_
+          ")" @indent.end))
     "return" @indent.end
   ] .)