Skip to content

GROOVY-12581: SC: make dynamic calls on a closure delegate as normal method calls #3107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeconsole wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GROOVY-12581: SC: make dynamic calls on a closure delegate as normal method calls #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,8 @@ private boolean tryImplicitReceiver(final Expression origin, final Expression me

rewritten.putNodeMetaData(StaticTypesMarker.INFERRED_TYPE, origin.getNodeMetaData(StaticTypesMarker.INFERRED_TYPE));
} else {
makeCall(origin, pexp, message, arguments, adapter, safe, spreadSafe, false);
// the receiver is no longer this, so a call without a target must not be made on the current object
makeCall(origin, pexp, message, arguments, adapter == invokeMethodOnCurrent ? invokeMethod : adapter, safe, spreadSafe, false);
}
return true;
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/groovy/groovy/transform/stc/ClosuresSTCTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,24 @@ class ClosuresSTCTest extends StaticTypeCheckingTestCase {
'''
}

// GROOVY-12581
@Test
void testClosureDelegateInInstanceInitializer() {
assertScript '''
class C {
List<String> log = [];
{
log << new StringBuilder('a').with { append('b') }.toString()
log << new ArrayList<String>().tap { add('c') }.toString()
log << new ArrayList<String>(['d']).with { get(0) }
log << new StringBuilder('e').with { length().toString() }
}
}

assert new C().log == ['ab', '[c]', 'd', '1']
'''
}

// GROOVY-9604
@Test
void testClosureResolveStrategy() {
Expand Down
Loading