Force linebreaks between multiple expressions in unit switch case

Author: bbannier

corpus/unit.spicy

@@ -31,16 +31,6 @@ switch {
 };
 };
 
-type X = unit {
-  switch (True) {
-    * -> {
-      switch (True) {
-        * -> x: uint8;
-      };
-    }
-  };
-};
-
 type X = unit{
 on %init {}
 b: uint8 {print $$;}
@@ -55,13 +45,6 @@ type X = unit {
     : uint8 if (True);
 };
 
-public type X = unit {
-    switch (1+1) {
-        1 -> a : b"1";
-        * -> : void;
-    };
-};
-
 type X = unit () {};
 
 type X = unit (x: X) {};
@@ -113,6 +96,31 @@ type X = unit {
   # Bar.
 };
 
+public type X = unit {
+    switch (1+1) {
+        1 -> a : b"1";
+        * -> : void;
+    };
+};
+
+type X = unit {
+  switch (True) {
+    * -> {
+      switch (True) {
+        * -> x: uint8;
+      };
+    }
+  };
+};
+
+type X = unit(a: uint8) {
+    switch (a) {
+    1,
+    2,
+    3 -> : skip uint8;
+    };
+};
+
 # Sink syntax.
 public type X = unit {
     : bytes &eod -> self.data;

corpus/unit.spicy.expected

@@ -40,16 +40,6 @@ type X = unit {
     };
 };
 
-type X = unit {
-    switch (True) {
-        * -> {
-            switch (True) {
-                * -> x: uint8;
-            };
-        }
-    };
-};
-
 type X = unit {
     on %init {}
     b: uint8 {
@@ -66,13 +56,6 @@ type X = unit {
     : uint8 if(True);
 };
 
-public type X = unit {
-    switch (1 + 1) {
-        1 -> a: b"1";
-        * -> : void;
-    };
-};
-
 type X = unit {};
 
 type X = unit(x: X) {};
@@ -136,6 +119,31 @@ type X = unit {
     # Bar.
 };
 
+public type X = unit {
+    switch (1 + 1) {
+        1 -> a: b"1";
+        * -> : void;
+    };
+};
+
+type X = unit {
+    switch (True) {
+        * -> {
+            switch (True) {
+                * -> x: uint8;
+            };
+        }
+    };
+};
+
+type X = unit(a: uint8) {
+    switch (a) {
+        1,
+        2,
+        3 -> : skip uint8;
+    };
+};
+
 # Sink syntax.
 public type X = unit {
     : bytes &eod -> self.data;

src/query.scm

@@ -97,6 +97,11 @@
   "->" @prepend_space @append_space
 )
 
+(unit_switch_case
+  (expression)+
+  (expression) @prepend_hardline
+)
+
 (switch
   "switch" @append_space
   "(" (expression) ")" @append_space