-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
Fix ignore loading #154
Merged
Merged
Fix ignore loading #154
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
Because other defaults file do have this as well and https://stackoverflow.com/q/729692.
The empty lines are missing, which causes ugly diffs when you apply from e.g. review.
And don't trim nor filter anymore, we don't want to create (Git) diffs for existing ignore files.
This reverts commit fc48b8a.
diba1013
suggested changes
Mar 22, 2019
src/test/java/de/retest/recheck/review/workers/LoadShouldIgnoreWorkerTest.java
Outdated
Show resolved
Hide resolved
src/main/java/de/retest/recheck/review/ignore/ShouldIgnoreEmptyLineLoader.java
Outdated
Show resolved
Hide resolved
I think I have now also resolved the file ending issue. @Override
public String save( final JSShouldIgnoreImpl ignore ) {
return "";
} Which creates unnecessary file content. I now filter it on save. |
diba1013
suggested changes
Mar 25, 2019
src/main/java/de/retest/recheck/review/workers/SaveShouldIgnoreWorker.java
Outdated
Show resolved
Hide resolved
src/main/java/de/retest/recheck/review/ignore/ShouldIgnorePreserveLineLoader.java
Outdated
Show resolved
Hide resolved
src/main/java/de/retest/recheck/review/ignore/ShouldIgnorePreserveLineLoader.java
Show resolved
Hide resolved
diba1013
approved these changes
Mar 25, 2019
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.
I've reverted fc48b8a because
Files.lines(…)
inGlobalIgnoreApplier.load()
doesn't read in the terminating empty line break at the end, which would again cause a diff in the VCS. However, I think this is already an improvement.