Mercurial > vim
view src/testdir/test_jumplist.vim @ 34596:5a8340e044f4 v9.1.0190
patch 9.1.0190: complete_info() returns wrong order of items
Commit: https://github.com/vim/vim/commit/8950bf7f8b85c1287d4e696965d88091fcc60594
Author: Girish Palya <girishji@gmail.com>
Date: Wed Mar 20 20:07:29 2024 +0100
patch 9.1.0190: complete_info() returns wrong order of items
Problem: complete_info() returns wrong order of items
(after v9.0.2018)
Solution: Revert Patch v9.0.2018
(Girish Palya)
bug fix: complete_info() gives wrong results
1) complete_info() reverses list of items during <c-p>
2) 'selected' item index is wrong during <c-p>
3) number of items returnd can be wrong
Solution:
- Decouple 'cp_number' from 'selected' index since they need not be
correlated
- Do not iterate the list backwards
- Add targeted tests
Regression introduced by https://github.com/vim/vim/commit/69fb5afb3bc9da24c2fb0eafb0027ba9c6502fc2
Following are unnecessary commits to patch problems from above:
https://github.com/vim/vim/commit/fef66301665027f1801a18d796f74584666f41ef
https://github.com/vim/vim/commit/daef8c74375141974d61b85199b383017644978c
All the tests from above commits are retained though.
fixes: #14204
closes: #14241
Signed-off-by: Girish Palya <girishji@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 20 Mar 2024 20:15:03 +0100 |
parents | 1f3bcb7f3bd0 |
children | 814fcbca4d8d |
line wrap: on
line source
" Tests for the jumplist functionality " Tests for the getjumplist() function func Test_getjumplist() %bwipe clearjumps call assert_equal([[], 0], getjumplist()) call assert_equal([[], 0], getjumplist(1)) call assert_equal([[], 0], getjumplist(1, 1)) call assert_equal([], getjumplist(100)) call assert_equal([], getjumplist(1, 100)) let lines = [] for i in range(1, 100) call add(lines, "Line " . i) endfor call writefile(lines, "Xtest", 'D') " Jump around and create a jump list edit Xtest let bnr = bufnr('%') normal 50% normal G normal gg let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 3] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) " Traverse the jump list and verify the results 5 exe "normal \<C-O>" call assert_equal(2, 1->getjumplist()[1]) exe "normal 2\<C-O>" call assert_equal(0, getjumplist(1, 1)[1]) exe "normal 3\<C-I>" call assert_equal(3, getjumplist()[1]) exe "normal \<C-O>" normal 20% let expected = [[ \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 5, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 4] call assert_equal(expected, getjumplist()) " jumplist doesn't change in between calls call assert_equal(expected, getjumplist()) let l = getjumplist() call test_garbagecollect_now() call assert_equal(4, l[1]) clearjumps call test_garbagecollect_now() call assert_equal(4, l[1]) endfunc func Test_jumplist_invalid() new clearjumps " put some randome text put ='a' let prev = bufnr('%') setl nomodified bufhidden=wipe e XXJumpListBuffer let bnr = bufnr('%') " 1) empty jumplist let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}], 1] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_equal('>', jumps[-1:]) " now jump back exe ":norm! \<c-o>" let expected = [[ \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}, \ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 0] call assert_equal(expected, getjumplist()) let jumps = execute(':jumps') call assert_match('> 0 2 0 -invalid-', jumps) endfunc " Test for '' mark in an empty buffer func Test_empty_buffer() new insert a b c d . call assert_equal(1, line("''")) bwipe! endfunc " Test for 'jumpoptions' func Test_jumpoptions() new call setline(1, range(1, 200)) clearjumps set jumpoptions=stack " Jump around to add some locations to the jump list. normal 10G normal 20G normal 30G normal 40G normal 50G let bnr = bufnr() " discards the tail when navigating from the middle exe "normal \<C-O>\<C-O>" call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 40, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0} \ ], 3], getjumplist()) " new jump location is added immediately after the last one normal 90G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 4], getjumplist()) " does not add the same location twice adjacently normal 60G normal 60G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 6], getjumplist()) " does add the same location twice non adjacently normal 10G normal 20G call assert_equal([ \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, \ ], 7], getjumplist()) set jumpoptions& %bw! endfunc " vim: shiftwidth=2 sts=2 expandtab