vim: src/edit.c comparison

comparison src/edit.c @ 665:21ab9abf0f08

updated for version 7.0196

author	vimboss
date	Fri, 10 Feb 2006 23:20:28 +0000
parents	e93a99ef31d0
children	9090f866cd57

comparison

equal deleted inserted replaced

-:ce5a759cc907
+:21ab9abf0f08
 /* When "compl_leader" is not NULL only matches that start with this string
 * are used. */
 static char_u	  *compl_leader = NULL;
+static int	  compl_get_longest = FALSE;	/* put longest common string
+						   in compl_leader */
 static int	  compl_used_match;	/* Selected one of the matches.  When
 					   FALSE the match was edited or using
 					   the longest common string. */
 /* When the first completion is done "compl_started" is set.  When it's
 static int	  compl_cont_mode = 0;
 static expand_T	  compl_xp;
 static void ins_ctrl_x __ARGS((void));
 static int  has_compl_option __ARGS((int dict_opt));
+static void ins_compl_longest_match __ARGS((compl_T *match));
 static void ins_compl_add_matches __ARGS((int num_matches, char_u **matches));
 static int  ins_compl_make_cyclic __ARGS((void));
 static void ins_compl_upd_pum __ARGS((void));
 static void ins_compl_del_pum __ARGS((void));
 static int  pum_wanted __ARGS((void));
 static int  ins_compl_prep __ARGS((int c));
 static buf_T *ins_compl_next_buf __ARGS((buf_T *buf, int flag));
 static int  ins_compl_get_exp __ARGS((pos_T *ini));
 static void ins_compl_delete __ARGS((void));
 static void ins_compl_insert __ARGS((void));
-static int  ins_compl_next __ARGS((int allow_get_expansion, int count));
+static int  ins_compl_next __ARGS((int allow_get_expansion, int count, int insert_match));
 static int  ins_compl_key2dir __ARGS((int c));
 static int  ins_compl_pum_key __ARGS((int c));
 static int  ins_compl_key2count __ARGS((int c));
 static int  ins_complete __ARGS((int c));
 static int  quote_meta __ARGS((char_u *dest, char_u *str, int len));
 	if (p_fkmap && KeyTyped)
 	    c = fkmap(c);		/* Farsi mode mapping */
 #endif
 #ifdef FEAT_INS_EXPAND
-	/* When the popup menu is visible cursor keys change the selection. */
-	if (c == K_UP && pum_visible())
-	    c = Ctrl_P;
-	if (c == K_DOWN && pum_visible())
-	    c = Ctrl_N;
 	/*
 	 * Special handling of keys while the popup menu is visible or wanted
 	 * and the cursor is still in the completed word.
 	 */
 	if (compl_started && pum_wanted() && curwin->w_cursor.col >= compl_col)
 		if (vim_isprintc(c))
 		{
 		    ins_compl_addleader(c);
 		    continue;
 		}
+		/* Pressing Enter selects the current match. */
+		if (c == CAR || c == K_KENTER || c == NL)
+		{
+		    ins_compl_delete();
+		    ins_compl_insert();
+		}
 	    }
 	}
 	/* Prepare for or stop CTRL-X mode.  This doesn't do completion, but
 	 * it does fix up the text when finishing completion. */
+	compl_get_longest = FALSE;
 	if (c != K_IGNORE && ins_compl_prep(c))
 	    continue;
 #endif
 	/* CTRL-\ CTRL-N goes to Normal mode,
 	case K_C_RIGHT:
 	    ins_s_right();
 	    break;
 	case K_UP:	/* <Up> */
+#ifdef FEAT_INS_EXPAND
+	    if (pum_visible())
+		goto docomplete;
+#endif
 	    if (mod_mask & MOD_MASK_SHIFT)
 		ins_pageup();
 	    else
 		ins_up(FALSE);
 	    break;
 #endif
 	    ins_pageup();
 	    break;
 	case K_DOWN:	/* <Down> */
+#ifdef FEAT_INS_EXPAND
+	    if (pum_visible())
+		goto docomplete;
+#endif
 	    if (mod_mask & MOD_MASK_SHIFT)
 		ins_pagedown();
 	    else
 		ins_down(FALSE);
 	    break;
 if (ctrl_x_mode != CTRL_X_CMDLINE)
 {
 	/* if the next ^X<> won't ADD nothing, then reset
 	 * compl_cont_status */
 	if (compl_cont_status & CONT_N_ADDS)
-	    compl_cont_status = (compl_cont_status | CONT_INTRPT);
+	    compl_cont_status |= CONT_INTRPT;
 	else
 	    compl_cont_status = 0;
 	/* We're not sure which CTRL-X mode it will be yet */
 	ctrl_x_mode = CTRL_X_NOT_DEFINED_YET;
 	edit_submode = (char_u *)_(CTRL_X_MSG(ctrl_x_mode));
 	match->cp_prev->cp_next = match;
 else	/* if there's nothing before, it is the first match */
 	compl_first_match = match;
 compl_curr_match = match;
+/*
+* Find the longest common string if still doing that.
+*/
+if (compl_get_longest && (flags & ORIGINAL_TEXT) == 0)
+	ins_compl_longest_match(match);
 return OK;
+}
+/*
+* Reduce the longest common string for match "match".
+*/
+static void
+ins_compl_longest_match(match)
+compl_T	*match;
+{
+char_u	*p, *s;
+int		l;
+int		had_match;
+if (compl_leader == NULL)
+	/* First match, use it as a whole. */
+	compl_leader = vim_strsave(match->cp_str);
+else
+{
+	/* Reduce the text if this match differs from compl_leader. */
+	for (p = compl_leader, s = match->cp_str; *p != NUL; p += l, s += l)
+	{
+#ifdef FEAT_MBYTE
+	    if (has_mbyte)
+	    {
+		l = mb_ptr2len(p);
+		if (STRNCMP(p, s, l) != 0)
+			break;
+	    }
+	    else
+#endif
+	    {
+		if (*p != *s)
+		    break;
+		l = 1;
+	    }
+	}
+	if (*p != NUL)
+	{
+	    /* Leader was shortened, need to change the inserted text. */
+	    *p = NUL;
+	    had_match = (curwin->w_cursor.col > compl_col);
+	    ins_compl_delete();
+	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+	    ins_redraw(FALSE);
+	    /* When the match isn't there (to avoid matching itself) remove it
+	     * again after redrawing. */
+	    if (!had_match)
+		ins_compl_delete();
+	}
+	compl_used_match = FALSE;
+}
 }
 /*
 * Add an array of matches to the list of matches.
 * Frees matches[].
 */
 static int
 pum_wanted()
 {
 /* 'completeopt' must contain "menu" */
-if (*p_cot == NUL)
+if (vim_strchr(p_cot, 'm') == NULL)
 	return FALSE;
 /* The display looks bad on a B&W display. */
 if (t_colors < 8
 #ifdef FEAT_GUI
 	edit_submode_extra = NULL;
 /* Ignore end of Select mode mapping */
 if (c == K_SELECT)
 	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))
+{
+	compl_get_longest = (vim_strchr(p_cot, 'l') != NULL);
+	compl_used_match = TRUE;
+}
 if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET)
 {
 	/*
 	 * We have just typed CTRL-X and aren't quite sure which CTRL-X mode
 		    compl_started = TRUE;
 		    first_match_pos = *pos;
 		    last_match_pos = *pos;
 		}
 		else if (first_match_pos.lnum == last_match_pos.lnum
-			 && first_match_pos.col == last_match_pos.col)
+				 && first_match_pos.col == last_match_pos.col)
 		    found_new_match = FAIL;
 		if (found_new_match == FAIL)
 		{
 		    if (ins_buf == curbuf)
 			found_all = TRUE;
 	if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE)
 						   || found_new_match != FAIL)
 	{
 	    if (got_int)
 		break;
+	    /* Fill the popup menu as soon as possible. */
 	    if (pum_wanted() && type != -1)
-		/* Fill the popup menu as soon as possible. */
 		ins_compl_check_keys(0);
 	    if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE)
 							 || compl_interrupted)
 		break;
 	    compl_started = TRUE;
 	}
 * Note that this function may be called recursively once only.  First with
 * "allow_get_expansion" TRUE, which calls ins_compl_get_exp(), which in turn
 * calls this function with "allow_get_expansion" FALSE.
 */
 static int
-ins_compl_next(allow_get_expansion, count)
+ins_compl_next(allow_get_expansion, count, insert_match)
 int	    allow_get_expansion;
 int	    count;		/* repeat completion this many times; should
 				   be at least 1 */
+int	    insert_match;	/* Insert the newly selected match */
 {
 int	    num_matches = -1;
 int	    i;
 int	    todo = count;
 compl_T *found_compl = NULL;
 int	    found_end = FALSE;
-if (allow_get_expansion)
+if (compl_leader != NULL
-{
+			&& (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
+{
+	/* Set "compl_shown_match" to the actually shown match, it may differ
+	 * when "compl_leader" is used to omit some of the matches. */
+	while (STRNCMP(compl_shown_match->cp_str,
+				     compl_leader, STRLEN(compl_leader)) != 0
+		&& compl_shown_match->cp_next != NULL
+		&& compl_shown_match->cp_next != compl_first_match)
+	    compl_shown_match = compl_shown_match->cp_next;
+}
+if (allow_get_expansion && insert_match
+				  && (!compl_get_longest || compl_used_match))
 	/* Delete old text to be replaced */
 	ins_compl_delete();
-}
 compl_pending = FALSE;
 /* Repeat this for when <PageUp> or <PageDown> is typed.  But don't wrap
 * around. */
 while (--todo >= 0)
 	    }
 	    todo = 1;	    /* use first usable match after wrapping around */
 	}
 }
-/* Insert the text of the new completion */
+/* Insert the text of the new completion, or the compl_leader. */
-ins_compl_insert();
+if (insert_match)
+{
+	if (!compl_get_longest || compl_used_match)
+	    ins_compl_insert();
+	else
+	    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+}
+else
+	compl_used_match = FALSE;
 if (!allow_get_expansion)
 {
 	/* may undisplay the popup menu first */
 	ins_compl_upd_pum();
+	/* redraw to show the user what was inserted */
+	update_screen(0);
 	/* display the updated popup menu */
 	ins_compl_show_pum();
 	/* Delete old text to be replaced, since we're still searching and
 {
 	if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R)
 	{
 	    c = safe_vgetc();	/* Eat the character */
 	    compl_shows_dir = ins_compl_key2dir(c);
-	    (void)ins_compl_next(FALSE, ins_compl_key2count(c));
+	    (void)ins_compl_next(FALSE, ins_compl_key2count(c),
+						    c != K_UP && c != K_DOWN);
 	}
 	else if (c != Ctrl_R)
 	    compl_interrupted = TRUE;
 }
 if (compl_pending && !got_int)
-	(void)ins_compl_next(FALSE, 1);
+	(void)ins_compl_next(FALSE, 1, TRUE);
 }
 /*
 * Decide the direction of Insert mode complete from the key typed.
 * Returns BACKWARD or FORWARD.
 */
 static int
 ins_compl_key2dir(c)
 int		c;
 {
-if (c == Ctrl_P || c == Ctrl_L || (pum_visible()
+if (c == Ctrl_P || c == Ctrl_L
-			 && (c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP)))
+	    || (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP
+						|| c == K_S_UP || c == K_UP)))
 	return BACKWARD;
 return FORWARD;
 }
 /*
 static int
 ins_compl_pum_key(c)
 int		c;
 {
 return pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP
-		     || c == K_PAGEDOWN || c == K_KPAGEDOWN || c == K_S_DOWN);
+		     || c == K_PAGEDOWN || c == K_KPAGEDOWN || c == K_S_DOWN
+		     || c == K_UP || c == K_DOWN);
 }
 /*
 * Decide the number of completions to move forward.
 * Returns 1 for most keys, height of the popup menu for page-up/down keys.
 ins_compl_key2count(c)
 int		c;
 {
 int		h;
-if (ins_compl_pum_key(c))
+if (ins_compl_pum_key(c) && c != K_UP && c != K_DOWN)
 {
 	h = pum_get_height();
 	if (h > 3)
 	    h -= 2; /* keep some context */
 	return h;
 	 * "compl_startpos"
 	 * is not in the same line as the cursor then fix it (the line has
 	 * been split because it was longer than 'tw').  if SOL is set then
 	 * skip the previous pattern, a word at the beginning of the line has
 	 * been inserted, we'll look for that  -- Acevedo. */
-	if ((compl_cont_status & CONT_INTRPT) && compl_cont_mode == ctrl_x_mode)
+	if ((compl_cont_status & CONT_INTRPT) == CONT_INTRPT
+					    && compl_cont_mode == ctrl_x_mode)
 	{
 	    /*
 	     * it is a continued search
 	     */
 	    compl_cont_status &= ~CONT_INTRPT;	/* remove INTRPT */
 compl_shown_match = compl_curr_match;
 compl_shows_dir = compl_direction;
 /*
-* Find next match.
+* Find next match (and following matches).
 */
-n = ins_compl_next(TRUE, ins_compl_key2count(c));
+n = ins_compl_next(TRUE, ins_compl_key2count(c),
+						c != K_UP && c != K_DOWN);
 /* may undisplay the popup menu */
 ins_compl_upd_pum();
 if (n > 1)		/* all matches have been found */

Mercurial > vim

comparison src/edit.c @ 665:21ab9abf0f08