mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.2.3627: difficult to know where the text starts in a window (#16377)
vim-patch:8.2.3627: difficult to know where the text starts in a window
Problem: difficult to know where the text starts in a window. (Sergey
Vlasov)
Solution: Add the "textoff" entry in the result of getwininfo().
(closes vim/vim#9163)
cdf5fdb294
Fix indent in Test_getbufwintabinfo().
This commit is contained in:
zeertzjq
GitHub
parent
f45b2f313e
commit
e05db65d2a
@ -5562,6 +5562,9 @@ getwininfo([{winid}]) *getwininfo()*
|
||||
otherwise
|
||||
wincol leftmost screen column of the window;
|
||||
"col" from |win_screenpos()|
|
||||
textoff number of columns occupied by any
|
||||
'foldcolumn', 'signcolumn' and line
|
||||
number in front of the text
|
||||
winid |window-ID|
|
||||
winnr window number
|
||||
winrow topmost screen line of the window;
|
||||
|
||||
@ -6851,7 +6851,7 @@ dict_T *get_win_info(win_T *wp, int16_t tpnr, int16_t winnr)
|
||||
tv_dict_add_nr(dict, S_LEN("width"), wp->w_width);
|
||||
tv_dict_add_nr(dict, S_LEN("bufnr"), wp->w_buffer->b_fnum);
|
||||
tv_dict_add_nr(dict, S_LEN("wincol"), wp->w_wincol + 1);
|
||||
|
||||
tv_dict_add_nr(dict, S_LEN("textoff"), win_col_off(wp));
|
||||
tv_dict_add_nr(dict, S_LEN("terminal"), bt_terminal(wp->w_buffer));
|
||||
tv_dict_add_nr(dict, S_LEN("quickfix"), bt_quickfix(wp->w_buffer));
|
||||
tv_dict_add_nr(dict, S_LEN("loclist"),
|
||||
|
||||
@ -1,108 +1,110 @@
|
||||
" Tests for the getbufinfo(), getwininfo() and gettabinfo() functions
|
||||
|
||||
function Test_getbufwintabinfo()
|
||||
edit Xtestfile1
|
||||
edit Xtestfile2
|
||||
let buflist = getbufinfo()
|
||||
call assert_equal(2, len(buflist))
|
||||
call assert_match('Xtestfile1', buflist[0].name)
|
||||
call assert_match('Xtestfile2', getbufinfo('Xtestfile2')[0].name)
|
||||
call assert_equal([], getbufinfo(2016))
|
||||
edit Xtestfile1
|
||||
hide edit Xtestfile2
|
||||
hide enew
|
||||
call assert_equal(3, len(getbufinfo({'bufloaded':1})))
|
||||
edit Xtestfile1
|
||||
edit Xtestfile2
|
||||
let buflist = getbufinfo()
|
||||
call assert_equal(2, len(buflist))
|
||||
call assert_match('Xtestfile1', buflist[0].name)
|
||||
call assert_match('Xtestfile2', getbufinfo('Xtestfile2')[0].name)
|
||||
call assert_equal([], getbufinfo(2016))
|
||||
edit Xtestfile1
|
||||
hide edit Xtestfile2
|
||||
hide enew
|
||||
call assert_equal(3, len(getbufinfo({'bufloaded':1})))
|
||||
|
||||
set tabstop&vim
|
||||
let b:editor = 'vim'
|
||||
set tabstop&vim
|
||||
let b:editor = 'vim'
|
||||
let l = getbufinfo('%')
|
||||
call assert_equal(bufnr('%'), l[0].bufnr)
|
||||
call assert_equal('vim', l[0].variables.editor)
|
||||
call assert_notequal(-1, index(l[0].windows, '%'->bufwinid()))
|
||||
|
||||
" Test for getbufinfo() with 'bufmodified'
|
||||
call assert_equal(0, len(getbufinfo({'bufmodified' : 1})))
|
||||
call setbufline('Xtestfile1', 1, ["Line1"])
|
||||
let l = getbufinfo({'bufmodified' : 1})
|
||||
call assert_equal(1, len(l))
|
||||
call assert_equal(bufnr('Xtestfile1'), l[0].bufnr)
|
||||
|
||||
if has('signs')
|
||||
call append(0, ['Linux', 'Windows', 'Mac'])
|
||||
sign define Mark text=>> texthl=Search
|
||||
exe "sign place 2 line=3 name=Mark buffer=" . bufnr('%')
|
||||
let l = getbufinfo('%')
|
||||
call assert_equal(bufnr('%'), l[0].bufnr)
|
||||
call assert_equal('vim', l[0].variables.editor)
|
||||
call assert_notequal(-1, index(l[0].windows, '%'->bufwinid()))
|
||||
call assert_equal(2, l[0].signs[0].id)
|
||||
call assert_equal(3, l[0].signs[0].lnum)
|
||||
call assert_equal('Mark', l[0].signs[0].name)
|
||||
sign unplace *
|
||||
sign undefine Mark
|
||||
enew!
|
||||
endif
|
||||
|
||||
" Test for getbufinfo() with 'bufmodified'
|
||||
call assert_equal(0, len(getbufinfo({'bufmodified' : 1})))
|
||||
call setbufline('Xtestfile1', 1, ["Line1"])
|
||||
let l = getbufinfo({'bufmodified' : 1})
|
||||
call assert_equal(1, len(l))
|
||||
call assert_equal(bufnr('Xtestfile1'), l[0].bufnr)
|
||||
only
|
||||
let w1_id = win_getid()
|
||||
setl foldcolumn=3
|
||||
new
|
||||
let w2_id = win_getid()
|
||||
tabnew | let w3_id = win_getid()
|
||||
new | let w4_id = win_getid()
|
||||
vert new | let w5_id = win_getid()
|
||||
call setwinvar(0, 'signal', 'green')
|
||||
tabfirst
|
||||
let winlist = getwininfo()
|
||||
call assert_equal(5, len(winlist))
|
||||
call assert_equal(winwidth(1), winlist[0].width)
|
||||
call assert_equal(1, winlist[0].wincol)
|
||||
" tabline adds one row in terminal, not in GUI
|
||||
let tablineheight = winlist[0].winrow == 2 ? 1 : 0
|
||||
call assert_equal(tablineheight + 1, winlist[0].winrow)
|
||||
|
||||
if has('signs')
|
||||
call append(0, ['Linux', 'Windows', 'Mac'])
|
||||
sign define Mark text=>> texthl=Search
|
||||
exe "sign place 2 line=3 name=Mark buffer=" . bufnr('%')
|
||||
let l = getbufinfo('%')
|
||||
call assert_equal(2, l[0].signs[0].id)
|
||||
call assert_equal(3, l[0].signs[0].lnum)
|
||||
call assert_equal('Mark', l[0].signs[0].name)
|
||||
sign unplace *
|
||||
sign undefine Mark
|
||||
enew!
|
||||
endif
|
||||
call assert_equal(winbufnr(2), winlist[1].bufnr)
|
||||
call assert_equal(winheight(2), winlist[1].height)
|
||||
call assert_equal(1, winlist[1].wincol)
|
||||
call assert_equal(3, winlist[1].textoff) " foldcolumn
|
||||
call assert_equal(tablineheight + winheight(1) + 2, winlist[1].winrow)
|
||||
|
||||
only
|
||||
let w1_id = win_getid()
|
||||
new
|
||||
let w2_id = win_getid()
|
||||
tabnew | let w3_id = win_getid()
|
||||
new | let w4_id = win_getid()
|
||||
vert new | let w5_id = win_getid()
|
||||
call setwinvar(0, 'signal', 'green')
|
||||
tabfirst
|
||||
let winlist = getwininfo()
|
||||
call assert_equal(5, len(winlist))
|
||||
call assert_equal(winwidth(1), winlist[0].width)
|
||||
call assert_equal(1, winlist[0].wincol)
|
||||
" tabline adds one row in terminal, not in GUI
|
||||
let tablineheight = winlist[0].winrow == 2 ? 1 : 0
|
||||
call assert_equal(tablineheight + 1, winlist[0].winrow)
|
||||
call assert_equal(1, winlist[2].winnr)
|
||||
call assert_equal(tablineheight + 1, winlist[2].winrow)
|
||||
call assert_equal(1, winlist[2].wincol)
|
||||
|
||||
call assert_equal(winbufnr(2), winlist[1].bufnr)
|
||||
call assert_equal(winheight(2), winlist[1].height)
|
||||
call assert_equal(1, winlist[1].wincol)
|
||||
call assert_equal(tablineheight + winheight(1) + 2, winlist[1].winrow)
|
||||
call assert_equal(winlist[2].width + 2, winlist[3].wincol)
|
||||
call assert_equal(1, winlist[4].wincol)
|
||||
|
||||
call assert_equal(1, winlist[2].winnr)
|
||||
call assert_equal(tablineheight + 1, winlist[2].winrow)
|
||||
call assert_equal(1, winlist[2].wincol)
|
||||
call assert_equal(1, winlist[0].tabnr)
|
||||
call assert_equal(1, winlist[1].tabnr)
|
||||
call assert_equal(2, winlist[2].tabnr)
|
||||
call assert_equal(2, winlist[3].tabnr)
|
||||
call assert_equal(2, winlist[4].tabnr)
|
||||
|
||||
call assert_equal(winlist[2].width + 2, winlist[3].wincol)
|
||||
call assert_equal(1, winlist[4].wincol)
|
||||
call assert_equal('green', winlist[2].variables.signal)
|
||||
call assert_equal(w4_id, winlist[3].winid)
|
||||
let winfo = w5_id->getwininfo()[0]
|
||||
call assert_equal(2, winfo.tabnr)
|
||||
call assert_equal([], getwininfo(3))
|
||||
|
||||
call assert_equal(1, winlist[0].tabnr)
|
||||
call assert_equal(1, winlist[1].tabnr)
|
||||
call assert_equal(2, winlist[2].tabnr)
|
||||
call assert_equal(2, winlist[3].tabnr)
|
||||
call assert_equal(2, winlist[4].tabnr)
|
||||
call settabvar(1, 'space', 'build')
|
||||
let tablist = gettabinfo()
|
||||
call assert_equal(2, len(tablist))
|
||||
call assert_equal(3, len(tablist[1].windows))
|
||||
call assert_equal(2, tablist[1].tabnr)
|
||||
call assert_equal('build', tablist[0].variables.space)
|
||||
call assert_equal(w2_id, tablist[0].windows[0])
|
||||
call assert_equal([], 3->gettabinfo())
|
||||
|
||||
call assert_equal('green', winlist[2].variables.signal)
|
||||
call assert_equal(w4_id, winlist[3].winid)
|
||||
let winfo = w5_id->getwininfo()[0]
|
||||
call assert_equal(2, winfo.tabnr)
|
||||
call assert_equal([], getwininfo(3))
|
||||
tabonly | only
|
||||
|
||||
call settabvar(1, 'space', 'build')
|
||||
let tablist = gettabinfo()
|
||||
call assert_equal(2, len(tablist))
|
||||
call assert_equal(3, len(tablist[1].windows))
|
||||
call assert_equal(2, tablist[1].tabnr)
|
||||
call assert_equal('build', tablist[0].variables.space)
|
||||
call assert_equal(w2_id, tablist[0].windows[0])
|
||||
call assert_equal([], 3->gettabinfo())
|
||||
|
||||
tabonly | only
|
||||
|
||||
lexpr ''
|
||||
lopen
|
||||
copen
|
||||
let winlist = getwininfo()
|
||||
call assert_false(winlist[0].quickfix)
|
||||
call assert_false(winlist[0].loclist)
|
||||
call assert_true(winlist[1].quickfix)
|
||||
call assert_true(winlist[1].loclist)
|
||||
call assert_true(winlist[2].quickfix)
|
||||
call assert_false(winlist[2].loclist)
|
||||
wincmd t | only
|
||||
lexpr ''
|
||||
lopen
|
||||
copen
|
||||
let winlist = getwininfo()
|
||||
call assert_false(winlist[0].quickfix)
|
||||
call assert_false(winlist[0].loclist)
|
||||
call assert_true(winlist[1].quickfix)
|
||||
call assert_true(winlist[1].loclist)
|
||||
call assert_true(winlist[2].quickfix)
|
||||
call assert_false(winlist[2].loclist)
|
||||
wincmd t | only
|
||||
endfunction
|
||||
|
||||
function Test_get_buf_options()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user