Use external diff-match-patch reference instead of copy #5129
Conversation
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
The Google diff-match-patch library object we had copied has moved on and been worked on since 2006 (!) - this externalizes the diff algorithm only keeping the small part where we wrap it for HTML diff display Also upgrade the ExifInterface to the current recommended androidx reference Finally, de-lint a bit more since Base64 isn't used and others had easy fixes
mikehardy
commented
Nov 24, 2018
| StringBuilder prettyTyped = new StringBuilder(); | ||
| StringBuilder prettyCorrect = new StringBuilder(); | ||
| for (DiffAction aDiff : diff_main(typed, correct)) { | ||
| for (DiffMatchPatch.Diff aDiff : diffMatchPatch.diffMain(typed, correct)) { |
Member
Author
There was a problem hiding this comment.
This method (and it's supporting methods) are the only ones in the whole file that wasn't a copy, so I kept it and just replaced the underlying diff calls with calls to the external version of the implementation
Member
Author
|
Just leaving this as a link - there's some hope the original author will (re-)mavenize so the official upstream can be a gradle dependency google/diff-match-patch#2 |
Member
Author
|
My upstream request on this dependency for a resync with the official source received action, so this will be a dependency update in a day or so, making this a win I think - less code that we are maintaining, and the external dependency has a responsive maintainer. 👏 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The Google diff-match-patch library object we had copied has moved
on and been worked on since 2006 (!) - this externalizes the diff algorithm
only keeping the small part where we wrap it for HTML diff display
Also upgrade the ExifInterface to the current recommended androidx reference
Finally, de-lint a bit more since Base64 isn't used and others had easy fixes
This is a massive improvement in errors-detected-by-codacy and just in general a huge code deletion, which I like.
Worth noting this is the usual maven/gradle reference for this algorithm (and is better than we were doing at updating) but even it is out of date. I've raised an issue with them in case they want to update ever: https://bitbucket.org/cowwoc/google-diff-match-patch/issues/5/update-to-track-new-home-for-diff-match