Update tree-sitter-query formatting to handle changes

* This also changes our TOML queries
* Also made minor comment adjustments to the Bash queries

topiary-queries/queries/bash.scm

@@ -2,8 +2,8 @@
 ; any which are encountered by Topiary will be forcibly collapsed on to
 ; a single line. (See Issue #172)
 
-; Don't modify strings, heredocs, comments, atomic "words" or variable
-; expansions (simple or otherwise)
+; Don't modify strings, heredocs, comments, atomic "words", variable
+; expansions or array indices.
 [
   (comment)
   (expansion)

topiary-queries/queries/toml.scm

@@ -67,12 +67,14 @@
 
 ; remove trailing comma from last element of single line array
 (array
-  ("," @delete . "]")(#single_line_only!)
+  ("," @delete . "]")
+  (#single_line_only!)
 )
 
 ; add trailing comma if absent to last string of multiline array
 (array
-  (((string) @append_delimiter) . ","* @do_nothing . (comment)? . "]")(#delimiter! ",")
+  (((string) @append_delimiter) . ","* @do_nothing . (comment)? . "]")
+  (#delimiter! ",")
   (#multi_line_only!)
 )
 

topiary-queries/queries/tree_sitter_query.scm

@@ -14,6 +14,8 @@
   _ @allow_blank_line_before @prepend_hardline
 )
 
+(predicate) @allow_blank_line_before
+
 ; There is a large category of nodes that must be separated by spaces
 (
   [
@@ -45,6 +47,7 @@
     "_"
   ]
 )
+
 (anonymous_node
   (capture) @prepend_space
 )
@@ -98,6 +101,7 @@
   [
     (anonymous_node)
     (field_definition)
+    (grouping)
     (list)
     (named_node)
     (predicate)
@@ -107,6 +111,7 @@
   [
     (anonymous_node)
     (field_definition)
+    (grouping)
     (list)
     (named_node)
     (predicate)