m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-09 12:03:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix non-empty suffix condition

Browse Source
This commit is contained in:
Andy Stewart
2019-09-23 13:19:49 +01:00
parent f980fab55c
commit ae9edf0602
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/gitgutter/diff_highlight.vim
View File

@@ -40,11 +40,11 @@ function! gitgutter#diff_highlight#process(hunk_body)
let prefix = s:common_prefix(rline, aline) let prefix = s:common_prefix(rline, aline)
let [rsuffix, asuffix] = s:common_suffix(rline, aline, prefix+1) let [rsuffix, asuffix] = s:common_suffix(rline, aline, prefix+1)
if (prefix != 0 || rsuffix != 0) && prefix+1 < rsuffix if (prefix != 0 || rsuffix != len(rline)) && prefix+1 < rsuffix
call add(regions, [i+1, '-', prefix+1+1, rsuffix+1-1]) call add(regions, [i+1, '-', prefix+1+1, rsuffix+1-1])
endif endif
if (prefix != 0 || asuffix != 0) && prefix+1 < asuffix if (prefix != 0 || asuffix != len(aline)) && prefix+1 < asuffix
call add(regions, [i+1+removed, '+', prefix+1+1, asuffix+1-1]) call add(regions, [i+1+removed, '+', prefix+1+1, asuffix+1-1])
endif endif
endfor endfor

5
test/test_gitgutter.vim
View File

@@ -947,6 +947,11 @@ function Test_diff_highlight()
call assert_equal([], gitgutter#diff_highlight#process(['+foo'])) call assert_equal([], gitgutter#diff_highlight#process(['+foo']))
call assert_equal([], gitgutter#diff_highlight#process(['-foo','-bar','+baz'])) call assert_equal([], gitgutter#diff_highlight#process(['-foo','-bar','+baz']))
" everything changed
let hunk = ['-foo', '+cat']
let expected = []
call assert_equal(expected, gitgutter#diff_highlight#process(hunk))
" change in middle " change in middle
let hunk = ['-foo bar baz', '+foo (bar) baz'] let hunk = ['-foo bar baz', '+foo (bar) baz']
let expected = [[1, '-', 6, 8], [2, '+', 6, 10]] let expected = [[1, '-', 6, 8], [2, '+', 6, 10]]