Fix compile error with single explicit assert in switch expression br…

…anch (spockframework#1845)
Vampire · Nov 5, 2024 · 14a8e21 · 14a8e21
1 parent d6f8372
commit 14a8e21
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/spock-core/src/main/java/org/spockframework/compiler/AbstractDeepBlockRewriter.java b/spock-core/src/main/java/org/spockframework/compiler/AbstractDeepBlockRewriter.java
@@ -149,6 +149,12 @@ public final void visitClosureExpression(ClosureExpression expr) {
       currSpecialMethodCall = NoSpecialMethodCall.INSTANCE; // unrelated closure terminates currSpecialMethodCall scope
     }
     try {
+      Statement code = expr.getCode();
+      if (!(code instanceof BlockStatement)) {
+        BlockStatement block = new BlockStatement();
+        block.addStatement(code);
+        expr.setCode(block);
+      }
       doVisitClosureExpression(expr);
     } finally {
       currClosure = oldClosure;

diff --git a/...s/src/test-groovy-ge-4.0/groovy/org/spockframework/smoke/condition/ConditionG4Spec.groovy b/...s/src/test-groovy-ge-4.0/groovy/org/spockframework/smoke/condition/ConditionG4Spec.groovy
@@ -13,4 +13,14 @@ class ConditionG4Spec extends Specification {
     (0..<5) == [0, 1, 2, 3, 4]
     (0<..<5) == [1, 2, 3, 4]
   }
+
+  @Issue("https://github.com/spockframework/spock/issues/1845")
+  def "explicit assert in switch expression"() {
+    expect:
+    def b = 3
+    !!switch (b) {
+      case 3 -> assert 1 == 1
+      default -> assert 1 == 1
+    }
+  }
 }