Make second call to diff_cleanupSemantic inside the diff_lineMode_#2
Open
vors wants to merge 2 commits intoReviewable:masterfrom
Open
Make second call to diff_cleanupSemantic inside the diff_lineMode_#2vors wants to merge 2 commits intoReviewable:masterfrom
vors wants to merge 2 commits intoReviewable:masterfrom
Conversation
vors
force-pushed
the
sergei/second-cleanup-semantic-call
branch
from
69d4a81 to
eaa3a9f
Compare
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.
Improve the case presented in Reviewable/Reviewable#326 (comment)
Concretely there is already a sequence of calls
diff_lineMode_ -> diff_cleanupSemantic -> diff_cleanupSemanticLosslesswhich performs the optimal alignment for deletes and adds based on the
diff_cleanupSemanticScore_function.However, this alignment could be altered by the remaining code in
diff_lineMode_hence we should call thediff_cleanupSemanticagain at the end of the function.The added tests demonstrate the problem.
This change is