Skip to content

Fixed bug with matching the end of a string #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

pbagnall
Copy link

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).

Peter Bagnall 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant