mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 21:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.1046: code duplication in diff mode

Browse Source 
Problem:    Code duplication in diff mode.
Solution:   Use diff_equal_char() also in diff_cmp(). (Rick Howe)
ae96b8d058
This commit is contained in:
Jan Edmund Lazo
2018-08-10 17:13:02 -04:00
parent 4f93d05d39
commit fd334ec2a8
1 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/nvim/diff.c
View File

@@ -1597,6 +1597,35 @@ static bool diff_equal_entry(diff_T *dp, int idx1, int idx2)
return true; return true;
} }
// Compare the characters at "p1" and "p2". If they are equal (possibly
// ignoring case) return true and set "len" to the number of bytes.
static bool diff_equal_char(const char_u *const p1, const char_u *const p2,
int *const len)
{
const int l = utfc_ptr2len(p1);
if (l != utfc_ptr2len(p2)) {
return false;
}
if (l > 1) {
if (STRNCMP(p1, p2, l) != 0
&& (!enc_utf8
|| !(diff_flags & DIFF_ICASE)
|| utf_fold(utf_ptr2char(p1)) != utf_fold(utf_ptr2char(p2)))) {
return false;
}
*len = l;
} else {
if ((*p1 != *p2)
&& (!(diff_flags & DIFF_ICASE)
|| TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) {
return false;
}
*len = 1;
}
return true;
}
/// Compare strings "s1" and "s2" according to 'diffopt'. /// Compare strings "s1" and "s2" according to 'diffopt'.
/// Return non-zero when they are different. /// Return non-zero when they are different.
/// ///
@@ -1623,30 +1652,12 @@ static int diff_cmp(char_u *s1, char_u *s2)
p1 = skipwhite(p1); p1 = skipwhite(p1);
p2 = skipwhite(p2); p2 = skipwhite(p2);
} else { } else {
int l = (*mb_ptr2len)(p1); int l;
if (l != (*mb_ptr2len)(p2)) { if (!diff_equal_char(p1, p2, &l)) {
break; break;
} }
p1 += l;
if (l > 1) { p2 += l;
if ((STRNCMP(p1, p2, l) != 0)
&& (!enc_utf8
|| !(diff_flags & DIFF_ICASE)
|| (utf_fold(utf_ptr2char(p1))
!= utf_fold(utf_ptr2char(p2))))) {
break;
}
p1 += l;
p2 += l;
} else {
if ((*p1 != *p2)
&& (!(diff_flags & DIFF_ICASE)
|| (TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))) {
break;
}
++p1;
++p2;
}
} }
} }
@@ -1870,35 +1881,6 @@ bool diffopt_horizontal(void)
return (diff_flags & DIFF_HORIZONTAL) != 0; return (diff_flags & DIFF_HORIZONTAL) != 0;
} }
// Compare the characters at "p1" and "p2". If they are equal (possibly
// ignoring case) return true and set "len" to the number of bytes.
static bool diff_equal_char(const char_u *const p1, const char_u *const p2,
int *const len)
{
const int l = utfc_ptr2len(p1);
if (l != utfc_ptr2len(p2)) {
return false;
}
if (l > 1) {
if (STRNCMP(p1, p2, l) != 0
&& (!enc_utf8
|| !(diff_flags & DIFF_ICASE)
|| utf_fold(utf_ptr2char(p1)) != utf_fold(utf_ptr2char(p2)))) {
return false;
}
*len = l;
} else {
if ((*p1 != *p2)
&& (!(diff_flags & DIFF_ICASE)
|| TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2))) {
return false;
}
*len = 1;
}
return true;
}
/// Find the difference within a changed line. /// Find the difference within a changed line.
/// ///
/// @param wp window whose current buffer to check /// @param wp window whose current buffer to check