GROOVY-9854

eric-milles · eric-milles · commit 052c350575e0 · 2022-07-08T09:39:00.000-05:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -2671,6 +2671,25 @@ public void testTypeChecked9844() {
         runConformTest(sources, "[key:val][key:val]");
     }
 
+    @Test
+    public void testTypeChecked9854() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test() {\n" +
+            "  switch (42) {\n" +
+            "    case { it > 1 }:\n" +
+            "      print 'works'\n" +
+            "  }\n" +
+            "}\n" +
+            "test()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "works");
+    }
+
     @Test(expected = AssertionError.class)
     public void testTypeChecked9873() {
         Map<String, String> options = getCompilerOptions();
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4719,7 +4719,20 @@ public BinaryExpression findInstanceOfNotReturnExpression(IfStatement ifElse) {
     public void visitSwitch(final SwitchStatement statement) {
         Map<VariableExpression, List<ClassNode>> oldTracker = pushAssignmentTracking();
         try {
+            /* GRECLIPSE edit -- GROOVY-9854
             super.visitSwitch(statement);
+            */
+            visitStatement(statement);
+            statement.getExpression().visit(this);
+            ClassNode type = getType(statement.getExpression());
+            for (CaseStatement caseStatement : statement.getCaseStatements()) {
+                if (caseStatement.getExpression() instanceof ClosureExpression) // propagate the type
+                    caseStatement.getExpression().putNodeMetaData(StaticTypesMarker.CLOSURE_ARGUMENTS, new ClassNode[]{type});
+
+                caseStatement.visit(this);
+            }
+            statement.getDefaultStatement().visit(this);
+            // GRECLIPSE end
         } finally {
             popAssignmentTracking(oldTracker);
         }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4495,6 +4495,12 @@ protected void afterSwitchConditionExpressionVisited(final SwitchStatement state
 
     @Override
     public void visitCaseStatement(final CaseStatement statement) {
+        Expression expression = statement.getExpression();
+        if (expression instanceof ClosureExpression) { // GROOVY-9854: propagate the switch type
+            SwitchStatement switchStatement = typeCheckingContext.getEnclosingSwitchStatement();
+            ClassNode inf = switchStatement.getExpression().getNodeMetaData(TYPE);
+            expression.putNodeMetaData(CLOSURE_ARGUMENTS, new ClassNode[]{inf});
+        }
         super.visitCaseStatement(statement);
         restoreTypeBeforeConditional();
     }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4122,6 +4122,12 @@ protected void afterSwitchConditionExpressionVisited(final SwitchStatement state
 
     @Override
     public void visitCaseStatement(final CaseStatement statement) {
+        Expression expression = statement.getExpression();
+        if (expression instanceof ClosureExpression) { // GROOVY-9854: propagate the switch type
+            SwitchStatement switchStatement = typeCheckingContext.getEnclosingSwitchStatement();
+            ClassNode inf = switchStatement.getExpression().getNodeMetaData(TYPE);
+            expression.putNodeMetaData(CLOSURE_ARGUMENTS, new ClassNode[]{inf});
+        }
         super.visitCaseStatement(statement);
         restoreTypeBeforeConditional();
     }
