GROOVY-9891

eric-milles · eric-milles · commit d1022ea87154 · 2021-02-12T16:43:08.000-06: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
@@ -699,6 +699,36 @@ public void testTypeChecked9873() {
         runConformTest(sources, "123", options);
     }
 
+    @Test
+    public void testTypeChecked9891() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.TypeChecked\n" +
+            "void test(Pojo pojo) {\n" +
+            "  Collection<? extends Number> c = pojo.map.values()\n" +
+            "  Iterable<? extends Number> i = pojo.map.values()\n" + // Cannot assign Collection<? extends Number> to Iterable<? extends Number>
+            "  print i.iterator().next()\n" +
+            "}\n" +
+            "test(new Pojo(map: [x:1,y:2,z:3.4]))\n",
+
+            "Pojo.java",
+            "import java.util.Map;\n" +
+            "class Pojo {\n" +
+            "  Map<String, ? extends Number> getMap() {\n" +
+            "    return map;\n" +
+            "  }\n" +
+            "  void setMap(Map<String, ? extends Number> map) {\n" +
+            "    this.map = map;\n" +
+            "  }\n" +
+            "  private Map<String, ? extends Number> map = null;\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "1");
+    }
+
     @Test
     public void testTypeChecked9902() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/tools/GenericsUtils.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -425,6 +425,14 @@ public static ClassNode correctToGenericsSpec(Map<String, ClassNode> genericsSpe
             String name = type.getName();
             ret = genericsSpec.get(name);
         }
+        // GRECLIPSE add -- GROOVY-9891
+        else if (type.isWildcard()) {
+            ret = type.getLowerBound(); // use lower or upper
+            if (ret == null && type.getUpperBounds() != null) {
+                ret = type.getUpperBounds()[0]; // ? supports 1
+            }
+        }
+        // GRECLIPSE end
         if (ret == null) ret = type.getType();
         return ret;
     }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/tools/GenericsUtils.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -421,6 +421,14 @@ public static ClassNode correctToGenericsSpec(Map<String, ClassNode> genericsSpe
             String name = type.getName();
             ret = genericsSpec.get(name);
         }
+        // GRECLIPSE add -- GROOVY-9891
+        else if (type.isWildcard()) {
+            ret = type.getLowerBound(); // use lower or upper
+            if (ret == null && type.getUpperBounds() != null) {
+                ret = type.getUpperBounds()[0]; // ? supports 1
+            }
+        }
+        // GRECLIPSE end
         if (ret == null) ret = type.getType();
         return ret;
     }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/tools/GenericsUtils.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -421,6 +421,14 @@ public static ClassNode correctToGenericsSpec(Map<String, ClassNode> genericsSpe
             String name = type.getName();
             ret = genericsSpec.get(name);
         }
+        // GRECLIPSE add -- GROOVY-9891
+        else if (type.isWildcard()) {
+            ret = type.getLowerBound(); // use lower or upper
+            if (ret == null && type.getUpperBounds() != null) {
+                ret = type.getUpperBounds()[0]; // ? supports 1
+            }
+        }
+        // GRECLIPSE end
         if (ret == null) ret = type.getType();
         return ret;
     }
