GROOVY-9825

groovy · Nov 23, 2020 · 6187e12 · 6187e12
1 parent 31c63d2
commit 6187e12
Show file tree

Hide file tree

Showing 5 changed files with 1,222 additions and 1 deletion.
diff --git a/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java b/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
@@ -425,7 +425,7 @@ public void testLambdaScope2() {
     }
 
     @Test
-    public void testModuleInfo1() {
+    public void testModuleInfo() {
         assumeTrue(isAtLeastJava(JDK9));
 
         //@formatter:off
@@ -744,6 +744,31 @@ public void testStaticProperty9() {
         runConformTest(sources, "foo");
     }
 
+    @Test // GROOVY-9825
+    public void testStaticProperty10() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "interface A {\n" +
+            "  int X = 1\n" +
+            "}\n" +
+            "interface B extends A {\n" +
+            "  int Y = 2\n" +
+            "}\n" +
+            "class Main {\n" +
+            "  static class C implements B {\n" +
+            "    int getSum() { X + Y }\n" +
+            "  }\n" +
+            "  static main(args) {\n" +
+            "    print new C().sum\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "3");
+    }
+
     @Test
     public void testClash_GRE1076() {
         //@formatter:off

diff --git a/base/org.codehaus.groovy25/.checkstyle b/base/org.codehaus.groovy25/.checkstyle
@@ -42,6 +42,7 @@
         <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/VariableScopeVisitor.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/BinaryExpressionHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/BytecodeHelper.java" include-pattern="false" />