GROOVY-9905

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2021 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.
@@ -2022,4 +2022,31 @@ public void testAccessOuterClassMemberFromInnerClassMethod4() {
 
         runConformTest(sources, "value");
     }
+
+    @Test // // https://issues.apache.org/jira/browse/GROOVY-9905
+    public void testAccessOuterClassMemberFromInnerClassMethod5() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "abstract class A {\n" +
+            "  protected final f = 'x'\n" +
+            "  abstract static class B {}\n" +
+            "}\n" +
+            "class C extends A {\n" +
+            "  private class D extends A.B {\n" + // B is static inner
+            "    String toString() {\n" +
+            "      println(f)\n" + // No such property: f for class: A
+            "      return 'y'\n" +
+            "    }\n" +
+            "  }\n" +
+            "  def m() {\n" +
+            "    new D().toString()\n" +
+            "  }\n" +
+            "}\n" +
+            "new C().m()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "x");
+    }
 }

base/org.codehaus.groovy30/.checkstyle

@@ -42,7 +42,7 @@
         <file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/EnumVisitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/ExtendedVerifier.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/classgen/InnerClassVisitorHelper.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/InnerClass(CompletionVisitor|VisitorHelper).java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/ReturnAdder.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/CallSiteWriter.java" include-pattern="false" />