Keep multiple whitelines and same comments from the gitignore file #4659
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
timtebeek
approved these changes
Nov 11, 2024
timtebeek
reviewed
Nov 11, 2024
rewrite-core/src/main/java/org/openrewrite/ExcludeFileFromGitignore.java
Show resolved
Hide resolved
Jenson3210
deleted the
keep_duplicate_whiltelines_and_comments_gitignore
branch
MBoegers
pushed a commit
to MBoegers/rewrite
that referenced
this pull request
Dec 18, 2024
…penrewrite#4659) * Keep multiple whitelines and same comments from the gitignore file * Keep multiple whitelines and same comments from the gitignore file
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.
As I originally used a Set, the empty lines and comments with same text where being filtered to a single occurence (the last one).
By changing the implementation to a LinkedList into which we add conditionally entries, we can save a new List instantiation + keep comments and whitelines non-distinct, maintaining dinstinction of the gitgnore lines (same line later in file makes sure we only keep that one)
See the changed test for the bug I was facing while first time running on a gitignore file with multiple empty lines.