Don't stop iteration on constructor calls, only anonymous subclasses #37
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The lambda support is basically already there. What was missing for the existing `LambdaTest` test case was that the iteration in `LocalVariableDecl#findNearestParentCallable()` stopped on any constructor invocation, rather than only when iterating out of the body of an anonymous subclasses. Fixes: #31
knutwannheden
commented
Nov 8, 2023
| @@ -105,7 +105,7 @@ static Validation<TraitErrors, Callable> findNearestParentCallable(Cursor cursor | |||
| while (path.hasNext()) { | |||
| Cursor c = path.next(); | |||
| Tree t = c.getValue(); | |||
| if (t instanceof J.ClassDeclaration || t instanceof J.NewClass) { | |||
| if (t instanceof J.ClassDeclaration || t instanceof J.NewClass && previous != null && ((J.NewClass) t).getBody() == previous.getValue()) { | |||
| break; | |||
| } | |||
| if (t instanceof J.Block && J.Block.isStaticOrInitBlock(c)) { | |||
There was a problem hiding this comment.
Also note that in the context of lambdas the body block was erroneously identified as an initializer block. That is fixed by openrewrite/rewrite@69b48c8
There was a problem hiding this comment.
Much appreciated! Thanks for fixing!
|
@JLLeitschuh I went ahead and merged the PR, as it isn't clear to me to what extent you are available to review PRs. But I will be happy to fix any mistakes you detect in my PR. |
|
My biggest thing is just ensuring that tests exist to cover changes. It looks like you've done that, which I appreciate! Thanks for the improvements! 🙂🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The lambda support is basically already there. What was missing for the existing
LambdaTesttest case was that the iteration inLocalVariableDecl#findNearestParentCallable()stopped on any constructor invocation, rather than only when iterating out of the body of an anonymous subclasses.Fixes: #31