fix: parsing unified diff chunk headers by rushiiMachine · Pull Request #198 · java-diff-utils/java-diff-utils · GitHub
Conversation
The regex matching chunk headers does not account for diffs generated with --show-function-line
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
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.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.
Footer
You can’t perform that action at this time.
The regex matching chunk headers does not account for unified diffs generated with --show-function-line (with GNU diffutils for example)
Currently this library parses only the following chunk header: @@ -571,6 +571,12 @@
But this is also valid: @@ -571,6 +571,12 @@ .method public constructor <init>(Landro
This also created a very odd error far down the call stack of this method call when old_ln and new_ln are both equal to 0 as a result of failing to parse the chunk headers.
java-diff-utils/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
Lines 92 to 93 in 0f8365b