Bump topiary

Topiary now does not seem to coalesce multiple empty lines into one so
we need to reorganize a couple of formatting rules. While we are at it
we clean up a few oddities around block formatting.

Author: bbannier

Cargo.lock

@@ -9,9 +9,8 @@ repository = "https://github.com/bbannier/spicy-format"
 
 [dependencies]
 tree-sitter-spicy = { git = "https://github.com/bbannier/tree-sitter-spicy" }
-topiary-core = { git = "https://github.com/tweag/topiary.git", version = "0.3.0" }
-topiary-tree-sitter-facade = { git = "https://github.com/tweag/topiary.git", version = "0.3.0" }
-tree-sitter-facade = { git = "https://github.com/tweag/tree-sitter-facade" }
+topiary-core = { git = "https://github.com/tweag/topiary.git", version = "0.4.0" }
+topiary-tree-sitter-facade = { git = "https://github.com/tweag/topiary.git", version = "0.4.0" }
 clap = { version = "4.5.4", features = ["std", "derive", "help"], default-features = false }
 tree-sitter = "0.22.6"
 thiserror = "1.0.61"

Cargo.toml

@@ -12,7 +12,7 @@ for (i in [1,2,3]) {
 for (i in [1,2,3])
 print i;
 
-while (1);
+while (1){}
 while (1) { print 1;break;}
 
 if (1 in [1,2,3])

corpus/constructs.spicy

@@ -12,7 +12,7 @@ for (i in [1, 2, 3]) {
 for (i in [1, 2, 3])
     print i;
 
-while (1) ;
+while (1) {}
 while (1) {
     print 1;
     break;

corpus/constructs.spicy.expected

@@ -8,14 +8,11 @@ function f() {
 }
 
 function f() {
-    if (True)
-    {
+    if (True) {
         1;
-    }
-    else if (False) {
+    } else if (False) {
         2;
-    }
-    else {
+    } else {
         3;
     }
 }

corpus/statements.spicy.expected

@@ -53,7 +53,7 @@ type X = unit {};
 type X = unit(inout n: uint8) {};
 
 type X = unit {
-    : uint8 if (True);
+    : uint8 if(True);
 };
 
 public type X = unit {

corpus/unit.spicy.expected

@@ -130,7 +130,7 @@
   (comment)*
   ; We only match statements with a single expression here since statements
   ; with blocks do their own indention.
-  (statement (expression)) @append_indent_end
+  (statement (expression)) @prepend_input_softline @append_indent_end
 )
 
 ; Switch with local binding.
@@ -170,7 +170,6 @@
  "on"
  "="
  (is_debug)
- "if"
  (hook_priority)
 ] @append_space @prepend_space
 
@@ -299,10 +298,10 @@
 
 (sink_decl "sink" @append_space)
 
-(statement) @prepend_input_softline
-
 (
-  (statement)
+  (statement
+    (block)? @do_nothing
+  )
   .
   (comment)? @do_nothing
 ) @append_hardline
@@ -339,6 +338,9 @@
 ; Unit `switch` statement.
 (unit_switch (expression) ")" @append_space)
 
+(if
+  "if" @append_space
+)
 (if
   "if"
   (expression) @append_indent_start
@@ -349,6 +351,9 @@
   "else" @append_indent_start
   (statement [(block) (if)]*@do_nothing) @prepend_hardline @append_indent_end
 )
+(if
+  "else" @prepend_space @append_space
+)
 
 
 (for
@@ -361,11 +366,11 @@
 )
 (for
   ")" @append_indent_start
-  (statement (block)*@do_nothing) @append_indent_end
+  (statement (block)*@do_nothing) @prepend_input_softline @append_indent_end
 )
 
 (while
-  "while" @prepend_space
+  "while" @append_space
   "(" @prepend_space
   ")" @append_space
 )
@@ -392,17 +397,21 @@
   (#multi_line_only!)
 )
 
-; Suppress space before field `;` decl with `if.
-(field_decl
-  (is_skip)? @append_space
-  (if (statement ";") @prepend_antispace)?
-)
 ; Enforce spaces around `->` in field sink syntax.
 (field_decl
   "->" @prepend_space @append_space
   (sink)
 )
 
+(field_decl
+  (is_skip)? @append_space
+)
+
+(field_decl
+  "if" @prepend_space
+  .
+  "("
+)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Bitfields.