IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0390 (#6197)

Browse Source 
Problem:    When the window scrolls horizontally when the popup menu is
            displayed part of it may not be cleared. (Neovim issue #6184)
Solution:   Remove the menu when the windows scrolled. (closes vim/vim#1524)

Fixes #6184
This commit is contained in:
Tommy Allen 2017-03-01 08:08:05 -05:00 committed by Justin M. Keyes
parent 2872e57af2
commit 410da0f678
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/edit.c
View File

@ -2379,6 +2379,7 @@ void set_completion(colnr_T startcol, list_T *list)
compl_used_match = TRUE; compl_used_match = TRUE;
compl_cont_status = 0; compl_cont_status = 0;
int save_w_wrow = curwin->w_wrow; int save_w_wrow = curwin->w_wrow;
int save_w_leftcol = curwin->w_leftcol;
compl_curr_match = compl_first_match; compl_curr_match = compl_first_match;
if (compl_no_insert || compl_no_select) { if (compl_no_insert || compl_no_select) {
@ -2393,7 +2394,7 @@ void set_completion(colnr_T startcol, list_T *list)
// Lazily show the popup menu, unless we got interrupted. // Lazily show the popup menu, unless we got interrupted.
if (!compl_interrupted) { if (!compl_interrupted) {
show_pum(save_w_wrow); show_pum(save_w_wrow, save_w_leftcol);
} }
ui_flush(); ui_flush();
@ -4338,6 +4339,7 @@ static int ins_complete(int c, bool enable_pum)
colnr_T curs_col; /* cursor column */ colnr_T curs_col; /* cursor column */
int n; int n;
int save_w_wrow; int save_w_wrow;
int save_w_leftcol;
int insert_match; int insert_match;
compl_direction = ins_compl_key2dir(c); compl_direction = ins_compl_key2dir(c);
@ -4687,6 +4689,7 @@ static int ins_complete(int c, bool enable_pum)
* Find next match (and following matches). * Find next match (and following matches).
*/ */
save_w_wrow = curwin->w_wrow; save_w_wrow = curwin->w_wrow;
save_w_leftcol = curwin->w_leftcol;
n = ins_compl_next(true, ins_compl_key2count(c), insert_match, false); n = ins_compl_next(true, ins_compl_key2count(c), insert_match, false);
/* may undisplay the popup menu */ /* may undisplay the popup menu */
@ -4821,7 +4824,7 @@ static int ins_complete(int c, bool enable_pum)
// Show the popup menu, unless we got interrupted. // Show the popup menu, unless we got interrupted.
if (enable_pum && !compl_interrupted) { if (enable_pum && !compl_interrupted) {
show_pum(save_w_wrow); show_pum(save_w_wrow, save_w_leftcol);
} }
compl_was_interrupted = compl_interrupted; compl_was_interrupted = compl_interrupted;
compl_interrupted = FALSE; compl_interrupted = FALSE;
@ -8549,15 +8552,16 @@ static char_u *do_insert_char_pre(int c)
return res; return res;
} }
static void show_pum(int save_w_wrow) static void show_pum(int prev_w_wrow, int prev_w_leftcol)
{ {
// RedrawingDisabled may be set when invoked through complete(). // RedrawingDisabled may be set when invoked through complete().
int n = RedrawingDisabled; int n = RedrawingDisabled;
RedrawingDisabled = 0; RedrawingDisabled = 0;
// If the cursor moved we need to remove the pum first. // If the cursor moved or the display scrolled we need to remove the pum
// first.
setcursor(); setcursor();
if (save_w_wrow != curwin->w_wrow) { if (prev_w_wrow != curwin->w_wrow || prev_w_leftcol != curwin->w_leftcol) {
ins_compl_del_pum(); ins_compl_del_pum();
} }