GROOVY-10312

Author: eric-milles

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

@@ -2873,4 +2873,35 @@ public void testTraits10106() {
 
         runConformTest(sources, "works");
     }
+
+    @Test
+    public void testTraits10312() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "trait T1 {\n" +
+            "  static void staticMethod(input) {\n" +
+            "    print input\n" +
+            "  }\n" +
+            "}\n" +
+            "trait T2 extends T1 {\n" +
+            "  static void staticMethodWithDefaultArgument(String string = 'x') {\n" +
+            "    staticMethod(string)\n" + // MissingMethodException
+            "  }\n" +
+            "}\n" +
+            "class X implements T2 {\n" +
+            "  static test1() {\n" +
+            "    staticMethodWithDefaultArgument()\n" +
+            "  }\n" +
+            "  void test2() {\n" +
+            "    staticMethodWithDefaultArgument()\n" +
+            "  }\n" +
+            "}\n" +
+            "X.test1()\n" +
+            "new X().test2()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "xx");
+    }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -385,12 +385,19 @@ private Expression transformMethodCallOnThis(final MethodCallExpression call) {
             String methodName = call.getMethodAsString();
             for (MethodNode methodNode : traitClass.getMethods(methodName)) {
                 if (methodName.equals(methodNode.getName()) && (methodNode.isStatic() || methodNode.isPrivate())) {
-                    ArgumentListExpression newArgs = createArgumentList(methodNode.isStatic() ? asClass(call.getObjectExpression()) : weaved, arguments);
-                    MethodCallExpression newCall = callX(inClosure ? classX(traitHelperClass) : varX("this"), methodName, newArgs);
-                    newCall.setImplicitThis(true);
-                    newCall.setSafe(call.isSafe());
-                    newCall.setSourcePosition(call);
+                    MethodCallExpression newCall;
+                    if (!inClosure && methodNode.isStatic()) { // GROOVY-10312: $self or $static$self.staticMethod(...)
+                        newCall = callX(varX(weaved), methodName, transform(arguments));
+                        newCall.setImplicitThis(false);
+                        newCall.setSafe(false);
+                    } else {
+                        ArgumentListExpression newArgs = createArgumentList(methodNode.isStatic() ? asClass(varX("this")) : weaved, arguments);
+                        newCall = callX(inClosure ? classX(traitHelperClass) : call.getObjectExpression(), methodName, newArgs);
+                        newCall.setImplicitThis(true);
+                        newCall.setSafe(call.isSafe());
+                    }
                     newCall.setSpreadSafe(call.isSpreadSafe());
+                    newCall.setSourcePosition(call);
                     return newCall;
                 }
             }

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -318,6 +318,16 @@ private Expression transformMethodCallOnThis(final MethodCallExpression call) {
             String methodName = call.getMethodAsString();
             for (MethodNode methodNode : traitClass.getMethods(methodName)) {
                 if (methodName.equals(methodNode.getName()) && (methodNode.isStatic() || methodNode.isPrivate())) {
+                    // GRECLIPSE add -- GROOVY-10312
+                    if (!inClosure && methodNode.isStatic()) {
+                        MethodCallExpression newCall = callX(varX(weaved), methodName, transform(arguments));
+                        newCall.setImplicitThis(false);
+                        newCall.setSafe(false);
+                        newCall.setSourcePosition(call);
+                        newCall.setSpreadSafe(call.isSpreadSafe());
+                        return newCall;
+                    }
+                    // GRECLIPSE end
                     ArgumentListExpression newArgs = createArgumentList(methodNode.isStatic() ? asClass(objectExpr) : weaved, arguments);
                     MethodCallExpression newCall = callX(inClosure ? classX(traitHelperClass) : varX("this"), methodName, newArgs);
                     newCall.setImplicitThis(true);

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -312,28 +312,35 @@ private Expression transformSuperMethodCall(final MethodCallExpression call) {
     private Expression transformMethodCallOnThis(final MethodCallExpression call) {
         Expression method = call.getMethod();
         Expression arguments = call.getArguments();
-        Expression objectExpr = call.getObjectExpression();
+        Expression thisExpr = call.getObjectExpression();
 
         if (method instanceof ConstantExpression) {
             String methodName = call.getMethodAsString();
             for (MethodNode methodNode : traitClass.getMethods(methodName)) {
                 if (methodName.equals(methodNode.getName()) && (methodNode.isStatic() || methodNode.isPrivate())) {
-                    ArgumentListExpression newArgs = createArgumentList(methodNode.isStatic() ? asClass(objectExpr) : weaved, arguments);
-                    MethodCallExpression newCall = callX(inClosure ? classX(traitHelperClass) : varX("this"), methodName, newArgs);
-                    newCall.setImplicitThis(true);
-                    newCall.setSafe(call.isSafe());
-                    newCall.setSourcePosition(call);
+                    MethodCallExpression newCall;
+                    if (!inClosure && methodNode.isStatic()) { // GROOVY-10312: $self or $static$self.staticMethod(...)
+                        newCall = callX(varX(weaved), methodName, transform(arguments));
+                        newCall.setImplicitThis(false);
+                        newCall.setSafe(false);
+                    } else {
+                        ArgumentListExpression newArgs = createArgumentList(methodNode.isStatic() ? asClass(varX("this")) : weaved, arguments);
+                        newCall = callX(inClosure ? classX(traitHelperClass) : thisExpr, methodName, newArgs);
+                        newCall.setImplicitThis(true);
+                        newCall.setSafe(call.isSafe());
+                    }
                     newCall.setSpreadSafe(call.isSpreadSafe());
+                    newCall.setSourcePosition(call);
                     return newCall;
                 }
             }
         }
 
-        MethodCallExpression newCall = callX(inClosure ? objectExpr : weaved, method, transform(arguments));
+        MethodCallExpression newCall = callX(inClosure ? thisExpr : weaved, method, transform(arguments));
         newCall.setImplicitThis(inClosure ? call.isImplicitThis() : false);
-        newCall.setSafe(call.isSafe());
-        newCall.setSourcePosition(call);
+        newCall.setSafe(inClosure ? call.isSafe() : false);
         newCall.setSpreadSafe(call.isSpreadSafe());
+        newCall.setSourcePosition(call);
         return newCall;
     }