Skip to content

Port over changes to C# DiffPatch - #16

Open
sciwhiz12 wants to merge 10 commits into
TheCBProject:masterfrom
sciwhiz12:match-latest-diffpatch
Open

sciwhiz12 wants to merge 10 commits into
TheCBProject:masterfrom
sciwhiz12:match-latest-diffpatch

Conversation

@sciwhiz12

Copy link
Copy Markdown

This PR ports over the changes to the original C# version of DiffPatch at https://github.com/Chicken-Bones/DiffPatch, since commit Chicken-Bones/DiffPatch@2f93ca9 onwards.

Each commit here matches one of the commits from that repository, which is noted in each commit's message.

Some commits were skipped, either because they don't apply as being C#-only, or were superseded by a later change (as is the case with Chicken-Bones/DiffPatch@d4a79d8, which got superseded by Chicken-Bones/DiffPatch@107ce07).

Move match options for Patcher into inner class FuzzyMatchOptions

Matches 0f4d100d43411d20747b4f696faa64994e12fef4
Matches #2f93ca9d53e8f307a81ef6457671fdb9bcb25c0d
Matches 607d4c63f3f3dd6648dddbaf209d9d0ada85adf8
Uncollate still exists as a utility, but there is no point providing a parameter which just undoes the work of LineMatchedDiffer

Matches 7f996aa433c6e49536be18df2480ff5f0ee90e54
Matches 37ba6402114eca017fd6c5a240c664ea7226a1d7
Matches 052028c3938693f4d9c8c1fa0be4fd44556d2f97
Matches fc967ed6bd7225c2b71a616ef89f5e011d2622f3
Matches cdc0b0070c5c5b6cd0400dd0680a40aee0c7f8fa
Matches 6df884284814c969db6241e8b7d5ac6984fadde8
1f and 1_000 are now single 'words', as is 1a2f2af2

Matches 107ce07951cbf9260d0f6055bfdd2a323452b5d7
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