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

vim-patch:8.2.3465: cannot detect insert scroll mode (#15885)

Browse Source 
Problem:    Cannot detect insert scroll mode.
Solution:   Add "scroll" to complete_info(). (closes vim/vim#8943)
27fef59dd1
This commit is contained in:
zeertzjq
2021-10-04 02:53:58 +08:00
committed by GitHub
parent 3beea1fe1b
commit 04b59ebd85
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/eval.txt
View File

@@ -3419,6 +3419,8 @@ complete_info([{what}]) *complete_info()*
"" Not in completion mode "" Not in completion mode
"keyword" Keyword completion |i_CTRL-X_CTRL-N| "keyword" Keyword completion |i_CTRL-X_CTRL-N|
"ctrl_x" Just pressed CTRL-X |i_CTRL-X| "ctrl_x" Just pressed CTRL-X |i_CTRL-X|
"scroll" Scrolling with |i_CTRL-X_CTRL-E| or
|i_CTRL-X_CTRL-Y|
"whole_line" Whole lines |i_CTRL-X_CTRL-L| "whole_line" Whole lines |i_CTRL-X_CTRL-L|
"files" File names |i_CTRL-X_CTRL-F| "files" File names |i_CTRL-X_CTRL-F|
"tags" Tags |i_CTRL-X_CTRL-]| "tags" Tags |i_CTRL-X_CTRL-]|

4
src/nvim/edit.c
View File

@@ -116,7 +116,7 @@ static char *ctrl_x_msgs[] =
static char *ctrl_x_mode_names[] = { static char *ctrl_x_mode_names[] = {
"keyword", "keyword",
"ctrl_x", "ctrl_x",
"unknown", // CTRL_X_SCROLL "scroll",
"whole_line", "whole_line",
"files", "files",
"tags", "tags",
@@ -3329,7 +3329,7 @@ void get_complete_info(list_T *what_list, dict_T *retdict)
// Return Insert completion mode name string // Return Insert completion mode name string
static char_u *ins_compl_mode(void) static char_u *ins_compl_mode(void)
{ {
if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || compl_started) { if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL || compl_started) {
return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT]; return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT];
} }
return (char_u *)""; return (char_u *)"";

4
src/nvim/testdir/test_popup.vim
View File

@@ -950,6 +950,10 @@ func Test_popup_complete_info_01()
\ ["\<C-X>", 'ctrl_x'], \ ["\<C-X>", 'ctrl_x'],
\ ["\<C-X>\<C-N>", 'keyword'], \ ["\<C-X>\<C-N>", 'keyword'],
\ ["\<C-X>\<C-P>", 'keyword'], \ ["\<C-X>\<C-P>", 'keyword'],
\ ["\<C-X>\<C-E>", 'scroll'],
\ ["\<C-X>\<C-Y>", 'scroll'],
\ ["\<C-X>\<C-E>\<C-E>\<C-Y>", 'scroll'],
\ ["\<C-X>\<C-Y>\<C-E>\<C-Y>", 'scroll'],
\ ["\<C-X>\<C-L>", 'whole_line'], \ ["\<C-X>\<C-L>", 'whole_line'],
\ ["\<C-X>\<C-F>", 'files'], \ ["\<C-X>\<C-F>", 'files'],
\ ["\<C-X>\<C-]>", 'tags'], \ ["\<C-X>\<C-]>", 'tags'],