Mercurial > vim

comparison src/optionstr.c @ 33585:e628d7f03758 v9.0.2037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.2037: A few remaining cmdline completion issues with C-E/Y Commit: https://github.com/vim/vim/commit/209ec90b9b9bd948d76511c9cd2b17f47a97afe6 Author: Yee Cheng Chin <ychin.git@gmail.com> Date: Tue Oct 17 10:56:25 2023 +0200 patch 9.0.2037: A few remaining cmdline completion issues with C-E/Y Problem: A few remaining cmdline completion issues with C-E/Y Solution: Fix cmdline completion fuzzy/Ctrl-E/Ctrl-Y/options when not used at the end Fix cmdline completion fuzzy/Ctrl-E/Ctrl-Y/options when not used at the end A few places in the cmdline completion code only works properly when the user hits Tab (or 'wildchar') at the end of the cmdline, even though it's supposed to work even in the middle of the line. For fuzzy search, `:e ++ff`, and `:set hl=`, fix completion code to make sure to use `xp_pattern_len` instead of assuming the entire `xp_pattern` is the search pattern (since it contains texts after the cursor). Fix Ctrl-E / Ctrl-Y to not jump to the end when canceling/accepting a wildmenu completion. Also, make them work even when not using `set wildoptions+=pum` as there is no drawback to doing so. (Related issue where this was brought up: #13331) closes: #13362 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author Christian Brabandt <cb@256bit.org>
date Tue, 17 Oct 2023 11:00:03 +0200
parents 46d449fd4fe4
children 6e4c686b6b5b
comparison
equal deleted inserted replaced
33584:6c388719d7fe 33585:e628d7f03758
2580 2580
2581 *matches = ALLOC_MULT(char_u *, num_hl_modes); 2581 *matches = ALLOC_MULT(char_u *, num_hl_modes);
2582 if (*matches == NULL) 2582 if (*matches == NULL)
2583 return FAIL; 2583 return FAIL;
2584 2584
2585 size_t pattern_len = STRLEN(xp->xp_pattern); 2585 int pattern_len = xp->xp_pattern_len;
2586 2586
2587 for (i = 0; i < num_hl_modes; i++) 2587 for (i = 0; i < num_hl_modes; i++)
2588 { 2588 {
2589 // Don't allow duplicates as these are unique flags 2589 // Don't allow duplicates as these are unique flags
2590 if (vim_strchr(xp->xp_pattern + 1, p_hl_mode_values[i]) != NULL) 2590 char_u *dup = vim_strchr(xp->xp_pattern + 1, p_hl_mode_values[i]);
2591 if (dup != NULL && (int)(dup - xp->xp_pattern) < pattern_len)
2591 continue; 2592 continue;
2592 2593
2593 // ':' only works by itself, not with other flags. 2594 // ':' only works by itself, not with other flags.
2594 if (pattern_len > 1 && p_hl_mode_values[i] == ':') 2595 if (pattern_len > 1 && p_hl_mode_values[i] == ':')
2595 continue; 2596 continue;