aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.2211: listener callback "added" argument is not the total

Browse Source 
Problem:    Listener callback "added" argument is not the total. (Andy
            Massimino)
Solution:   Compute the total. (closes #5105)
This commit is contained in:
Bram Moolenaar
2019-10-24 20:07:07 +02:00
parent b754b5bf6d
commit 336bf2b8b2
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/change.c
View File

@@ -371,9 +371,9 @@ invoke_listeners(buf_T *buf)
if (start > lnum) if (start > lnum)
start = lnum; start = lnum;
lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"end"); lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"end");
if (lnum > end) if (end < lnum)
end = lnum; end = lnum;
added = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"added"); added += dict_get_number(li->li_tv.vval.v_dict, (char_u *)"added");
} }
argv[1].v_type = VAR_NUMBER; argv[1].v_type = VAR_NUMBER;
argv[1].vval.v_number = start; argv[1].vval.v_number = start;

9
src/testdir/test_listener.vim
View File

@@ -1,7 +1,9 @@
" tests for listener_add() and listener_remove() " tests for listener_add() and listener_remove()
func s:StoreList(s, l) func s:StoreList(s, e, a, l)
let s:start = a:s let s:start = a:s
let s:end = a:e
let s:added = a:a
let s:text = getline(a:s) let s:text = getline(a:s)
let s:list = a:l let s:list = a:l
endfunc endfunc
@@ -19,7 +21,7 @@ func Test_listening()
new new
call setline(1, ['one', 'two']) call setline(1, ['one', 'two'])
let s:list = [] let s:list = []
let id = listener_add({b, s, e, a, l -> s:StoreList(s, l)}) let id = listener_add({b, s, e, a, l -> s:StoreList(s, e, a, l)})
call setline(1, 'one one') call setline(1, 'one one')
call listener_flush() call listener_flush()
call assert_equal([{'lnum': 1, 'end': 2, 'col': 1, 'added': 0}], s:list) call assert_equal([{'lnum': 1, 'end': 2, 'col': 1, 'added': 0}], s:list)
@@ -65,6 +67,9 @@ func Test_listening()
call bufnr()->listener_flush() call bufnr()->listener_flush()
call assert_equal([{'lnum': 3, 'end': 3, 'col': 1, 'added': 1}, call assert_equal([{'lnum': 3, 'end': 3, 'col': 1, 'added': 1},
\ {'lnum': 1, 'end': 2, 'col': 1, 'added': 0}], s:list) \ {'lnum': 1, 'end': 2, 'col': 1, 'added': 0}], s:list)
call assert_equal(1, s:start)
call assert_equal(3, s:end)
call assert_equal(1, s:added)
" an insert just above a previous change that was the last one does not get " an insert just above a previous change that was the last one does not get
" merged " merged

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2211,
/**/ /**/
2210, 2210,
/**/ /**/