Fix for #1282: infer param type in case of generics placeholder

groovy · Jul 20, 2021 · 5e8afc4 · 5e8afc4
1 parent 6fa25e6
commit 5e8afc4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...e.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/GenericInferencingTests.java b/...e.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/GenericInferencingTests.java
@@ -1007,6 +1007,24 @@ public void testClosure14() {
         assertEquals("java.lang.String", printTypeName(m.getReturnType()));
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1282
+    public void testClosure15() {
+        String contents =
+            "def <T> void test(Iterator<T> it) {\n" +
+            "  it.forEachRemaining{e->}\n" +
+            "}\n";
+        assertType(contents, "e", "T");
+    }
+
+    @Test
+    public void testClosure16() {
+        String contents =
+            "void test(List list) {\n" +
+            "  list.stream().map{e->}\n" +
+            "}\n";
+        assertType(contents, "e", "java.lang.Object");
+    }
+
     @Test
     public void testArrayDGM() {
         String contents =

diff --git a/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java b/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java
@@ -968,7 +968,7 @@ public void visitClosureExpression(final ClosureExpression node) {
                 Parameter[] parameters = node.getParameters();
                 for (int i = 0, n = parameters.length; i < n; i += 1) {
                     // only change the type of the parameter if it's not explicitly defined
-                    if (parameters[i].isDynamicTyped() && !VariableScope.OBJECT_CLASS_NODE.equals(inferredParamTypes[i])) {
+                    if (parameters[i].isDynamicTyped() && (inferredParamTypes[i].isGenericsPlaceHolder() || !inferredParamTypes[i].equals(VariableScope.OBJECT_CLASS_NODE))) {
                         parameters[i].setType(inferredParamTypes[i]);
                     }
                 }