Mercurial > vim
changeset 18434:5da355d15b88 v8.1.2211
patch 8.1.2211: listener callback "added" argument is not the total
Commit: https://github.com/vim/vim/commit/336bf2b8b269e2591576b9f580e79edb93e23c62
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 24 20:07:07 2019 +0200
patch 8.1.2211: listener callback "added" argument is not the total
Problem: Listener callback "added" argument is not the total. (Andy
Massimino)
Solution: Compute the total. (closes #5105)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 24 Oct 2019 20:15:03 +0200 |
parents | 557361ce163e |
children | bdaf40503e2a |
files | src/change.c src/testdir/test_listener.vim src/version.c |
diffstat | 3 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/change.c +++ b/src/change.c @@ -371,9 +371,9 @@ invoke_listeners(buf_T *buf) if (start > lnum) start = lnum; lnum = dict_get_number(li->li_tv.vval.v_dict, (char_u *)"end"); - if (lnum > end) + if (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].vval.v_number = start;
--- a/src/testdir/test_listener.vim +++ b/src/testdir/test_listener.vim @@ -1,7 +1,9 @@ " 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:end = a:e + let s:added = a:a let s:text = getline(a:s) let s:list = a:l endfunc @@ -19,7 +21,7 @@ func Test_listening() new call setline(1, ['one', 'two']) 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 listener_flush() 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 assert_equal([{'lnum': 3, 'end': 3, 'col': 1, 'added': 1}, \ {'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 " merged