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

vim-patch:8.0.1479: insert mode completion state is confusing

Browse Source 
Problem:    Insert mode completion state is confusing.
Solution:   Move ctrl_x_mode into edit.c.  Add CTRL_X_NORMAL for zero.
bc0e9adae9
This commit is contained in:
Jan Edmund Lazo
2019-06-23 21:20:19 -04:00
parent 3dcf2d5c16
commit 287f7a46a4
4 changed files with 73 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/nvim/edit.c
View File

@@ -64,6 +64,7 @@
#define CTRL_X_WANT_IDENT 0x100 #define CTRL_X_WANT_IDENT 0x100
#define CTRL_X_NORMAL 0 ///< CTRL-N CTRL-P completion, default
#define CTRL_X_NOT_DEFINED_YET 1 #define CTRL_X_NOT_DEFINED_YET 1
#define CTRL_X_SCROLL 2 #define CTRL_X_SCROLL 2
#define CTRL_X_WHOLE_LINE 3 #define CTRL_X_WHOLE_LINE 3
@@ -78,11 +79,12 @@
#define CTRL_X_FUNCTION 12 #define CTRL_X_FUNCTION 12
#define CTRL_X_OMNI 13 #define CTRL_X_OMNI 13
#define CTRL_X_SPELL 14 #define CTRL_X_SPELL 14
#define CTRL_X_LOCAL_MSG 15 /* only used in "ctrl_x_msgs" */ #define CTRL_X_LOCAL_MSG 15 ///< only used in "ctrl_x_msgs"
#define CTRL_X_EVAL 16 ///< for builtin function complete() #define CTRL_X_EVAL 16 ///< for builtin function complete()
#define CTRL_X_MSG(i) ctrl_x_msgs[(i) & ~CTRL_X_WANT_IDENT] #define CTRL_X_MSG(i) ctrl_x_msgs[(i) & ~CTRL_X_WANT_IDENT]
#define CTRL_X_MODE_LINE_OR_EVAL(m) (m == CTRL_X_WHOLE_LINE || m == CTRL_X_EVAL) #define CTRL_X_MODE_LINE_OR_EVAL(m) \
((m) == CTRL_X_WHOLE_LINE || (m) == CTRL_X_EVAL)
// Message for CTRL-X mode, index is ctrl_x_mode. // Message for CTRL-X mode, index is ctrl_x_mode.
static char *ctrl_x_msgs[] = static char *ctrl_x_msgs[] =
@@ -192,6 +194,9 @@ static int compl_restarting = FALSE; /* don't insert match */
* FALSE the word to be completed must be located. */ * FALSE the word to be completed must be located. */
static int compl_started = FALSE; static int compl_started = FALSE;
// Which Ctrl-X mode are we in?
static int ctrl_x_mode = CTRL_X_NORMAL;
static int compl_matches = 0; static int compl_matches = 0;
static char_u *compl_pattern = NULL; static char_u *compl_pattern = NULL;
static int compl_direction = FORWARD; static int compl_direction = FORWARD;
@@ -1921,6 +1926,19 @@ static void ins_ctrl_x(void)
} }
} }
// Whether other than default completion has been selected.
bool ctrl_x_mode_not_default(void)
{
return ctrl_x_mode != CTRL_X_NORMAL;
}
// Whether CTRL-X was typed without a following character.
bool ctrl_x_mode_not_defined_yet(void)
{
return ctrl_x_mode == CTRL_X_NOT_DEFINED_YET;
}
/// Check that the "dict" or "tsr" option can be used. /// Check that the "dict" or "tsr" option can be used.
/// ///
/// @param dict_opt check "dict" when true, "tsr" when false. /// @param dict_opt check "dict" when true, "tsr" when false.
@@ -1929,7 +1947,7 @@ static bool check_compl_option(bool dict_opt)
if (dict_opt if (dict_opt
? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell) ? (*curbuf->b_p_dict == NUL && *p_dict == NUL && !curwin->w_p_spell)
: (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)) { : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)) {
ctrl_x_mode = 0; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
msg_attr((dict_opt msg_attr((dict_opt
? _("'dictionary' option is empty") ? _("'dictionary' option is empty")
@@ -2460,7 +2478,7 @@ void completeopt_was_set(void)
void set_completion(colnr_T startcol, list_T *list) void set_completion(colnr_T startcol, list_T *list)
{ {
// If already doing completions stop it. // If already doing completions stop it.
if (ctrl_x_mode != 0) { if (ctrl_x_mode != CTRL_X_NORMAL) {
ins_compl_prep(' '); ins_compl_prep(' ');
} }
ins_compl_clear(); ins_compl_clear();
@@ -3331,7 +3349,7 @@ static bool ins_compl_prep(int c)
/* Set "compl_get_longest" when finding the first matches. */ /* Set "compl_get_longest" when finding the first matches. */
if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET
|| (ctrl_x_mode == 0 && !compl_started)) { || (ctrl_x_mode == CTRL_X_NORMAL && !compl_started)) {
compl_get_longest = (strstr((char *)p_cot, "longest") != NULL); compl_get_longest = (strstr((char *)p_cot, "longest") != NULL);
compl_used_match = TRUE; compl_used_match = TRUE;
@@ -3426,18 +3444,19 @@ static bool ins_compl_prep(int c)
else else
compl_cont_mode = CTRL_X_NOT_DEFINED_YET; compl_cont_mode = CTRL_X_NOT_DEFINED_YET;
} }
ctrl_x_mode = 0; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
showmode(); showmode();
break; break;
} }
} else if (ctrl_x_mode != 0) { } else if (ctrl_x_mode != CTRL_X_NORMAL) {
/* We're already in CTRL-X mode, do we stay in it? */ // We're already in CTRL-X mode, do we stay in it?
if (!vim_is_ctrl_x_key(c)) { if (!vim_is_ctrl_x_key(c)) {
if (ctrl_x_mode == CTRL_X_SCROLL) if (ctrl_x_mode == CTRL_X_SCROLL) {
ctrl_x_mode = 0; ctrl_x_mode = CTRL_X_NORMAL;
else } else {
ctrl_x_mode = CTRL_X_FINISHED; ctrl_x_mode = CTRL_X_FINISHED;
}
edit_submode = NULL; edit_submode = NULL;
} }
showmode(); showmode();
@@ -3448,7 +3467,10 @@ static bool ins_compl_prep(int c)
* 'Pattern not found') until another key is hit, then go back to * 'Pattern not found') until another key is hit, then go back to
* showing what mode we are in. */ * showing what mode we are in. */
showmode(); showmode();
if ((ctrl_x_mode == 0 && c != Ctrl_N && c != Ctrl_P && c != Ctrl_R if ((ctrl_x_mode == CTRL_X_NORMAL
&& c != Ctrl_N
&& c != Ctrl_P
&& c != Ctrl_R
&& !ins_compl_pum_key(c)) && !ins_compl_pum_key(c))
|| ctrl_x_mode == CTRL_X_FINISHED) { || ctrl_x_mode == CTRL_X_FINISHED) {
/* Get here when we have finished typing a sequence of ^N and /* Get here when we have finished typing a sequence of ^N and
@@ -3526,8 +3548,8 @@ static bool ins_compl_prep(int c)
if (!shortmess(SHM_COMPLETIONMENU)) { if (!shortmess(SHM_COMPLETIONMENU)) {
msg_clr_cmdline(); // necessary for "noshowmode" msg_clr_cmdline(); // necessary for "noshowmode"
} }
ctrl_x_mode = 0; ctrl_x_mode = CTRL_X_NORMAL;
compl_enter_selects = FALSE; compl_enter_selects = false;
if (edit_submode != NULL) { if (edit_submode != NULL) {
edit_submode = NULL; edit_submode = NULL;
showmode(); showmode();
@@ -3855,7 +3877,8 @@ static int ins_compl_get_exp(pos_T *ini)
/* For ^N/^P pick a new entry from e_cpt if compl_started is off, /* For ^N/^P pick a new entry from e_cpt if compl_started is off,
* or if found_all says this entry is done. For ^X^L only use the * or if found_all says this entry is done. For ^X^L only use the
* entries from 'complete' that look in loaded buffers. */ * entries from 'complete' that look in loaded buffers. */
if ((l_ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode)) if ((l_ctrl_x_mode == CTRL_X_NORMAL
|| CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
&& (!compl_started || found_all)) { && (!compl_started || found_all)) {
found_all = FALSE; found_all = FALSE;
while (*e_cpt == ',' || *e_cpt == ' ') while (*e_cpt == ',' || *e_cpt == ' ')
@@ -3865,7 +3888,7 @@ static int ins_compl_get_exp(pos_T *ini)
first_match_pos = *ini; first_match_pos = *ini;
// Move the cursor back one character so that ^N can match the // Move the cursor back one character so that ^N can match the
// word immediately after the cursor. // word immediately after the cursor.
if (ctrl_x_mode == 0 && dec(&first_match_pos) < 0) { if (ctrl_x_mode == CTRL_X_NORMAL && dec(&first_match_pos) < 0) {
// Move the cursor to after the last character in the // Move the cursor to after the last character in the
// buffer, so that word at start of buffer is found // buffer, so that word at start of buffer is found
// correctly. // correctly.
@@ -3983,8 +4006,8 @@ static int ins_compl_get_exp(pos_T *ini)
/* Find up to TAG_MANY matches. Avoids that an enormous number /* Find up to TAG_MANY matches. Avoids that an enormous number
* of matches is found when compl_pattern is empty */ * of matches is found when compl_pattern is empty */
if (find_tags(compl_pattern, &num_matches, &matches, if (find_tags(compl_pattern, &num_matches, &matches,
TAG_REGEXP | TAG_NAMES | TAG_NOIC | TAG_REGEXP | TAG_NAMES | TAG_NOIC | TAG_INS_COMP
TAG_INS_COMP | (l_ctrl_x_mode ? TAG_VERBOSE : 0), | (l_ctrl_x_mode != CTRL_X_NORMAL ? TAG_VERBOSE : 0),
TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0) { TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0) {
ins_compl_add_matches(num_matches, matches, p_ic); ins_compl_add_matches(num_matches, matches, p_ic);
} }
@@ -4159,9 +4182,10 @@ static int ins_compl_get_exp(pos_T *ini)
found_new_match = OK; found_new_match = OK;
} }
/* break the loop for specialized modes (use 'complete' just for the // break the loop for specialized modes (use 'complete' just for the
* generic l_ctrl_x_mode == 0) or when we've found a new match */ // generic l_ctrl_x_mode == CTRL_X_NORMAL) or when we've found a new match
if ((l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode)) if ((l_ctrl_x_mode != CTRL_X_NORMAL
&& !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
|| found_new_match != FAIL) { || found_new_match != FAIL) {
if (got_int) if (got_int)
break; break;
@@ -4169,7 +4193,8 @@ static int ins_compl_get_exp(pos_T *ini)
if (type != -1) if (type != -1)
ins_compl_check_keys(0, false); ins_compl_check_keys(0, false);
if ((l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode)) if ((l_ctrl_x_mode != CTRL_X_NORMAL
&& !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
|| compl_interrupted) { || compl_interrupted) {
break; break;
} }
@@ -4186,14 +4211,16 @@ static int ins_compl_get_exp(pos_T *ini)
} }
compl_started = TRUE; compl_started = TRUE;
if ((l_ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode)) if ((l_ctrl_x_mode == CTRL_X_NORMAL
|| CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
&& *e_cpt == NUL) { // Got to end of 'complete' && *e_cpt == NUL) { // Got to end of 'complete'
found_new_match = FAIL; found_new_match = FAIL;
} }
i = -1; /* total of matches, unknown */ i = -1; /* total of matches, unknown */
if (found_new_match == FAIL if (found_new_match == FAIL
|| (l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))) { || (l_ctrl_x_mode != CTRL_X_NORMAL
&& !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))) {
i = ins_compl_make_cyclic(); i = ins_compl_make_cyclic();
} }
@@ -4671,8 +4698,9 @@ static int ins_complete(int c, bool enable_pum)
/* /*
* it is a continued search * it is a continued search
*/ */
compl_cont_status &= ~CONT_INTRPT; /* remove INTRPT */ compl_cont_status &= ~CONT_INTRPT; // remove INTRPT
if (ctrl_x_mode == 0 || ctrl_x_mode == CTRL_X_PATH_PATTERNS if (ctrl_x_mode == CTRL_X_NORMAL
|| ctrl_x_mode == CTRL_X_PATH_PATTERNS
|| ctrl_x_mode == CTRL_X_PATH_DEFINES) { || ctrl_x_mode == CTRL_X_PATH_DEFINES) {
if (compl_startpos.lnum != curwin->w_cursor.lnum) { if (compl_startpos.lnum != curwin->w_cursor.lnum) {
/* line (probably) wrapped, set compl_startpos to the /* line (probably) wrapped, set compl_startpos to the
@@ -4716,16 +4744,18 @@ static int ins_complete(int c, bool enable_pum)
if (!(compl_cont_status & CONT_ADDING)) { /* normal expansion */ if (!(compl_cont_status & CONT_ADDING)) { /* normal expansion */
compl_cont_mode = ctrl_x_mode; compl_cont_mode = ctrl_x_mode;
if (ctrl_x_mode != 0) /* Remove LOCAL if ctrl_x_mode != 0 */ if (ctrl_x_mode != CTRL_X_NORMAL) {
// Remove LOCAL if ctrl_x_mode != CTRL_X_NORMAL
compl_cont_status = 0; compl_cont_status = 0;
}
compl_cont_status |= CONT_N_ADDS; compl_cont_status |= CONT_N_ADDS;
compl_startpos = curwin->w_cursor; compl_startpos = curwin->w_cursor;
startcol = (int)curs_col; startcol = (int)curs_col;
compl_col = 0; compl_col = 0;
} }
/* Work out completion pattern and original text -- webb */ // Work out completion pattern and original text -- webb
if (ctrl_x_mode == 0 || (ctrl_x_mode & CTRL_X_WANT_IDENT)) { if (ctrl_x_mode == CTRL_X_NORMAL || (ctrl_x_mode & CTRL_X_WANT_IDENT)) {
if ((compl_cont_status & CONT_SOL) if ((compl_cont_status & CONT_SOL)
|| ctrl_x_mode == CTRL_X_PATH_DEFINES) { || ctrl_x_mode == CTRL_X_PATH_DEFINES) {
if (!(compl_cont_status & CONT_ADDING)) { if (!(compl_cont_status & CONT_ADDING)) {
@@ -4880,7 +4910,7 @@ static int ins_complete(int c, bool enable_pum)
if (col == -2) if (col == -2)
return FAIL; return FAIL;
if (col == -3) { if (col == -3) {
ctrl_x_mode = 0; ctrl_x_mode = CTRL_X_NORMAL;
edit_submode = NULL; edit_submode = NULL;
if (!shortmess(SHM_COMPLETIONMENU)) { if (!shortmess(SHM_COMPLETIONMENU)) {
msg_clr_cmdline(); msg_clr_cmdline();
@@ -5011,13 +5041,14 @@ static int ins_complete(int c, bool enable_pum)
* because we couldn't expand anything at first place, but if we used * because we couldn't expand anything at first place, but if we used
* ^P, ^N, ^X^I or ^X^D we might want to add-expand a single-char-word * ^P, ^N, ^X^I or ^X^D we might want to add-expand a single-char-word
* (such as M in M'exico) if not tried already. -- Acevedo */ * (such as M in M'exico) if not tried already. -- Acevedo */
if ( compl_length > 1 if (compl_length > 1
|| (compl_cont_status & CONT_ADDING) || (compl_cont_status & CONT_ADDING)
|| (ctrl_x_mode != 0 || (ctrl_x_mode != CTRL_X_NORMAL
&& ctrl_x_mode != CTRL_X_PATH_PATTERNS && ctrl_x_mode != CTRL_X_PATH_PATTERNS
&& ctrl_x_mode != CTRL_X_PATH_DEFINES)) && ctrl_x_mode != CTRL_X_PATH_DEFINES)) {
compl_cont_status &= ~CONT_N_ADDS; compl_cont_status &= ~CONT_N_ADDS;
} }
}
if (compl_curr_match->cp_flags & CONT_S_IPOS) if (compl_curr_match->cp_flags & CONT_S_IPOS)
compl_cont_status |= CONT_S_IPOS; compl_cont_status |= CONT_S_IPOS;

2
src/nvim/getchar.c
View File

@@ -1770,7 +1770,7 @@ static int vgetorpeek(int advance)
&& !(State == HITRETURN && (c1 == CAR || c1 == ' ')) && !(State == HITRETURN && (c1 == CAR || c1 == ' '))
&& State != ASKMORE && State != ASKMORE
&& State != CONFIRM && State != CONFIRM
&& !((ctrl_x_mode != 0 && vim_is_ctrl_x_key(c1)) && !((ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c1))
|| ((compl_cont_status & CONT_LOCAL) || ((compl_cont_status & CONT_LOCAL)
&& (c1 == Ctrl_N || c1 == Ctrl_P))) && (c1 == Ctrl_N || c1 == Ctrl_P)))
) { ) {

9
src/nvim/globals.h
View File

@@ -700,11 +700,10 @@ EXTERN int arrow_used; /* Normally FALSE, set to TRUE after
* to call u_sync() */ * to call u_sync() */
EXTERN int ins_at_eol INIT(= FALSE); /* put cursor after eol when EXTERN int ins_at_eol INIT(= FALSE); /* put cursor after eol when
restarting edit after CTRL-O */ restarting edit after CTRL-O */
EXTERN char_u *edit_submode INIT(= NULL); /* msg for CTRL-X submode */ EXTERN char_u *edit_submode INIT(= NULL); // msg for CTRL-X submode
EXTERN char_u *edit_submode_pre INIT(= NULL); /* prepended to edit_submode */ EXTERN char_u *edit_submode_pre INIT(= NULL); // prepended to edit_submode
EXTERN char_u *edit_submode_extra INIT(= NULL); /* appended to edit_submode */ EXTERN char_u *edit_submode_extra INIT(= NULL); // appended to edit_submode
EXTERN hlf_T edit_submode_highl; /* highl. method for extra info */ EXTERN hlf_T edit_submode_highl; // highl. method for extra info
EXTERN int ctrl_x_mode INIT(= 0); /* Which Ctrl-X mode are we in? */
EXTERN int no_abbr INIT(= TRUE); /* TRUE when no abbreviations loaded */ EXTERN int no_abbr INIT(= TRUE); /* TRUE when no abbreviations loaded */

2
src/nvim/search.c
View File

@@ -352,7 +352,7 @@ int ignorecase_opt(char_u *pat, int ic_in, int scs)
{ {
int ic = ic_in; int ic = ic_in;
if (ic && !no_smartcase && scs if (ic && !no_smartcase && scs
&& !(ctrl_x_mode && curbuf->b_p_inf) && !(ctrl_x_mode_not_default() && curbuf->b_p_inf)
) { ) {
ic = !pat_has_uppercase(pat); ic = !pat_has_uppercase(pat);
} }