Fix for #1249: use type argument(s) given; don't assume matching count

groovy · Apr 19, 2021 · b7aa3fb · b7aa3fb
1 parent 724f552
commit b7aa3fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
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
@@ -1353,6 +1353,12 @@ public void testStaticMethod12() {
         assertEquals("Parameter type should be resolved", "java.util.Collection<? extends java.lang.String>", printTypeName(m.getParameters()[0].getType()));
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1249
+    public void testStaticMethod13() {
+        String contents = "Comparator.<String>comparing{it.length()}";
+        assertType(contents, "comparing", "java.util.Comparator<java.lang.String>");
+    }
+
     @Test
     public void testStaticMethodOverloads1() {
         String contents =

diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/GenericsMapper.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/GenericsMapper.java
@@ -121,9 +121,9 @@ public static GenericsMapper gatherGenerics(final List<ClassNode> argumentTypes,
             }
             mapper.allGenerics.add(resolved);
 
-            if (methodGenerics != null && methodGenerics.length > 0) { assert methodGenerics.length == ugts.length;
+            if (methodGenerics != null && methodGenerics.length > 0) {
                 // method generics are explicitly defined
-                for (int i = 0; i < ugts.length; i += 1) {
+                for (int i = 0, n = Math.min(ugts.length, methodGenerics.length); i < n; i += 1) {
                     resolved.put(ugts[i].getName(), methodGenerics[i].getType());
                 }
             } else if (argumentTypes != null) {