vim: src/edit.c comparison

comparison src/edit.c @ 13210:c1534eb682a6 v8.0.1479

patch 8.0.1479: insert mode completion state is confusing commit https://github.com/vim/vim/commit/bc0e9adae9c253f36803665180e4b576d1e725ab Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 9 12:13:34 2018 +0100 patch 8.0.1479: insert mode completion state is confusing Problem: Insert mode completion state is confusing. Solution: Move ctrl_x_mode into edit.c. Add CTRL_X_NORMAL for zero.

author	Christian Brabandt <cb@256bit.org>
date	Fri, 09 Feb 2018 12:15:05 +0100
parents	808625d4b71b
children	ed51483e9971

comparison

equal deleted inserted replaced

-:f3e7d314d8d8
+:c1534eb682a6
 #ifdef FEAT_INS_EXPAND
 /*
 * definitions used for CTRL-X submode
 */
-#define CTRL_X_WANT_IDENT	0x100
+# define CTRL_X_WANT_IDENT	0x100
-#define CTRL_X_NOT_DEFINED_YET	1
+# define CTRL_X_NORMAL		0  /* CTRL-N CTRL-P completion, default */
-#define CTRL_X_SCROLL		2
+# define CTRL_X_NOT_DEFINED_YET	1
-#define CTRL_X_WHOLE_LINE	3
+# define CTRL_X_SCROLL		2
-#define CTRL_X_FILES		4
+# define CTRL_X_WHOLE_LINE	3
-#define CTRL_X_TAGS		(5 + CTRL_X_WANT_IDENT)
+# define CTRL_X_FILES		4
-#define CTRL_X_PATH_PATTERNS	(6 + CTRL_X_WANT_IDENT)
+# define CTRL_X_TAGS		(5 + CTRL_X_WANT_IDENT)
-#define CTRL_X_PATH_DEFINES	(7 + CTRL_X_WANT_IDENT)
+# define CTRL_X_PATH_PATTERNS	(6 + CTRL_X_WANT_IDENT)
-#define CTRL_X_FINISHED		8
+# define CTRL_X_PATH_DEFINES	(7 + CTRL_X_WANT_IDENT)
-#define CTRL_X_DICTIONARY	(9 + CTRL_X_WANT_IDENT)
+# define CTRL_X_FINISHED		8
-#define CTRL_X_THESAURUS	(10 + CTRL_X_WANT_IDENT)
+# define CTRL_X_DICTIONARY	(9 + CTRL_X_WANT_IDENT)
-#define CTRL_X_CMDLINE		11
+# define CTRL_X_THESAURUS	(10 + CTRL_X_WANT_IDENT)
-#define CTRL_X_FUNCTION		12
+# define CTRL_X_CMDLINE		11
-#define CTRL_X_OMNI		13
+# define CTRL_X_FUNCTION		12
-#define CTRL_X_SPELL		14
+# define CTRL_X_OMNI		13
-#define CTRL_X_LOCAL_MSG	15	/* only used in "ctrl_x_msgs" */
+# define CTRL_X_SPELL		14
-#define CTRL_X_EVAL		16	/* for builtin function complete() */
+# define CTRL_X_LOCAL_MSG	15	/* only used in "ctrl_x_msgs" */
+# 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_MODE_LINE_OR_EVAL(m) (m == CTRL_X_WHOLE_LINE || m == CTRL_X_EVAL)
+# 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)
+/* Message for CTRL-X mode, index is ctrl_x_mode. */
 static char *ctrl_x_msgs[] =
 {
-N_(" Keyword completion (^N^P)"), /* ctrl_x_mode == 0, ^P/^N compl. */
+N_(" Keyword completion (^N^P)"), /* CTRL_X_NORMAL, ^P/^N compl. */
 N_(" ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"),
-NULL,
+NULL, /* CTRL_X_SCROLL: depends on state */
 N_(" Whole line completion (^L^N^P)"),
 N_(" File name completion (^F^N^P)"),
 N_(" Tag completion (^]^N^P)"),
 N_(" Path pattern completion (^N^P)"),
 N_(" Definition completion (^D^N^P)"),
-NULL,
+NULL, /* CTRL_X_FINISHED */
 N_(" Dictionary completion (^K^N^P)"),
 N_(" Thesaurus completion (^T^N^P)"),
 N_(" Command-line completion (^V^N^P)"),
 N_(" User defined completion (^U^N^P)"),
 N_(" Omni completion (^O^N^P)"),
 N_(" Keyword Local completion (^N^P)"),
 NULL,   /* CTRL_X_EVAL doesn't use msg. */
 };
 static char e_hitend[] = N_("Hit end of paragraph");
-#ifdef FEAT_COMPL_FUNC
+# ifdef FEAT_COMPL_FUNC
 static char e_complwin[] = N_("E839: Completion function changed window");
 static char e_compldel[] = N_("E840: Completion function deleted text");
-#endif
+# endif
 /*
 * Structure used to store one match for insert completion.
 */
 typedef struct compl_S compl_T;
 				 * cp_flags has FREE_FNAME */
 int		cp_flags;	/* ORIGINAL_TEXT, CONT_S_IPOS or FREE_FNAME */
 int		cp_number;	/* sequence number */
 };
-#define ORIGINAL_TEXT	(1)   /* the original text when the expansion begun */
+# define ORIGINAL_TEXT	(1)   /* the original text when the expansion begun */
-#define FREE_FNAME	(2)
+# define FREE_FNAME	(2)
 /*
 * All the current matches are stored in a list.
 * "compl_first_match" points to the start of the list.
 * "compl_curr_match" points to the currently selected entry.
 static int	  compl_restarting = FALSE;	/* don't insert match */
 /* When the first completion is done "compl_started" is set.  When it's
 * FALSE the word to be completed must be located. */
 static int	  compl_started = FALSE;
+/* Which Ctrl-X mode are we in? */
+static int	  ctrl_x_mode = CTRL_X_NORMAL;
 /* Set when doing something for completion that may call edit() recursively,
 * which is not allowed. */
 static int	  compl_busy = FALSE;
 static void ins_compl_set_original_text(char_u *str);
 static void ins_compl_addfrommatch(void);
 static int  ins_compl_prep(int c);
 static void ins_compl_fixRedoBufForLeader(char_u *ptr_arg);
 static buf_T *ins_compl_next_buf(buf_T *buf, int flag);
-#if defined(FEAT_COMPL_FUNC) || defined(FEAT_EVAL)
+# if defined(FEAT_COMPL_FUNC) || defined(FEAT_EVAL)
 static void ins_compl_add_list(list_T *list);
 static void ins_compl_add_dict(dict_T *dict);
-#endif
+# endif
 static int  ins_compl_get_exp(pos_T *ini);
 static void ins_compl_delete(void);
 static void ins_compl_insert(int in_compl_func);
 static int  ins_compl_next(int allow_get_expansion, int count, int insert_match, int in_compl_func);
 static int  ins_compl_key2dir(int c);
 	showmode();
 }
 }
 /*
+* Whether other than default completion has been selected.
+*/
+int
+ctrl_x_mode_not_default(void)
+{
+return ctrl_x_mode != CTRL_X_NORMAL;
+}
+/*
+* Whether CTRL-X was typed without a following character.
+*/
+int
+ctrl_x_mode_not_defined_yet(void)
+{
+return ctrl_x_mode == CTRL_X_NOT_DEFINED_YET;
+}
+/*
 * Return TRUE if the 'dict' or 'tsr' option can be used.
 */
 static int
 has_compl_option(int dict_opt)
 {
 							&& !curwin->w_p_spell
 # endif
 							)
 		 : (*curbuf->b_p_tsr == NUL && *p_tsr == NUL))
 {
-	ctrl_x_mode = 0;
+	ctrl_x_mode = CTRL_X_NORMAL;
 	edit_submode = NULL;
 	msg_attr(dict_opt ? (char_u *)_("'dictionary' option is empty")
 			  : (char_u *)_("'thesaurus' option is empty"),
 							      HL_ATTR(HLF_E));
 	if (emsg_silent == 0)
 {
 int save_w_wrow = curwin->w_wrow;
 int save_w_leftcol = curwin->w_leftcol;
 /* If already doing completions stop it. */
-if (ctrl_x_mode != 0)
+if (ctrl_x_mode != CTRL_X_NORMAL)
 	ins_compl_prep(' ');
 ins_compl_clear();
 ins_compl_free();
 compl_direction = FORWARD;
 	    || c == K_MOUSELEFT || c == K_MOUSERIGHT)
 	return retval;
 /* Set "compl_get_longest" when finding the first matches. */
 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_used_match = TRUE;
 }
 		    if (compl_cont_mode != 0)
 			compl_cont_status = 0;
 		    else
 			compl_cont_mode = CTRL_X_NOT_DEFINED_YET;
 		}
-		ctrl_x_mode = 0;
+		ctrl_x_mode = CTRL_X_NORMAL;
 		edit_submode = NULL;
 		showmode();
 		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? */
 	if (!vim_is_ctrl_x_key(c))
 	{
 	    if (ctrl_x_mode == CTRL_X_SCROLL)
-		ctrl_x_mode = 0;
+		ctrl_x_mode = CTRL_X_NORMAL;
 	    else
 		ctrl_x_mode = CTRL_X_FINISHED;
 	    edit_submode = NULL;
 	}
 	showmode();
 {
 	/* Show error message from attempted keyword completion (probably
 	 * 'Pattern not found') until another key is hit, then go back to
 	 * showing what mode we are in. */
 	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
-						     && !ins_compl_pum_key(c))
+				       && c != Ctrl_R && !ins_compl_pum_key(c))
 		|| ctrl_x_mode == CTRL_X_FINISHED)
 	{
 	    /* Get here when we have finished typing a sequence of ^N and
 	     * ^P or other completion characters in CTRL-X mode.  Free up
 	     * memory that was used, and make sure we can redo the insert. */
 	    ins_compl_free();
 	    compl_started = FALSE;
 	    compl_matches = 0;
 	    if (!shortmess(SHM_COMPLETIONMENU))
 		msg_clr_cmdline();	/* necessary for "noshowmode" */
-	    ctrl_x_mode = 0;
+	    ctrl_x_mode = CTRL_X_NORMAL;
 	    compl_enter_selects = FALSE;
 	    if (edit_submode != NULL)
 	    {
 		edit_submode = NULL;
 		showmode();
 	set_match_pos = FALSE;
 	/* 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
 	 * entries from 'complete' that look in loaded buffers. */
-	if ((ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
+	if ((ctrl_x_mode == CTRL_X_NORMAL
+		    || CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
 					&& (!compl_started || found_all))
 	{
 	    found_all = FALSE;
 	    while (*e_cpt == ',' || *e_cpt == ' ')
 		e_cpt++;
 	    {
 		ins_buf = curbuf;
 		first_match_pos = *ini;
 		/* Move the cursor back one character so that ^N can match the
 		 * 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
 		     * buffer, so that word at start of buffer is found
 		     * correctly. */
 		    first_match_pos.lnum = ins_buf->b_ml.ml_line_count;
 	    p_ic = ignorecase(compl_pattern);
 	    /* Find up to TAG_MANY matches.  Avoids that an enormous number
 	     * of matches is found when compl_pattern is empty */
 	    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 | (ctrl_x_mode ? TAG_VERBOSE : 0),
+		    | (ctrl_x_mode != CTRL_X_NORMAL ? TAG_VERBOSE : 0),
 		    TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0)
 	    {
 		ins_compl_add_matches(num_matches, matches, p_ic);
 	    }
 	    p_ic = save_p_ic;
 	 * expansion added something) */
 	if (type != 0 && compl_curr_match != compl_old_match)
 	    found_new_match = OK;
 	/* break the loop for specialized modes (use 'complete' just for the
-	 * generic ctrl_x_mode == 0) or when we've found a new match */
+	 * generic ctrl_x_mode == CTRL_X_NORMAL) or when we've found a new
-	if ((ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
+	 * match */
+	if ((ctrl_x_mode != CTRL_X_NORMAL
+		    && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
 						   || found_new_match != FAIL)
 	{
 	    if (got_int)
 		break;
 	    /* Fill the popup menu as soon as possible. */
 	    if (type != -1)
 		ins_compl_check_keys(0, FALSE);
-	    if ((ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
+	    if ((ctrl_x_mode != CTRL_X_NORMAL
+			&& !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
 							 || compl_interrupted)
 		break;
 	    compl_started = TRUE;
 	}
 	else
 	    compl_started = FALSE;
 	}
 }
 compl_started = TRUE;
-if ((ctrl_x_mode == 0 || CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
+if ((ctrl_x_mode == CTRL_X_NORMAL || CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode))
 	    && *e_cpt == NUL)		/* Got to end of 'complete' */
 	found_new_match = FAIL;
 i = -1;		/* total of matches, unknown */
-if (found_new_match == FAIL
+if (found_new_match == FAIL || (ctrl_x_mode != CTRL_X_NORMAL
-	    || (ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode)))
+				    && !CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode)))
 	i = ins_compl_make_cyclic();
 if (compl_old_match != NULL)
 {
 	/* If several matches were added (FORWARD) or the search failed and has
 	{
 	    /*
 	     * it is a continued search
 	     */
 	    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_DEFINES)
+		    || ctrl_x_mode == CTRL_X_PATH_PATTERNS
+		    || ctrl_x_mode == CTRL_X_PATH_DEFINES)
 	    {
 		if (compl_startpos.lnum != curwin->w_cursor.lnum)
 		{
 		    /* line (probably) wrapped, set compl_startpos to the
 		     * first non_blank in the line, if it is not a wordchar
 	    compl_cont_status &= CONT_LOCAL;
 	if (!(compl_cont_status & CONT_ADDING))	/* normal expansion */
 	{
 	    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 |= CONT_N_ADDS;
 	    compl_startpos = curwin->w_cursor;
 	    startcol = (int)curs_col;
 	    compl_col = 0;
 	}
 	/* 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)
 		    || ctrl_x_mode == CTRL_X_PATH_DEFINES)
 	    {
 		if (!(compl_cont_status & CONT_ADDING))
 	     * Return value -3 does the same as -2 and leaves CTRL-X mode.*/
 	    if (col == -2)
 		return FAIL;
 	    if (col == -3)
 	    {
-		ctrl_x_mode = 0;
+		ctrl_x_mode = CTRL_X_NORMAL;
 		edit_submode = NULL;
 		if (!shortmess(SHM_COMPLETIONMENU))
 		    msg_clr_cmdline();
 		return FAIL;
 	    }
 	 * 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
 	 * (such as M in M'exico) if not tried already.  -- Acevedo */
 	if (	   compl_length > 1
 		|| (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_DEFINES))
 	    compl_cont_status &= ~CONT_N_ADDS;
 }

Mercurial > vim

comparison src/edit.c @ 13210:c1534eb682a6 v8.0.1479