GROOVY-10341

eric-milles · eric-milles · commit dfe32b0a5f4f · 2021-11-17T12:50:08.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/TypeCheckedTests.java
@@ -4747,6 +4747,33 @@ public void testTypeChecked10339() {
             "----------\n");
     }
 
+    @Test
+    public void testTypeChecked10341() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "abstract class A {\n" +
+            "  abstract def m()\n" +
+            "}\n" +
+            "@groovy.transform.TypeChecked\n" +
+            "class C extends A {\n" +
+            "  @Override\n" +
+            "  def m() {\n" +
+            "    super.m()\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runNegativeTest(sources,
+            "----------\n" +
+            "1. ERROR in Main.groovy (at line 8)\n" +
+            "\tsuper.m()\n" +
+            "\t^^^^^^^^^\n" +
+            "Groovy:[Static type checking] - Abstract method m() cannot be called directly\n" +
+            "----------\n");
+    }
+
     @Test
     public void testTypeChecked10344() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -4312,6 +4312,10 @@ public void visitMethodCallExpression(MethodCallExpression call) {
                             ClassNode owner = directMethodCallCandidate.getDeclaringClass();
                             addStaticTypeError("Non static method " + owner.getName() + "#" + directMethodCallCandidate.getName() + " cannot be called from static context", call);
                         }
+                        // GRECLIPSE add -- GROOVY-10341
+                        else if (directMethodCallCandidate.isAbstract() && objectExpression instanceof VariableExpression && ((VariableExpression) objectExpression).isSuperExpression())
+                            addStaticTypeError("Abstract method " + toMethodParametersString(directMethodCallCandidate.getName(), extractTypesFromParameters(directMethodCallCandidate.getParameters())) + " cannot be called directly", call);
+                        // GRECLIPSE end
                         if (chosenReceiver == null) {
                             chosenReceiver = Receiver.make(directMethodCallCandidate.getDeclaringClass());
                         }
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3963,6 +3963,10 @@ public void visitMethodCallExpression(final MethodCallExpression call) {
                             ClassNode owner = directMethodCallCandidate.getDeclaringClass();
                             addStaticTypeError("Non static method " + owner.getName() + "#" + directMethodCallCandidate.getName() + " cannot be called from static context", call);
                         }
+                        // GRECLIPSE add -- GROOVY-10341
+                        else if (directMethodCallCandidate.isAbstract() && isSuperExpression(objectExpression))
+                            addStaticTypeError("Abstract method " + toMethodParametersString(directMethodCallCandidate.getName(), extractTypesFromParameters(directMethodCallCandidate.getParameters())) + " cannot be called directly", call);
+                        // GRECLIPSE end
                         if (chosenReceiver == null) {
                             chosenReceiver = Receiver.make(directMethodCallCandidate.getDeclaringClass());
                         }
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -3478,6 +3478,8 @@ && implementsInterfaceOrIsSubclassOf(receiverType, node.getDeclaringClass()))) {
                         if (!targetMethodCandidate.isStatic() && !isClassType(declaringClass)
                                 && objectExpression instanceof ClassExpression && call.getNodeMetaData(DYNAMIC_RESOLUTION) == null) {
                             addStaticTypeError("Non-static method " + prettyPrintTypeName(declaringClass) + "#" + targetMethodCandidate.getName() + " cannot be called from static context", call);
+                        } else if (targetMethodCandidate.isAbstract() && isSuperExpression(objectExpression)) { // GROOVY-10341
+                            addStaticTypeError("Abstract method " + toMethodParametersString(targetMethodCandidate.getName(), extractTypesFromParameters(targetMethodCandidate.getParameters())) + " cannot be called directly", call);
                         }
                         if (chosenReceiver == null) {
                             chosenReceiver = Receiver.make(declaringClass);

Original file line number	Diff line number	Diff line change
`@@ -4312,6 +4312,10 @@ public void visitMethodCallExpression(MethodCallExpression call) {`
`4312`	`4312`	`ClassNode owner = directMethodCallCandidate.getDeclaringClass();`
`4313`	`4313`	`addStaticTypeError("Non static method " + owner.getName() + "#" + directMethodCallCandidate.getName() + " cannot be called from static context", call);`
`4314`	`4314`	`}`
	`4315`	`+ // GRECLIPSE add -- GROOVY-10341`
	`4316`	`+ else if (directMethodCallCandidate.isAbstract() && objectExpression instanceof VariableExpression && ((VariableExpression) objectExpression).isSuperExpression())`
	`4317`	`+ addStaticTypeError("Abstract method " + toMethodParametersString(directMethodCallCandidate.getName(), extractTypesFromParameters(directMethodCallCandidate.getParameters())) + " cannot be called directly", call);`
	`4318`	`+ // GRECLIPSE end`
`4315`	`4319`	`if (chosenReceiver == null) {`
`4316`	`4320`	`chosenReceiver = Receiver.make(directMethodCallCandidate.getDeclaringClass());`
`4317`	`4321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3963,6 +3963,10 @@ public void visitMethodCallExpression(final MethodCallExpression call) {`
`3963`	`3963`	`ClassNode owner = directMethodCallCandidate.getDeclaringClass();`
`3964`	`3964`	`addStaticTypeError("Non static method " + owner.getName() + "#" + directMethodCallCandidate.getName() + " cannot be called from static context", call);`
`3965`	`3965`	`}`
	`3966`	`+ // GRECLIPSE add -- GROOVY-10341`
	`3967`	`+ else if (directMethodCallCandidate.isAbstract() && isSuperExpression(objectExpression))`
	`3968`	`+ addStaticTypeError("Abstract method " + toMethodParametersString(directMethodCallCandidate.getName(), extractTypesFromParameters(directMethodCallCandidate.getParameters())) + " cannot be called directly", call);`
	`3969`	`+ // GRECLIPSE end`
`3966`	`3970`	`if (chosenReceiver == null) {`
`3967`	`3971`	`chosenReceiver = Receiver.make(directMethodCallCandidate.getDeclaringClass());`
`3968`	`3972`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3478,6 +3478,8 @@ && implementsInterfaceOrIsSubclassOf(receiverType, node.getDeclaringClass()))) {`
`3478`	`3478`	`if (!targetMethodCandidate.isStatic() && !isClassType(declaringClass)`
`3479`	`3479`	`&& objectExpression instanceof ClassExpression && call.getNodeMetaData(DYNAMIC_RESOLUTION) == null) {`
`3480`	`3480`	`addStaticTypeError("Non-static method " + prettyPrintTypeName(declaringClass) + "#" + targetMethodCandidate.getName() + " cannot be called from static context", call);`
	`3481`	`+ } else if (targetMethodCandidate.isAbstract() && isSuperExpression(objectExpression)) { // GROOVY-10341`
	`3482`	`+ addStaticTypeError("Abstract method " + toMethodParametersString(targetMethodCandidate.getName(), extractTypesFromParameters(targetMethodCandidate.getParameters())) + " cannot be called directly", call);`
`3481`	`3483`	`}`
`3482`	`3484`	`if (chosenReceiver == null) {`
`3483`	`3485`	`chosenReceiver = Receiver.make(declaringClass);`