GROOVY-10280: STC: do not mix type param contexts when resolving

Author: eric-milles

src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java

@@ -1576,14 +1576,10 @@ private static void addMissingEntries(final Map<GenericsTypeName, GenericsType>
     }
 
     public static ClassNode resolveClassNodeGenerics(Map<GenericsTypeName, GenericsType> resolvedPlaceholders, final Map<GenericsTypeName, GenericsType> placeholdersFromContext, final ClassNode currentType) {
-        ClassNode target = currentType.redirect();
-        resolvedPlaceholders = new HashMap<>(resolvedPlaceholders);
-        applyContextGenerics(resolvedPlaceholders, placeholdersFromContext);
-
-        Map<GenericsTypeName, GenericsType> connections = new HashMap<>();
-        extractGenericsConnections(connections, currentType, target);
-        applyGenericsConnections(connections, resolvedPlaceholders);
-        return applyGenericsContext(resolvedPlaceholders, currentType);
+        ClassNode type = currentType; // GROOVY-10280, et al.
+        type = applyGenericsContext(resolvedPlaceholders, type);
+        type = applyGenericsContext(placeholdersFromContext, type);
+        return type;
     }
 
     static void applyGenericsConnections(final Map<GenericsTypeName, GenericsType> connections, final Map<GenericsTypeName, GenericsType> resolvedPlaceholders) {

src/test/groovy/transform/stc/GenericsSTCTest.groovy

@@ -932,21 +932,24 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
         assertScript '''
             class Test<T> {
                 T test() {
-                    new Foo<T>().one.two.three
+                    @ASTTest(phase=INSTRUCTION_SELECTION, value={
+                        def type = node.getNodeMetaData(INFERRED_TYPE)
+                        assert type.toString(false) == 'T'
+                    })
+                    def t = new Foo<T>().x.y.z
                 }
             }
             class Foo<X> {
-                Bar<X> one = new Bar<>()
+                Bar<X> x = new Bar<>()
             }
-            class Bar<Y> {
-                Baz<Y> two = new Baz<>()
+            class Bar<T> {
+                Baz<T> y = new Baz<>()
             }
             class Baz<Z> {
-                Z three
+                Z z
             }
 
-            def result = new Test().test()
-            assert result == null
+            new Test<String>().test()
         '''
     }