GROOVY-10887

eric-milles · eric-milles · commit 285dd3160a44 · 2023-01-04T14:32:32.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/GenericInferencingTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/GenericInferencingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2022 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1199,8 +1199,36 @@ public void testNestedGenerics8() {
         assertType(contents, "val", "java.util.Map<java.lang.Class,java.lang.Class<java.lang.Integer>>");
     }
 
-    @Test // https://github.com/groovy/groovy-eclipse/issues/1369
+    @Test
     public void testNestedGenerics9() {
+        String contents =
+            "abstract class Channel {\n" +
+            "}\n" +
+            "class ChannelSpec<S extends ChannelSpec<S,C>, C extends Channel> {\n" +
+            "  S prop(value) {\n" +
+            "    this\n" +
+            "  }\n" +
+            "}\n" +
+            "class Cat {\n" +
+            "  static <X extends ChannelSpec<X,Y>, Y extends Channel> X m(X self) {\n" +
+            "    self.prop(null)\n" + // returns self
+            "  }\n" +
+            "}\n" +
+
+            "class DirectChannel extends Channel {\n" +
+            "}\n" +
+            "class DirectChannelSpec extends ChannelSpec<DirectChannelSpec,DirectChannel> {\n" +
+            "}\n" +
+            "use(Cat){new DirectChannelSpec().m()}\n";
+
+        assertType(contents, "prop", "X");
+        assertDeclaringType(contents, "prop", "ChannelSpec<X,Y>");
+
+        assertType(contents, "m", "DirectChannelSpec"); // GROOVY-10887
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1369
+    public void testNestedGenerics10() {
         String contents =
             "interface Buildable<R> {\n" +
             "  R build()\n" +
diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/VariableScope.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/VariableScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2022 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1047,7 +1047,14 @@ public static void findAllInterfaces(ClassNode type, final Set<ClassNode> accumu
     public static void createTypeHierarchy(ClassNode type, final Set<ClassNode> accumulator, final boolean useResolved) {
         if (!useResolved) type = type.redirect();
         if (!accumulator.contains(type)) {
+            ClassNode[] bounds = null;
             if (!type.isInterface()) {
+                if (type.isGenericsPlaceHolder() && type.getGenericsTypes() != null) {
+                    bounds = type.getGenericsTypes()[0].getUpperBounds();
+                    if (bounds != null && bounds.length > 0) {
+                        type = bounds[0]; // "T extends X ..."
+                    }
+                }
                 accumulator.add(type);
                 // Groovy compiler has a different notion of 'resolved' than we do here.
                 // It considers a ClassNode resolved if it is primary or has type class.
@@ -1060,6 +1067,11 @@ public static void createTypeHierarchy(ClassNode type, final Set<ClassNode> accu
             if (!type.equals(OBJECT_CLASS_NODE)) {
                 findAllInterfaces(type, accumulator, useResolved);
             }
+            if (bounds != null && bounds.length > 1) {
+                for (int i = 1; i < bounds.length; i += 1) {
+                    findAllInterfaces(bounds[i], accumulator, useResolved);
+                }
+            }
         }
     }
 
