GROOVY-10239

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java

@@ -3280,4 +3280,62 @@ public void testTypeChecked10217() {
 
         runConformTest(sources, "11");
     }
+
+    @Test
+    public void testTypeChecked10239() {
+        assumeTrue(isParrotParser());
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test(List<C> list) {\n" +
+            "  def result = list.findAll {\n" +
+            "    it.e !in [E.X]\n" + // Cannot cast object 'true' with class 'java.lang.Boolean' to class 'Enum10239'
+            "  }\n" +
+            "  print result.size()\n" +
+            "}\n" +
+            "test([new C(E.X), new C(E.Y), new C(null)])\n",
+
+            "Types.groovy",
+            "@groovy.transform.TupleConstructor(defaults=false)\n" +
+            "class C {\n" +
+            "  E e\n" +
+            "}\n" +
+            "enum E {\n" +
+            "  X, Y\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "2");
+    }
+
+    @Test
+    public void testTypeChecked10239a() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test(List<C> list) {\n" +
+            "  def result = list.findAll {\n" +
+            "    !(it.e in [E.X])\n" +
+            "  }\n" +
+            "  print result.size()\n" +
+            "}\n" +
+            "test([new C(E.X), new C(E.Y), new C(null)])\n",
+
+            "Types.groovy",
+            "@groovy.transform.TupleConstructor(defaults=false)\n" +
+            "class C {\n" +
+            "  E e\n" +
+            "}\n" +
+            "enum E {\n" +
+            "  X, Y\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "2");
+    }
 }

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -797,6 +797,9 @@ public void visitBinaryExpression(final BinaryExpression expression) {
                     ? getResultType(rType, op, lType, reversedBinaryExpression)
                     : getResultType(lType, op, rType, expression);
             if (op == KEYWORD_IN || op == COMPARE_NOT_IN) {
+                // GRECLIPSE add -- GROOVY-10239
+                if (resultType == null) resultType = boolean_TYPE;
+                // GRECLIPSE end
                 // in case of the "in" operator, the receiver and the arguments are reversed
                 // so we use the reversedExpression and get the target method from it
                 storeTargetMethod(expression, reversedBinaryExpression.getNodeMetaData(DIRECT_METHOD_CALL_TARGET));

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -807,6 +807,7 @@ public void visitBinaryExpression(final BinaryExpression expression) {
                 // for the "in" or "!in" operator, the receiver and the arguments are reversed
                 BinaryExpression reverseExpression = binX(rightExpression, expression.getOperation(), leftExpression);
                 resultType = getResultType(rType, op, lType, reverseExpression);
+                if (resultType == null) resultType = boolean_TYPE; // GROOVY-10239
                 storeTargetMethod(expression, reverseExpression.getNodeMetaData(DIRECT_METHOD_CALL_TARGET));
             } else {
                 resultType = getResultType(lType, op, rType, expression);