Fix unified diff including up to 2 * context_lines
before first hunk when near input start
#35
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.
The bug is that when the first hunk start line is
> context_lines
and<= 2 * context_lines
, all the lines before the hunk are included in the context.This fixes the behavior to be the same as
diff -u
:This came up in Zed when optimizing diffing in a case where the edited lines are known. These edited regions are then provided to imara-diff. Often this works perfectly, but when the first diff is not immediately after the context lines this bug occurs and causes extra prefix context lines to appear.
I realize that only diffing these edited regions will not always match a full input diff, but for this particular use-case it is preferable :)