GROOVY-11711: restore outer class generics after inner class visit

4_0_X backport

Author: eric-milles

src/main/java/org/codehaus/groovy/control/ResolveVisitor.java

@@ -1272,8 +1272,14 @@ public void visitClass(final ClassNode node) {
 
         //
 
-        if (!(node instanceof InnerClassNode) || Modifier.isStatic(node.getModifiers())) {
+        Map<GenericsTypeName, GenericsType> outerNames = null;
+        if (node instanceof InnerClassNode) {
+            outerNames = genericParameterNames;
             genericParameterNames = new HashMap<>();
+            if (!Modifier.isStatic(node.getModifiers()))
+                genericParameterNames.putAll(outerNames); // outer names visible
+        } else {
+            genericParameterNames.clear(); // outer class: new generic namespace
         }
         resolveGenericsHeader(node.getGenericsTypes());
         switch (phase) { // GROOVY-9866, GROOVY-10466
@@ -1316,6 +1322,7 @@ public void visitClass(final ClassNode node) {
             visitObjectInitializerStatements(node);
             visitAnnotations(node); // GROOVY-10750, GROOVY-11206
         }
+        if (outerNames != null) genericParameterNames = outerNames;
         currentClass = oldNode;
     }
 

src/test/groovy/gls/innerClass/InnerClassTest.groovy

@@ -1265,6 +1265,25 @@ final class InnerClassTest {
         assert err =~ /No enclosing instance passed in constructor call of a non-static inner class/
     }
 
+    // GROOVY-11711
+    @Test
+    void testUsageOfOuterType6() {
+        assertScript '''
+            class Foo<T> {
+                static class Bar {
+                }
+                /*non-static*/ class Baz
+                    implements java.util.concurrent.Callable<T> {
+                    T call() {
+                    }
+                }
+            }
+            def foo = new Foo<Short>()
+            def baz = new Foo.Baz(foo)
+            assert baz.call() == null
+        '''
+    }
+
     @Test
     void testClassOutputOrdering() {
         // this does actually not do much, but before this