Skip to content

Stop Splitting Surrogates #213

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 14, 2019
Merged

Stop Splitting Surrogates #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395c5ae
Update to delta method in diff match patch class to stop splitting su…
theck13 Nov 14, 2019
5ed3492
Update version from 0.9.1 to 0.9.2
theck13 Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Simperium/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,22 @@ public int diff_levenshtein(LinkedList<Diff> diffs) {
*/
public String diff_toDelta(LinkedList<Diff> diffs) {
StringBuilder text = new StringBuilder();
char lastEnd = 0;
boolean isFirst = true;
for (Diff aDiff : diffs) {
char thisTop = aDiff.text.charAt(0);
char thisEnd = aDiff.text.charAt(aDiff.text.length() - 1);
if (Character.isHighSurrogate(thisEnd)) {
aDiff.text = aDiff.text.substring(0, aDiff.text.length() - 1);
}
if (! isFirst && Character.isHighSurrogate(lastEnd) && Character.isLowSurrogate(thisTop)) {
aDiff.text = lastEnd + aDiff.text;
}
isFirst = false;
lastEnd = thisEnd;
if ( aDiff.text.isEmpty() ) {
continue;
}
switch (aDiff.operation) {
case INSERT:
try {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ def gitDescribe() {
}

def static gitVersion() {
'0.9.1'
'0.9.2'
}