Fix whitespace preservation when removing access modifiers #5905
Conversation
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
Properly merge whitespace and comments from removed access modifier with the next modifier when changing to package-private access level. - Add Space merging logic for removed modifiers - Handle comment relocation during modifier removal - Add test for line comment movement
dongwooooooo
changed the title
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
rewrite-java-test/src/test/java/org/openrewrite/java/ChangeMethodAccessLevelTest.java
Outdated
Show resolved
Hide resolved
…hodAccessLevelTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
timtebeek
approved these changes
Aug 13, 2025
dcsekar
pushed a commit
to dcsekar/rewrite
that referenced
this pull request
Aug 18, 2025
…te#5905) * fix: preserve spacing when removing access modifiers Properly merge whitespace and comments from removed access modifier with the next modifier when changing to package-private access level. - Add Space merging logic for removed modifiers - Handle comment relocation during modifier removal - Add test for line comment movement * Update rewrite-java-test/src/test/java/org/openrewrite/java/ChangeMethodAccessLevelTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Slight polish --------- Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim te Beek <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What's changed?
Fixed whitespace and comment handling when changing method access level to package-private. The removed access modifier's Space (whitespace and comments) is now properly merged with the next modifier to maintain consistent formatting.
What's your motivation?
Resolves spacing issues where the auto-formatter doesn't influence spacing when comments are involved. This was causing inconsistent formatting when access modifiers were removed, particularly when line comments were present.
Referenced issue pattern can be seen in rewrite-spring's BeanMethodsNotPublicTest where dataSource3 bean formatting was problematic.
Anything in particular you'd like reviewers to focus on?
publicToPackagePrivateMovesLineComment()which covers the specific scenario where line comments need to be relocatedHave you considered any alternatives or workarounds?
Considered relying solely on auto-formatting, but as noted in the issue, auto-formatter doesn't handle spacing when comments are involved. The current approach manually preserves the spacing structure by merging Space objects.
Checklist