fix(assert): fix swapping of multiline str diff #3685
Merged
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
bartlomieju
approved these changes
Oct 3, 2023
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.
This PR fixes the bug of multiline str diff when there are more diff lines in
actualthanexpected.The multiline diff algorithm (
diffstr) performs diffing in 2 different ways: First it takes diff of the entire multiple string, comparing each line. Then it takes diff of words for each line over the combination of added (expected) lines and removed (actual) lines.When computing word diffs for each line combination, the code swaps the main array to use for the loop (probably for optimization), but it forgot to swap diffing target. It resulted in swapped diff when there are more removed (
actual) lines.closes #3039
closes #3681
ref #948