mirror of
https://github.com/neovim/neovim.git
synced 2024-12-26 14:11:15 -07:00
f094db0e5c
Problem: not possible to use the jumplist like a stack
Solution: Add the 'jumpoptions' setting to make the jumplist
a stack.
Add an option for using jumplist like tag stack
related: vim/vim#7738
closes: vim/vim#13134
ported from NeoVim:
- https://neovim.io/doc/user/motion.html#jumplist-stack
- neovim/neovim@39094b3
- https://vi.stackexchange.com/questions/18344/how-to-change-jumplist-behavior
Based on the feedback in the previous PR, it looks like many people like
this option.
87018255e3
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: butwerenotthereyet <58348703+butwerenotthereyet@users.noreply.github.com>
174 lines
5.0 KiB
VimL
174 lines
5.0 KiB
VimL
" Tests for the jumplist functionality
|
|
|
|
" Tests for the getjumplist() function
|
|
func Test_getjumplist()
|
|
if !has("jumplist")
|
|
return
|
|
endif
|
|
|
|
%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")
|
|
|
|
" 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])
|
|
|
|
call delete("Xtest")
|
|
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},
|
|
"\ Nvim: avoids useless/phantom jumps
|
|
"\ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0},
|
|
"\ ], 6], getjumplist())
|
|
\ ], 5], 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
|