aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.775

Browse Source 
Problem:    It is not possible to avoid using the first item of completion.
Solution:   Add the "noinsert" and "noselect" values to 'completeopt'. (Shougo
            Matsu)
This commit is contained in:
Bram Moolenaar
2015-07-10 18:18:40 +02:00
parent 42a4512f62
commit b6be1e2390
4 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/edit.c
View File

@@ -108,6 +108,11 @@ static char_u *compl_leader = NULL;
static int compl_get_longest = FALSE; /* put longest common string
in compl_leader */
static int compl_no_insert = FALSE; /* FALSE: select & insert
TRUE: noinsert */
static int compl_no_select = FALSE; /* FALSE: select & insert
TRUE: noselect */
static int compl_used_match; /* Selected one of the matches. When
FALSE the match was edited or using
the longest common string. */
@@ -2788,7 +2793,17 @@ set_completion(startcol, list)
compl_cont_status = 0;
compl_curr_match = compl_first_match;
ins_complete(Ctrl_N);
if (compl_no_insert)
{
if (!compl_no_select)
ins_complete(K_DOWN);
}
else
{
ins_complete(Ctrl_N);
if (compl_no_select)
ins_complete(Ctrl_P);
}
out_flush();
}
@@ -3657,10 +3672,18 @@ ins_compl_prep(c)
if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET
|| (ctrl_x_mode == 0 && !compl_started))
{
compl_get_longest = (vim_strchr(p_cot, 'l') != NULL);
compl_get_longest = (strstr((char *)p_cot, "longest") != NULL);
compl_used_match = TRUE;
}
compl_no_insert = FALSE;
compl_no_select = FALSE;
if (strstr((char *)p_cot, "noselect") != NULL)
compl_no_select = TRUE;
if (strstr((char *)p_cot, "noinsert") != NULL)
compl_no_insert = TRUE;
if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET)
{
/*
@@ -4672,6 +4695,7 @@ ins_compl_next(allow_get_expansion, count, insert_match)
compl_T *found_compl = NULL;
int found_end = FALSE;
int advance;
int started = compl_started;
/* When user complete function return -1 for findstart which is next
* time of 'always', compl_shown_match become NULL. */
@@ -4753,7 +4777,7 @@ ins_compl_next(allow_get_expansion, count, insert_match)
return -1;
}
if (advance)
if (!compl_no_select && advance)
{
if (compl_shows_dir == BACKWARD)
--compl_pending;
@@ -4805,7 +4829,12 @@ ins_compl_next(allow_get_expansion, count, insert_match)
}
/* Insert the text of the new completion, or the compl_leader. */
if (insert_match)
if (compl_no_insert && !started)
{
ins_bytes(compl_orig_text + ins_compl_len());
compl_used_match = FALSE;
}
else if (insert_match)
{
if (!compl_get_longest || compl_used_match)
ins_compl_insert();
@@ -4842,7 +4871,10 @@ ins_compl_next(allow_get_expansion, count, insert_match)
/* Enter will select a match when the match wasn't inserted and the popup
* menu is visible. */
compl_enter_selects = !insert_match && compl_match_array != NULL;
if (compl_no_insert && !started)
compl_enter_selects = TRUE;
else
compl_enter_selects = !insert_match && compl_match_array != NULL;
/*
* Show the file name for the match (if any)
@@ -4917,7 +4949,7 @@ ins_compl_check_keys(frequency)
}
}
}
if (compl_pending != 0 && !got_int)
if (compl_pending != 0 && !got_int && !compl_no_insert)
{
int todo = compl_pending > 0 ? compl_pending : -compl_pending;