Fixed bug with matching the end of a string#1
Open
pbagnall wants to merge 4 commits intoskrap:masterfrom
Open
Conversation
added 4 commits
July 15, 2013 15:06
Fixed bug where "abc def" and "abc def ghi" when using the wordDelimiters would result in "c4d3i7:def ghi" rather than "c7i4: ghi". The issue was that whitespace was being treated as being part of a word, so the lack of trailing whitespace after "def" meant that it didn't match "def " and therefore wasn't recognised as being a valid match. The solution is to create separate word fragments and whitespace fragments.
updated edit history
prevents whitespaces from being counted as matches which would otherwise prevent long runs of text being simply replaced and instead each word being individually replaced and the whitespace between words being being copied. Also removed an unnecessary call to mb_strlen.
it now works with UTF-8, thanks to Christoph Mewes.
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.
Getting the diff between these strings...
"abc def"
"abc def ghi"
would result in it copying "abc" and then replacing "def" with "def ghi"
when it should copy "abd def" and then insert " ghi".
This was because whitespace (i.e. the delimiters) were being included on the end of the fragments, rather than being treated as fragments in their own right. So "def" != "def " hence no match. By allowing the delimiters to form fragments, and the correct differences are recognised. Delimiter fragments are now seen as "soft-matches" (i.e. they can match as part of a longer matching span only) to avoid long runs of non-matching text being treated as non-matching words separated by matching whitespce (which would make for absurdly complex diffs).