Fix context-sensitive template replacement for standalone expression statements#7211
Merged
Fix context-sensitive template replacement for standalone expression statements#7211
Conversation
…statements in non-void methods
When a JavaTemplate replaces a standalone method invocation expression statement
inside a non-void method, the generated template stub was missing a semicolon
after the expression. The semicolon was appended to the `after` buffer after
the `}\nreturn ...;` from the non-void method wrapping, placing it outside the
`if(true)` block instead of directly after the template content. This caused
`parseBlockStatements` to return 0 results.
Fix by using `insert(0, ';')` instead of `append(';')` so the semicolon is
placed before the closing brace of the `if(true)` block.
greg-at-moderne
approved these changes
Mar 31, 2026
Member
Author
|
Test failure unrelated; merging: |
This file contains hidden or 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
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.
Summary
JavaTemplatefailing with "generated 0 statements" when replacing a standalone method invocation expression statement inside a non-void method using a context-sensitive templateif(true)block close brace andreturnstatement in the generated stub, instead of directly after the template contentUseVisitWithParentCursorrecipe failing on AbstractLogEnabledToSlf4j.java#L110Test plan
replaceContextSensitiveMethodInvocationStandaloneStatementtest inJavaTemplateTest8TestJavaTemplateTest8Testtests passrewrite-javaandrewrite-java-testmodule tests pass