GROOVY-7456, GROOVY-7797: trait method invocation within closure

Author: eric-milles

src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java

@@ -52,6 +52,7 @@
 import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.isInstanceOfX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.ternaryX;
@@ -217,7 +218,7 @@ private Expression transformBinaryExpression(final BinaryExpression exp, final C
                         super.transform(rightExpression)
                 );
                 mce.setImplicitThis(false);
-                mce.setSourcePosition(exp);
+                mce.setSourcePosition(leftExpression instanceof PropertyExpression ? ((PropertyExpression) leftExpression).getProperty() : leftExpression);
                 markDynamicCall(mce, staticField, isStatic);
                 return mce;
             }
@@ -240,7 +241,7 @@ private Expression transformFieldReference(final Expression exp, final FieldNode
 
         MethodCallExpression mce = callX(receiver, Traits.helperGetterName(fn));
         mce.setImplicitThis(false);
-        mce.setSourcePosition(exp);
+        mce.setSourcePosition(exp instanceof PropertyExpression ? ((PropertyExpression) exp).getProperty() : exp);
         markDynamicCall(mce, fn, isStatic);
         return mce;
     }
@@ -288,9 +289,9 @@ private Expression transformSuperMethodCall(final MethodCallExpression call) {
                 Traits.getSuperTraitMethodName(traitClass, method),
                 superCallArgs
         );
-        newCall.setSourcePosition(call);
-        newCall.setSafe(call.isSafe());
+        newCall.getMethod().setSourcePosition(call.getMethod());
         newCall.setSpreadSafe(call.isSpreadSafe());
+        newCall.setSafe(call.isSafe());
         newCall.setImplicitThis(false);
         return newCall;
     }
@@ -304,9 +305,9 @@ private Expression transformMethodCallOnThis(final MethodCallExpression call) {
             // GROOVY-7191, GROOVY-7213, GROOVY-7214, GROOVY-8282, GROOVY-8854, GROOVY-8859, et al.
             for (MethodNode methodNode : traitClass.getDeclaredMethods(call.getMethodAsString())) {
                 if (methodNode.isPrivate()) {
-                    // this.m(x) --> this.m($self or $static$self or (Class) $self.getClass(), x)
+                    // this.m(x) --> (this or T$Trait$Helper).m($self or $static$self or (Class) $self.getClass(), x)
                     Expression selfClassOrObject = methodNode.isStatic() && !ClassHelper.isClassType(weaved.getOriginType()) ? castX(ClassHelper.CLASS_Type.getPlainNodeReference(), callX(weaved, "getClass")) : weaved;
-                    MethodCallExpression newCall = callX(thisExpr, method, createArgumentList(selfClassOrObject, arguments));
+                    MethodCallExpression newCall = callX(inClosure ? classX(traitHelperClass) : thisExpr, method, createArgumentList(selfClassOrObject, arguments));
                     newCall.setGenericsTypes(call.getGenericsTypes());
                     newCall.setImplicitThis(call.isImplicitThis());
                     newCall.setSpreadSafe(call.isSpreadSafe());

src/test/org/codehaus/groovy/transform/traitx/TraitWithClosureOrLambda.groovy

@@ -27,6 +27,9 @@ final class TraitWithClosureOrLambda {
 
     private final GroovyShell shell = GroovyShell.withConfig {
         ast groovy.transform.CompileStatic
+        imports {
+            star 'groovy.transform'
+        }
     }
 
     @Test
@@ -179,11 +182,12 @@ final class TraitWithClosureOrLambda {
         '''
     }
 
-    // GROOVY-7456,  GROOVY-7797
+    // GROOVY-7456, GROOVY-7797
     @Test
     void testInvokePrivateTraitMethodFromTraitClosure() {
         assertScript shell, '''
             trait T {
+                @CompileDynamic
                 def f() {
                     ['a'].collect { String s -> g(s) }
                 }
@@ -390,7 +394,7 @@ final class TraitWithClosureOrLambda {
     void testInvokeTraitStaticMethodFromTraitClosure() {
         assertScript shell, '''
             trait T {
-                @groovy.transform.CompileDynamic
+                @CompileDynamic
                 static one() {
                     def me = this
                     two('good') + ' ' +