Repository navigation
Allow empty context lines in fuzzy patch matching - #739
Open
liugedragon wants to merge 1 commit into
Open
liugedragon wants to merge 1 commit into
liugedragon wants to merge 1 commit into
Conversation
This branch has not been deployed
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
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.
With
fuzzFactor: 1, replacing a context line withxworks, but replacing it with an empty line can make the same patch fail. An extra empty context line has the same problem.The matcher uses a truthiness check before trying context substitutions and insertions. An empty string is a valid file line, so use an explicit non-null check, as the deletion branch already does. End-of-file handling and exact matching remain unchanged.
Nine regression tests cover substitutions and insertions with LF, CRLF, and automatic CRLF-to-LF conversion, plus strict matching, missing EOF context, and required deletion lines. On unchanged upstream, four fail and five controls pass; all nine pass with this change.
Validation:
yarn install --immutableand the completeyarn testpassed: 327 tests, including lint, build, type checks, bundles, and coverage.git diff --check: passed.The fuzzy-search memoization work in #711 and #716 retains the condition fixed here.