Mercurial > vim
view src/testdir/test_partial.vim @ 33674:021e5bb88513 v9.0.2074
patch 9.0.2074: Completion menu may be wrong
Commit: https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Oct 27 19:16:26 2023 +0200
patch 9.0.2074: Completion menu may be wrong
Problem: Completion menu may be wrong
Solution: Check for the original direction of the completion menu,
add more tests, make it work with 'noselect'
completion: move in right direction when filling completion_info()
When moving through the insert completion menu and switching directions,
we need to make sure we start at the correct position in the list and
move correctly forward/backwards through it, so that we do not skip
entries and the selected item points to the correct entry in the list
of completion entries generated by the completion_info() function.
The general case is this:
1) CTRL-X CTRL-N, we will traverse the list starting from
compl_first_match and then go forwards (using the cp->next pointer)
through the list (skipping the very first entry, which has the
CP_ORIGINAL_TEXT flag set (since that is the empty/non-selected entry
2) CTRL-X CTRL-P, we will traverse the list starting from
compl_first_match (which now points to the last entry). The previous
entry will have the CP_ORIGINAL_TEXT flag set, so we need to start
traversing the list from the second prev pointer.
There are in fact 2 special cases after starting the completion menu
with CTRL-X:
3) CTRL-N and then going backwards by pressing CTRL-P again.
compl_first_match will point to the same entry as in step 1 above,
but since compl_dir_foward() has been switched by pressing CTRL-P
to backwards we need to pretend to be in still in case 1 and still
traverse the list in forward direction using the cp_next pointer
4) CTRL-P and then going forwards by pressing CTRL-N again.
compl_first_match will point to the same entry as in step 2 above,
but since compl_dir_foward() has been switched by pressing CTRL-N
to forwards we need to pretend to be in still in case 2 and still
traverse the list in backward direction using the cp_prev pointer
For the 'noselect' case however, this is slightly different again. When
going backwards, we only need to go one cp_prev pointer back. And
resting of the direction works again slightly different. So we need to
take the noselect option into account when deciding in which direction
to iterate through the list of matches.
related: #13402
related: #12971
closes: #13408
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 27 Oct 2023 19:30:05 +0200 |
parents | 86eb4aba16c3 |
children | ddd5eaa2c0dc |
line wrap: on
line source
" Test binding arguments to a Funcref. source check.vim func MyFunc(arg1, arg2, arg3) return a:arg1 . '/' . a:arg2 . '/' . a:arg3 endfunc func MySort(up, one, two) if a:one == a:two return 0 endif if a:up return a:one > a:two ? 1 : -1 endif return a:one < a:two ? 1 : -1 endfunc func MyMap(sub, index, val) return a:val - a:sub endfunc func MyFilter(threshold, index, val) return a:val > a:threshold endfunc func Test_partial_args() let Cb = function('MyFunc', ["foo", "bar"]) call Cb("zzz") call assert_equal("foo/bar/xxx", Cb("xxx")) call assert_equal("foo/bar/yyy", call(Cb, ["yyy"])) let Cb2 = function(Cb) call assert_equal("foo/bar/zzz", Cb2("zzz")) let Cb3 = function(Cb, ["www"]) call assert_equal("foo/bar/www", Cb3()) let Cb = function('MyFunc', []) call assert_equal("a/b/c", Cb("a", "b", "c")) let Cb2 = function(Cb, []) call assert_equal("a/b/d", Cb2("a", "b", "d")) let Cb3 = function(Cb, ["a", "b"]) call assert_equal("a/b/e", Cb3("e")) let Sort = function('MySort', [1]) call assert_equal([1, 2, 3], sort([3, 1, 2], Sort)) let Sort = function('MySort', [0]) call assert_equal([3, 2, 1], sort([3, 1, 2], Sort)) let Map = function('MyMap', [2]) call assert_equal([-1, 0, 1], map([1, 2, 3], Map)) let Map = function('MyMap', [3]) call assert_equal([-2, -1, 0], map([1, 2, 3], Map)) let Filter = function('MyFilter', [1]) call assert_equal([2, 3], filter([1, 2, 3], Filter)) let Filter = function('MyFilter', [2]) call assert_equal([3], filter([1, 2, 3], Filter)) endfunc func MyDictFunc(arg1, arg2) dict return self.name . '/' . a:arg1 . '/' . a:arg2 endfunc func Test_partial_dict() let dict = {'name': 'hello'} let Cb = function('MyDictFunc', ["foo", "bar"], dict) call test_garbagecollect_now() call assert_equal("hello/foo/bar", Cb()) call assert_fails('Cb("xxx")', 'E492:') let Cb = function('MyDictFunc', ["foo"], dict) call assert_equal("hello/foo/xxx", Cb("xxx")) call assert_fails('Cb()', 'E492:') let Cb = function('MyDictFunc', [], dict) call assert_equal("hello/ttt/xxx", Cb("ttt", "xxx")) call assert_fails('Cb("yyy")', 'E492:') let Cb = function('MyDictFunc', dict) call assert_equal("hello/xxx/yyy", Cb("xxx", "yyy")) call assert_fails('Cb("fff")', 'E492:') let Cb = function('MyDictFunc', dict) call assert_equal({"foo": "hello/foo/1", "bar": "hello/bar/2"}, map({"foo": 1, "bar": 2}, Cb)) let dict = {"tr": function('tr', ['hello', 'h', 'H'])} call assert_equal("Hello", dict.tr()) call assert_fails("let F=function('setloclist', 10)", "E923:") call assert_fails("let F=function('setloclist', [], [])", "E1206:") endfunc func Test_partial_implicit() let dict = {'name': 'foo'} func dict.MyFunc(arg) dict return self.name . '/' . a:arg endfunc call assert_equal('foo/bar', dict.MyFunc('bar')) call assert_fails('let func = dict.MyFunc', 'E704:') let Func = dict.MyFunc call assert_equal('foo/aaa', Func('aaa')) let Func = function(dict.MyFunc, ['bbb']) call assert_equal('foo/bbb', Func()) endfunc fun InnerCall(funcref) return a:funcref endfu fun OuterCall() let opt = { 'func' : function('max') } call InnerCall(opt.func) endfu func Test_function_in_dict() call OuterCall() endfunc func s:cache_clear() dict return self.name endfunc func Test_script_function_in_dict() let s:obj = {'name': 'foo'} let s:obj2 = {'name': 'bar'} let s:obj['clear'] = function('s:cache_clear') call assert_equal('foo', s:obj.clear()) let F = s:obj.clear call assert_equal('foo', F()) call assert_equal('foo', call(s:obj.clear, [], s:obj)) call assert_equal('bar', call(s:obj.clear, [], s:obj2)) let s:obj2['clear'] = function('s:cache_clear') call assert_equal('bar', s:obj2.clear()) let B = s:obj2.clear call assert_equal('bar', B()) endfunc func s:cache_arg(arg) dict let s:result = self.name . '/' . a:arg return s:result endfunc func Test_script_function_in_dict_arg() let s:obj = {'name': 'foo'} let s:obj['clear'] = function('s:cache_arg') call assert_equal('foo/bar', s:obj.clear('bar')) let F = s:obj.clear let s:result = '' call assert_equal('foo/bar', F('bar')) call assert_equal('foo/bar', s:result) let s:obj['clear'] = function('s:cache_arg', ['bar']) call assert_equal('foo/bar', s:obj.clear()) let s:result = '' call s:obj.clear() call assert_equal('foo/bar', s:result) let F = s:obj.clear call assert_equal('foo/bar', F()) let s:result = '' call F() call assert_equal('foo/bar', s:result) call assert_equal('foo/bar', call(s:obj.clear, [], s:obj)) endfunc func Test_partial_exists() let F = function('MyFunc') call assert_true(exists('*F')) let lF = [F] call assert_true(exists('*lF[0]')) let F = function('MyFunc', ['arg']) call assert_true(exists('*F')) let lF = [F] call assert_true(exists('*lF[0]')) endfunc func Test_partial_string() let F = function('MyFunc') call assert_equal("function('MyFunc')", string(F)) let F = function('MyFunc', ['foo']) call assert_equal("function('MyFunc', ['foo'])", string(F)) let F = function('MyFunc', ['foo', 'bar']) call assert_equal("function('MyFunc', ['foo', 'bar'])", string(F)) let d = {'one': 1} let F = function('MyFunc', d) call assert_equal("function('MyFunc', {'one': 1})", string(F)) let F = function('MyFunc', ['foo'], d) call assert_equal("function('MyFunc', ['foo'], {'one': 1})", string(F)) call assert_equal("function('')", string(test_null_function())) call assert_equal("function('')", string(test_null_partial())) endfunc func Test_func_unref() let obj = {} function! obj.func() abort endfunction let funcnumber = matchstr(string(obj.func), '^function(''\zs.\{-}\ze''') call assert_true(exists('*{' . funcnumber . '}')) unlet obj call assert_false(exists('*{' . funcnumber . '}')) endfunc func Test_tostring() let d = {} let d.d = d function d.test3() echo 42 endfunction try call string(d.test3) catch call assert_true(v:false, v:exception) endtry endfunc func Test_redefine_dict_func() let d = {} function d.test4() endfunction let d.test4 = d.test4 try function! d.test4(name) endfunction catch call assert_true(v:errmsg, v:exception) endtry endfunc func Test_bind_in_python() CheckFeature python let g:d = {} function g:d.test2() endfunction python import vim try call assert_equal(pyeval('vim.bindeval("g:d.test2")'), g:d.test2) catch call assert_true(v:false, v:exception) endtry endfunc " This caused double free on exit if EXITFREE is defined. func Test_cyclic_list_arg() let l = [] let Pt = function('string', [l]) call add(l, Pt) unlet l unlet Pt endfunc " This caused double free on exit if EXITFREE is defined. func Test_cyclic_dict_arg() let d = {} let Pt = function('string', [d]) let d.Pt = Pt unlet d unlet Pt endfunc func Ignored3(job1, job2, status) endfunc func Test_cycle_partial_job() CheckFeature job let job = job_start('echo') call job_setoptions(job, {'exit_cb': function('Ignored3', [job])}) unlet job endfunc func Ignored2(job, status) endfunc func Test_ref_job_partial_dict() CheckFeature job let g:ref_job = job_start('echo') let d = {'a': 'b'} call job_setoptions(g:ref_job, {'exit_cb': function('Ignored2', [], d)}) call test_garbagecollect_now() endfunc func Test_auto_partial_rebind() let dict1 = {'name': 'dict1'} func! dict1.f1() return self.name endfunc let dict1.f2 = function(dict1.f1, dict1) call assert_equal('dict1', dict1.f1()) call assert_equal('dict1', dict1['f1']()) call assert_equal('dict1', dict1.f2()) call assert_equal('dict1', dict1['f2']()) let dict2 = {'name': 'dict2'} let dict2.f1 = dict1.f1 let dict2.f2 = dict1.f2 call assert_equal('dict2', dict2.f1()) call assert_equal('dict2', dict2['f1']()) call assert_equal('dict1', dict2.f2()) call assert_equal('dict1', dict2['f2']()) endfunc func Test_get_partial_items() let dict = {'name': 'hello'} let args = ["foo", "bar"] let Func = function('MyDictFunc') let Cb = function('MyDictFunc', args, dict) call assert_equal(Func, get(Cb, 'func')) call assert_equal('MyDictFunc', get(Cb, 'name')) call assert_equal(args, get(Cb, 'args')) call assert_equal(dict, get(Cb, 'dict')) call assert_fails('call get(Cb, "xxx")', 'E475:') call assert_equal(Func, get(Func, 'func')) call assert_equal('MyDictFunc', get(Func, 'name')) call assert_equal([], get(Func, 'args')) call assert_true(empty( get(Func, 'dict'))) let P = function('substitute', ['hello there', 'there']) let dict = {'partial has': 'no dict'} call assert_equal(dict, get(P, 'dict', dict)) call assert_equal(0, get(l:P, 'dict')) endfunc func Test_compare_partials() let d1 = {} let d2 = {} function d1.f1() dict endfunction function d1.f2() dict endfunction let F1 = get(d1, 'f1') let F2 = get(d1, 'f2') let F1d1 = function(F1, d1) let F2d1 = function(F2, d2) let F1d1a1 = function(F1d1, [1]) let F1d1a12 = function(F1d1, [1, 2]) let F1a1 = function(F1, [1]) let F1a2 = function(F1, [2]) let F1d2 = function(F1, d2) let d3 = {'f1': F1, 'f2': F2} let F1d3 = function(F1, d3) let F1ad1 = function(F1, [d1]) let F1ad3 = function(F1, [d3]) call assert_match('^function(''\d\+'')$', string(F1)) " Not a partial call assert_match('^function(''\d\+'')$', string(F2)) " Not a partial call assert_match('^function(''\d\+'', {.*})$', string(F1d1)) " A partial call assert_match('^function(''\d\+'', {.*})$', string(F2d1)) " A partial call assert_match('^function(''\d\+'', \[.*\])$', string(F1a1)) " No dict " != let X = F1 call assert_false(F1 != X) " same function let X = F1d1 call assert_false(F1d1 != X) " same partial let X = F1d1a1 call assert_false(F1d1a1 != X) " same partial let X = F1a1 call assert_false(F1a1 != X) " same partial call assert_true(F1 != F2) " Different functions call assert_true(F1 != F1d1) " Partial /= non-partial call assert_true(F1d1a1 != F1d1a12) " Different number of arguments call assert_true(F1a1 != F1d1a12) " One has no dict call assert_true(F1a1 != F1a2) " Different arguments call assert_true(F1d2 != F1d1) " Different dictionaries call assert_false(F1d1 != F1d3) " Equal dictionaries, even though d1 isnot d3 " isnot, option 1 call assert_true(F1 isnot# F2) " Different functions call assert_true(F1 isnot# F1d1) " Partial /= non-partial call assert_true(F1d1 isnot# F1d3) " d1 isnot d3, even though d1 == d3 call assert_true(F1a1 isnot# F1d1a12) " One has no dict call assert_true(F1a1 isnot# F1a2) " Different number of arguments call assert_true(F1ad1 isnot# F1ad3) " In arguments d1 isnot d3 " isnot, option 2 call assert_true(F1 isnot# F2) " Different functions call assert_true(F1 isnot# F1d1) " Partial /= non-partial call assert_true(d1.f1 isnot# d1.f1) " handle_subscript creates new partial each time " compare two null partials let N1 = test_null_partial() let N2 = N1 call assert_true(N1 is N2) call assert_true(N1 == N2) " compare a partial and a null partial call assert_false(N1 == F1) call assert_false(F1 is N1) endfunc " vim: shiftwidth=2 sts=2 expandtab