mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 15:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1461: ruler not drawn correctly when using 'rulerformat'

Browse Source 
Problem:    Ruler not drawn correctly when using 'rulerformat'.
Solution:   Adjust formatting depending on whether the ruler is drawn in the
            statusline or the command line. (Sean Dewar, closes vim/vim#12246)

fc8a601c32

This issue was made apparent after neovim/neovim@0f1e2b6, as `showmode()` calls
`win_redr_ruler()` with `curwin` now if it's floating, rather than the last
window if there's no statusline (which usually already shares its right side
with that of the editor).

Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
(cherry picked from commit 7095f8ff9d)
This commit is contained in:
Sean Dewar
2023-04-17 17:32:32 +01:00
committed by github-actions[bot]
parent 96de6bbaad
commit ba198bd7cc
4 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/functional/legacy/cmdline_spec.lua
View File

@@ -239,6 +239,25 @@ describe('cmdline', function()
|
]])
end)
-- oldtest: Test_rulerformat_position()
it("ruler has correct position with 'rulerformat' set", function()
local screen = Screen.new(20, 3)
screen:set_default_attr_ids {
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
}
screen:attach()
meths.set_option('ruler', true)
meths.set_option('rulerformat', 'longish')
meths.set_option('laststatus', 0)
meths.set_option('winwidth', 1)
feed [[<C-W>v<C-W>|<C-W>p]]
screen:expect [[
│^ |
{0:~ }│{0:~}|
longish |
]]
end)
end)
describe('cmdwin', function()

45
test/functional/ui/float_spec.lua
View File

@@ -2276,6 +2276,51 @@ describe('float window', function()
end
end)
it("correct ruler position in current float with 'rulerformat' set", function()
command 'set ruler rulerformat=fish:<><'
meths.open_win(0, true, {relative='editor', width=9, height=3, row=0, col=5})
if multigrid then
screen:expect{grid=[[
## grid 1
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[2:----------------------------------------]|
[3:----------------------------------------]|
## grid 2
|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
## grid 3
fish:<>< |
## grid 4
{1:^ }|
{2:~ }|
{2:~ }|
]], float_pos={
[4] = {{id = 1001}, "NW", 1, 0, 5, true, 50};
}, win_viewport={
[2] = {win = {id = 1000}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
[4] = {win = {id = 1001}, topline = 0, botline = 2, curline = 0, curcol = 0, linecount = 1, sum_scroll_delta = 0};
}}
else
screen:expect{grid=[[
{1:^ } |
{0:~ }{2:~ }{0: }|
{0:~ }{2:~ }{0: }|
{0:~ }|
{0:~ }|
{0:~ }|
fish:<>< |
]]}
end
end)
it('can have minimum size', function()
insert("the background text")
local buf = meths.create_buf(false, true)

13
test/old/testdir/test_cmdline.vim
View File

@@ -3598,4 +3598,17 @@ func Test_setcmdline()
cunmap a
endfunc
func Test_rulerformat_position()
CheckScreendump
let buf = RunVimInTerminal('', #{rows: 2, cols: 20})
call term_sendkeys(buf, ":set ruler rulerformat=longish\<CR>")
call term_sendkeys(buf, ":set laststatus=0 winwidth=1\<CR>")
call term_sendkeys(buf, "\<C-W>v\<C-W>|\<C-W>p")
call VerifyScreenDump(buf, 'Test_rulerformat_position', {})
" clean up
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab