Mercurial > vim
changeset 8011:26f555e9aab1 v7.4.1300
commit https://github.com/vim/vim/commit/2ab375e54ef4eac438d1aef8b99d9e71f2fa0c63
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 10 22:23:06 2016 +0100
patch 7.4.1300
Problem: Cannot test CursorMovedI because there is typeahead.
Solution: Add disable_char_avail_for_testing().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 10 Feb 2016 22:30:04 +0100 |
| parents | cbfb5ac5f9c5 |
| children | 562b4bda0d64 |
| files | src/eval.c src/getchar.c src/globals.h src/testdir/README.txt src/testdir/test_cursor_func.vim src/version.c |
| diffstat | 6 files changed, 50 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -532,6 +532,7 @@ static void f_delete(typval_T *argvars, static void f_did_filetype(typval_T *argvars, typval_T *rettv); static void f_diff_filler(typval_T *argvars, typval_T *rettv); static void f_diff_hlID(typval_T *argvars, typval_T *rettv); +static void f_disable_char_avail_for_testing(typval_T *argvars, typval_T *rettv); static void f_empty(typval_T *argvars, typval_T *rettv); static void f_escape(typval_T *argvars, typval_T *rettv); static void f_eval(typval_T *argvars, typval_T *rettv); @@ -8111,6 +8112,7 @@ static struct fst {"did_filetype", 0, 0, f_did_filetype}, {"diff_filler", 1, 1, f_diff_filler}, {"diff_hlID", 2, 2, f_diff_hlID}, + {"disable_char_avail_for_testing", 1, 1, f_disable_char_avail_for_testing}, {"empty", 1, 1, f_empty}, {"escape", 2, 2, f_escape}, {"eval", 1, 1, f_eval}, @@ -10606,6 +10608,15 @@ f_diff_hlID(typval_T *argvars UNUSED, ty } /* + * "disable_char_avail_for_testing({expr})" function + */ + static void +f_disable_char_avail_for_testing(typval_T *argvars, typval_T *rettv UNUSED) +{ + disable_char_avail_for_testing = get_tv_number(&argvars[0]); +} + +/* * "empty({expr})" function */ static void @@ -12449,8 +12460,11 @@ getpos_both( #endif (varnumber_T)0); if (getcurpos) + { + update_curswant(); list_append_number(l, curwin->w_curswant == MAXCOL ? (varnumber_T)MAXCOL : (varnumber_T)curwin->w_curswant + 1); + } } else rettv->vval.v_number = FALSE;
--- a/src/getchar.c +++ b/src/getchar.c @@ -1888,6 +1888,12 @@ char_avail(void) { int retval; +#ifdef FEAT_EVAL + /* When disable_char_avail_for_testing(1) was called pretend there is no + * typeahead. */ + if (disable_char_avail_for_testing) + return FALSE; +#endif ++no_mapping; retval = vpeekc(); --no_mapping;
--- a/src/globals.h +++ b/src/globals.h @@ -1621,6 +1621,8 @@ EXTERN alloc_id_T alloc_fail_id INIT(= EXTERN int alloc_fail_countdown INIT(= -1); /* set by alloc_fail(), number of times alloc() returns NULL */ EXTERN int alloc_fail_repeat INIT(= 0); + +EXTERN int disable_char_avail_for_testing INIT(= 0); #endif /*
--- a/src/testdir/README.txt +++ b/src/testdir/README.txt @@ -25,6 +25,9 @@ What you can use (see test_assert.vim fo to check memory allocation failures are handled gracefully. You need to change the source code to add an ID to the allocation. Update LAST_ID_USED above alloc_id() to the highest ID used. +- Use disable_char_avail_for_testing(1) if char_avail() must return FALSE for + a while. E.g. to trigger the CursorMovedI autocommand event. + See test_cursor_func.vim for an example TO ADD AN OLD STYLE TEST:
--- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -20,16 +20,35 @@ func Test_move_cursor() call assert_equal([4, 3, 0, 3], getcurpos()[1:]) call cursor(2, 2) - call assert_equal([2, 2, 0, 3], getcurpos()[1:]) + call assert_equal([2, 2, 0, 2], getcurpos()[1:]) " line number zero keeps the line number call cursor(0, 1) - call assert_equal([2, 1, 0, 3], getcurpos()[1:]) + call assert_equal([2, 1, 0, 1], getcurpos()[1:]) " col number zero keeps the column call cursor(3, 0) - call assert_equal([3, 1, 0, 3], getcurpos()[1:]) + call assert_equal([3, 1, 0, 1], getcurpos()[1:]) " below last line goes to last line call cursor(9, 1) - call assert_equal([4, 1, 0, 3], getcurpos()[1:]) + call assert_equal([4, 1, 0, 1], getcurpos()[1:]) quit! endfunc + +" Very short version of what matchparen does. +function s:Highlight_Matching_Pair() + let save_cursor = getcurpos() + call setpos('.', save_cursor) +endfunc + +func Test_curswant_with_autocommand() + new + call setline(1, ['func()', '{', '}', '----']) + autocmd! CursorMovedI * call s:Highlight_Matching_Pair() + call disable_char_avail_for_testing(1) + exe "normal! 3Ga\<Down>X\<Esc>" + call disable_char_avail_for_testing(0) + call assert_equal('-X---', getline(4)) + autocmd! CursorMovedI * + quit! +endfunc +