GROOVY-9259

groovy · Feb 21, 2022 · 6644009 · 6644009
1 parent f785b29
commit 6644009
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
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
@@ -4297,6 +4297,42 @@ public void testImplementingInterface9() {
         runConformTest(sources, "8:30pm");
     }
 
+    @Test // GROOVY-9259
+    public void testImplementingInterface10() {
+        assumeTrue(isParrotParser()); // TODO: support default in antlr2 parser?
+
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "print new C().m()\n",
+
+            "A.java",
+            "public interface A {\n" +
+            "  String m();\n" +
+            "}\n",
+
+            "B.groovy",
+            "interface B extends A {\n" +
+            "  default String m() {\n" +
+            "    'G'\n" +
+            "  }\n" +
+            "  static String sm() {\n" +
+            "    'S'\n" +
+            "  }\n" +
+            "}\n",
+
+            "C.groovy",
+            "class C implements B {\n" +
+            "  @Override String m() {\n" +
+            "    'C' + B.super.m() + sm()\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "CGS");
+    }
+
     // WMTW: Groovy compilation unit scope adds the extra default import for java.util so List can be seen
     @Test
     public void testImplementingInterface_JavaExtendingGroovyAndImplementingMethod() {

diff --git a/base/org.codehaus.groovy30/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy30/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -1428,24 +1428,35 @@ public ClassNode visitClassDeclaration(ClassDeclarationContext ctx) {
         }
         classNode.putNodeMetaData(CLASS_NAME, className);
 
-        if (asBoolean(ctx.CLASS()) || asBoolean(ctx.TRAIT()) || isInterfaceWithDefaultMethods) {
+        if (asBoolean(ctx.CLASS()) || asBoolean(ctx.TRAIT())/* GRECLIPSE edit || isInterfaceWithDefaultMethods*/) {
             ClassNode superClass;
             if (asBoolean(ctx.scs)) {
                 ClassNode[] scs = this.visitTypeList(ctx.scs);
                 if (scs.length > 1) {
                     throw createParsingFailedException("Cannot extend multiple classes", ctx.EXTENDS());
                 }
+            /* GRECLIPSE edit
                 superClass = scs[0];
             } else {
                 superClass = ClassHelper.OBJECT_TYPE;
             }
             classNode.setSuperClass(superClass);
+            */
+                classNode.setSuperClass(scs[0]);
+            }
+            // GRECLIPSE end
             classNode.setInterfaces(this.visitTypeList(ctx.is));
             this.initUsingGenerics(classNode);
-
+        // GRECLIPSE add -- GROOVY-9259
+        } else if (isInterfaceWithDefaultMethods) {
+            classNode.setInterfaces(this.visitTypeList(ctx.scs));
+            this.initUsingGenerics(classNode);
+        // GRECLIPSE end
         } else if (isInterface) {
             classNode.setModifiers(classNode.getModifiers() | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT);
+            /* GRECLIPSE edit
             classNode.setSuperClass(ClassHelper.OBJECT_TYPE);
+            */
             classNode.setInterfaces(this.visitTypeList(ctx.scs));
             this.initUsingGenerics(classNode);
             this.hackMixins(classNode);

diff --git a/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy40/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -1619,24 +1619,23 @@ public ClassNode visitClassDeclaration(final ClassDeclarationContext ctx) {
         }
         classNode.putNodeMetaData(CLASS_NAME, className);
 
-        if (asBoolean(ctx.CLASS()) || asBoolean(ctx.TRAIT()) || isInterfaceWithDefaultMethods) {
-            ClassNode superClass;
+        if (asBoolean(ctx.CLASS()) || asBoolean(ctx.TRAIT())) {
             if (asBoolean(ctx.scs)) {
                 ClassNode[] scs = this.visitTypeList(ctx.scs);
                 if (scs.length > 1) {
                     throw createParsingFailedException("Cannot extend multiple classes", ctx.EXTENDS());
                 }
-                superClass = scs[0];
-            } else {
-                superClass = ClassHelper.OBJECT_TYPE.getPlainNodeReference();
+                classNode.setSuperClass(scs[0]);
             }
-            classNode.setSuperClass(superClass);
             classNode.setInterfaces(this.visitTypeList(ctx.is));
             this.initUsingGenerics(classNode);
 
+        } else if (isInterfaceWithDefaultMethods) { // GROOVY-9259
+            classNode.setInterfaces(this.visitTypeList(ctx.scs));
+            this.initUsingGenerics(classNode);
+
         } else if (isInterface) {
             classNode.setModifiers(classNode.getModifiers() | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT);
-            classNode.setSuperClass(ClassHelper.OBJECT_TYPE.getPlainNodeReference());
             classNode.setInterfaces(this.visitTypeList(ctx.scs));
             this.initUsingGenerics(classNode);
             this.hackMixins(classNode);