mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-26 17:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1563: completion: ruler may disappear (#34977)

Browse Source 
Problem:  The ruler disappears after typing the second character during
          insert mode completion, even when completion messages are
          suppressed ('shortmess' includes "c"). This makes the UI
          appear inconsistent.
Solution: Ensure the ruler is restored during screen redraw when popup
          completion is active (Girish Palya).

Notes:
No new tests were added, as existing screen dump tests were updated to
reflect the corrected behavior.

closes: vim/vim#17770

824286c9a7

Nvim already behaves correctly as the popup menu is a separate grid in
the compositor.

Co-authored-by: Girish Palya <girishji@gmail.com>
This commit is contained in:
zeertzjq
2025-07-18 07:37:17 +08:00
committed by GitHub
parent 1b6848c299
commit 9d1333a385
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/statusline.c
View File

@@ -415,7 +415,7 @@ void redraw_ruler(void)
return; return;
} }
// Check if cursor.lnum is valid, since win_redr_ruler() may be called // Check if cursor.lnum is valid, since redraw_ruler() may be called
// after deleting lines, before cursor.lnum is corrected. // after deleting lines, before cursor.lnum is corrected.
if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) { if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) {
return; return;

5
test/functional/editor/completion_spec.lua
View File

@@ -1376,6 +1376,7 @@ describe('completion', function()
-- oldtest: Test_shortmess() -- oldtest: Test_shortmess()
it('shortmess+=c turns off completion messages', function() it('shortmess+=c turns off completion messages', function()
command('set ruler')
command([[call setline(1, ['hello', 'hullo', 'heee'])]]) command([[call setline(1, ['hello', 'hullo', 'heee'])]])
feed('Goh<C-N>') feed('Goh<C-N>')
screen:expect([[ screen:expect([[
@@ -1399,7 +1400,7 @@ describe('completion', function()
{12:hello }{1: }| {12:hello }{1: }|
{4:hullo }{1: }| {4:hullo }{1: }|
{4:heee }{1: }| {4:heee }{1: }|
{5:-- INSERT --} | {5:-- INSERT --} 4,6 All |
]]) ]])
end) end)
end) end)

1
test/old/testdir/test_popup.vim
View File

@@ -220,7 +220,6 @@ func Test_popup_complete()
set completeopt& set completeopt&
endfunc endfunc
func Test_popup_completion_insertmode() func Test_popup_completion_insertmode()
new new
inoremap <F5> <C-R>=ListMonths()<CR> inoremap <F5> <C-R>=ListMonths()<CR>