Projects >> spock >>7d52bad48dbed6364514ba6efba98f16549a285e

Chunk
Conflicting content
  public static MethodCallExpression createDirectMethodCall(Expression target, MethodNode method, Expression arguments) {
    MethodCallExpression result = new MethodCallExpression(target, method.getName(), arguments);
<<<<<<< HEAD
    // don't generate direct method calls for the moment, due to:
    // http://groovy.329449.n5.nabble.com/Problem-with-latest-2-0-beta-3-snapshot-and-Spock-td5496353.html
    //result.setMethodTarget(method);
=======
    result.setMethodTarget(method);
    result.setImplicitThis(false); // see http://groovy.329449.n5.nabble.com/Problem-with-latest-2-0-beta-3-snapshot-and-Spock-td5496353.html
>>>>>>> 5a7fcb612e7149f7b89a548e8f2265c15824b8e8
    return result;
  }
Solution content
  public static MethodCallExpression createDirectMethodCall(Expression target, MethodNode method, Expression arguments) {
    MethodCallExpression result = new MethodCallExpression(target, method.getName(), arguments);
    result.setMethodTarget(method);
    result.setImplicitThis(false); // see http://groovy.329449.n5.nabble.com/Problem-with-latest-2-0-beta-3-snapshot-and-Spock-td5496353.html
    return result;
  }
File
AstUtil.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation