kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 13:45:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12685 from BigPeet/vim-patch-8.2.1252

Browse Source 
vim-patch:8.2.1252
This commit is contained in:
James McCoy 2020-07-29 17:23:21 -04:00 committed by GitHub
commit 54ff1cdd76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/mark.c
View File

@ -632,6 +632,7 @@ void ex_marks(exarg_T *eap)
char_u *arg = eap->arg;
int i;
char_u *name;
pos_T *posp, *startp, *endp;
if (arg != NULL && *arg == NUL)
arg = NULL;
@ -657,8 +658,18 @@ void ex_marks(exarg_T *eap)
show_one_mark(']', arg, &curbuf->b_op_end, NULL, true);
show_one_mark('^', arg, &curbuf->b_last_insert.mark, NULL, true);
show_one_mark('.', arg, &curbuf->b_last_change.mark, NULL, true);
show_one_mark('<', arg, &curbuf->b_visual.vi_start, NULL, true);
show_one_mark('>', arg, &curbuf->b_visual.vi_end, NULL, true);
// Show the marks as where they will jump to.
startp = &curbuf->b_visual.vi_start;
endp = &curbuf->b_visual.vi_end;
if ((lt(*startp, *endp) || endp->lnum == 0) && startp->lnum != 0) {
posp = startp;
} else {
posp = endp;
}
show_one_mark('<', arg, posp, NULL, true);
show_one_mark('>', arg, posp == startp ? endp : startp, NULL, true);
show_one_mark(-1, arg, NULL, NULL, false);
}

48
src/nvim/testdir/test_marks.vim
View File

@ -94,33 +94,43 @@ func Test_marks_cmd()
new Xtwo
call setline(1, ['ccc', 'ddd'])
norm! $mcGmD
exe "norm! GVgg\<Esc>G"
w!
b Xone
let a = split(execute('marks'), "\n")
call assert_equal(9, len(a))
call assert_equal('mark line col file/text', a[0])
call assert_equal(" ' 2 0 bbb", a[1])
call assert_equal(' a 1 0 aaa', a[2])
call assert_equal(' B 2 2 bbb', a[3])
call assert_equal(' D 2 0 Xtwo', a[4])
call assert_equal(' " 1 0 aaa', a[5])
call assert_equal(' [ 1 0 aaa', a[6])
call assert_equal(' ] 2 0 bbb', a[7])
call assert_equal(' . 2 0 bbb', a[8])
call assert_equal(['mark line col file/text',
\ " ' 2 0 bbb",
\ ' a 1 0 aaa',
\ ' B 2 2 bbb',
\ ' D 2 0 Xtwo',
\ ' " 1 0 aaa',
\ ' [ 1 0 aaa',
\ ' ] 2 0 bbb',
\ ' . 2 0 bbb'], a)
b Xtwo
let a = split(execute('marks'), "\n")
call assert_equal(9, len(a))
call assert_equal('mark line col file/text', a[0])
call assert_equal(" ' 1 0 ccc", a[1])
call assert_equal(' c 1 2 ccc', a[2])
call assert_equal(' B 2 2 Xone', a[3])
call assert_equal(' D 2 0 ddd', a[4])
call assert_equal(' " 2 0 ddd', a[5])
call assert_equal(' [ 1 0 ccc', a[6])
call assert_equal(' ] 2 0 ddd', a[7])
call assert_equal(' . 2 0 ddd', a[8])
call assert_equal(11, len(a))
call assert_equal(['mark line col file/text',
\ " ' 1 0 ccc",
\ ' c 1 2 ccc',
\ ' B 2 2 Xone',
\ ' D 2 0 ddd',
\ ' " 2 0 ddd',
\ ' [ 1 0 ccc',
\ ' ] 2 0 ddd',
\ ' . 2 0 ddd',
\ ' < 1 0 ccc',
\ ' > 2 0 ddd'], a)
norm! Gdd
w!
let a = split(execute('marks <>'), "\n")
call assert_equal(3, len(a))
call assert_equal(['mark line col file/text',
\ ' < 1 0 ccc',
\ ' > 2 0 -invalid-'], a)
b Xone
delmarks aB