Show unchanged lines that fall inside an inline hunk - #1018
Open
DivvyCr wants to merge 2 commits into
Open
Conversation
When two novel lines in a hunk are close enough to merge into a single hunk, the unchanged lines between them ar dropped from inline display output. Side-by-side rendering uses matched_lines_indexes_for_hunk to walk the full hunk range, so it already includes these lines. Inline was iterating hunk.lines directly, which only contains positions with novel content. For an example, see issue Wilfred#978 or the new CLI integration test. Add a `fill_in_hunk_gaps` helper that walks `hunk.lines` and emits the intervening line numbers for each side, then update the LHS and RHS print loops to use the hunk's `novel_lhs` and `novel_rhs` sets so that gap lines render as context rather than as added or removed.
Author
|
Here are some sample outputs on inputs from the issues: 
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Follow-up to PR #980 to close Issues #349 , #704 , #978