kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 19:25:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20322 from zeertzjq/vim-9.0.0567

Browse Source 
vim-patch:9.0.{0567,0572}: 'completeopt' "longest" is not used for complete()
This commit is contained in:
zeertzjq 2022-09-24 21:42:18 +08:00 committed by GitHub
commit dfc6c973a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/insexpand.c
View File

@ -199,6 +199,8 @@ static bool compl_no_insert = false; ///< false: select & insert
///< true: noinsert
static bool compl_no_select = false; ///< false: select & insert
///< true: noselect
static bool compl_longest = false; ///< false: insert full match
///< true: insert longest prefix
/// Selected one of the matches. When false the match was edited or using the
/// longest common string.
@ -1006,12 +1008,16 @@ void completeopt_was_set(void)
{
compl_no_insert = false;
compl_no_select = false;
compl_longest = false;
if (strstr(p_cot, "noselect") != NULL) {
compl_no_select = true;
}
if (strstr(p_cot, "noinsert") != NULL) {
compl_no_insert = true;
}
if (strstr(p_cot, "longest") != NULL) {
compl_longest = true;
}
}
/// "compl_match_array" points the currently displayed list of entries in the
@ -2103,7 +2109,7 @@ bool ins_compl_prep(int c)
// Set "compl_get_longest" when finding the first matches.
if (ctrl_x_mode_not_defined_yet()
|| (ctrl_x_mode_normal() && !compl_started)) {
compl_get_longest = (strstr(p_cot, "longest") != NULL);
compl_get_longest = compl_longest;
compl_used_match = true;
}
@ -2420,6 +2426,7 @@ static void set_completion(colnr_T startcol, list_T *list)
}
ins_compl_clear();
ins_compl_free();
compl_get_longest = compl_longest;
compl_direction = FORWARD;
if (startcol > curwin->w_cursor.col) {
@ -2449,9 +2456,10 @@ static void set_completion(colnr_T startcol, list_T *list)
int save_w_leftcol = curwin->w_leftcol;
compl_curr_match = compl_first_match;
if (compl_no_insert || compl_no_select) {
bool no_select = compl_no_select || compl_longest;
if (compl_no_insert || no_select) {
ins_complete(K_DOWN, false);
if (compl_no_select) {
if (no_select) {
ins_complete(K_UP, false);
}
} else {

23
src/nvim/testdir/test_ins_complete.vim
View File

@ -702,6 +702,27 @@ func Test_recursive_complete_func()
bw!
endfunc
" Test for using complete() with completeopt+=longest
func Test_complete_with_longest()
new
inoremap <buffer> <f3> <cmd>call complete(1, ["iaax", "iaay", "iaaz"])<cr>
" default: insert first match
set completeopt&
call setline(1, ['i'])
exe "normal Aa\<f3>\<esc>"
call assert_equal('iaax', getline(1))
" with longest: insert longest prefix
set completeopt+=longest
call setline(1, ['i'])
exe "normal Aa\<f3>\<esc>"
call assert_equal('iaa', getline(1))
set completeopt&
bwipe!
endfunc
" Test for completing words following a completed word in a line
func Test_complete_wrapscan()
" complete words from another buffer
@ -1256,7 +1277,7 @@ endfunc
" A mapping is not used for the key after CTRL-X.
func Test_no_mapping_for_ctrl_x_key()
new
inoremap <C-K> <Cmd>let was_mapped = 'yes'<CR>
inoremap <buffer> <C-K> <Cmd>let was_mapped = 'yes'<CR>
setlocal dictionary=README.txt
call feedkeys("aexam\<C-X>\<C-K> ", 'xt')
call assert_equal('example ', getline(1))