mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-20 22:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(window): clear cmdline 'ruler' when window is closed (#38631)

Browse Source 
Problem:  When 'ruler' is in last line of the screen and the current
          floating window is closed, the ruler is not cleared.
Solution: When closing the current floating window, redraw the cmdline
          if that contained, and will no longer contain the 'ruler'.
(cherry picked from commit cd2a27507a)
This commit is contained in:
luukvbaal
2026-03-31 18:02:26 +02:00
committed by GitHub
parent f7b4eb5e0b
commit 32ca1aae88
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/window.c
View File

@@ -3012,6 +3012,7 @@ int win_close(win_T *win, bool free_buf, bool force)
// which may have changed since the last set_bufref. (e.g: close_buffer autocmds) // which may have changed since the last set_bufref. (e.g: close_buffer autocmds)
set_bufref(&bufref, win->w_buffer); set_bufref(&bufref, win->w_buffer);
bool had_cmdline_ruler = p_ru && win == curwin && win->w_status_height == 0;
// Free the memory used for the window and get the window that received // Free the memory used for the window and get the window that received
// the screen space. // the screen space.
int dir; int dir;
@@ -3074,6 +3075,8 @@ int win_close(win_T *win, bool free_buf, bool force)
win_comp_pos(); win_comp_pos();
win_fix_scroll(false); win_fix_scroll(false);
} }
} else if (had_cmdline_ruler && wp->w_status_height > 0) {
redraw_cmdline = true; // clear cmdline 'ruler'
} }
if (bufref.br_buf && bufref_valid(&bufref) && bufref.br_buf->terminal) { if (bufref.br_buf && bufref_valid(&bufref) && bufref.br_buf->terminal) {
terminal_check_size(bufref.br_buf->terminal); terminal_check_size(bufref.br_buf->terminal);

13
test/functional/ui/statusline_spec.lua
View File

@@ -805,6 +805,19 @@ describe('statusline', function()
]]) ]])
end) end)
it('ruler is cleared when window without statusline is closed', function()
local cfg = { relative = 'editor', row = 1, col = 1, height = 1, width = 1 }
local win = api.nvim_open_win(0, true, cfg)
command('set ruler laststatus=2')
api.nvim_win_close(win, true)
screen:expect([[
^ |
{1:~ }|*5
{3:[No Name] 0,0-1 All}|
|
]])
end)
it('hidden moves ruler to cmdline', function() it('hidden moves ruler to cmdline', function()
-- Use long ruler to check 'ruler' with 'rulerformat' set has correct width. -- Use long ruler to check 'ruler' with 'rulerformat' set has correct width.
command [[ command [[