From 28f61994748e1edd5fb1755ddf2e5ca1324b5635 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 13 Mar 2025 07:08:25 +0800 Subject: vim-patch:9.1.1197: process_next_cpt_value() uses wrong condition Problem: process_next_cpt_value() uses wrong condition Solution: use cfc_has_mode() instead and remove redundant else if branch (glepnir) closes: vim/vim#16833 https://github.com/vim/vim/commit/53b14578e03f93a53fd6eb21c00caf96484742ed Co-authored-by: glepnir --- runtime/doc/options.txt | 25 +++++++++++++++++-------- runtime/lua/vim/_meta/options.lua | 25 +++++++++++++++++-------- 2 files changed, 34 insertions(+), 16 deletions(-) (limited to 'runtime') diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index a6078849fc..ea9fe7e71a 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1520,14 +1520,23 @@ A jump table for the options with a short description can be found at |Q_op|. *'completefuzzycollect'* *'cfc'* 'completefuzzycollect' 'cfc' string (default "") global - This option enables fuzzy collection for (only some) specific - |ins-completion| modes, adjusting how items are gathered for fuzzy - matching based on input. - The option can contain the following values (separated by commas), - each enabling fuzzy collection for a specific completion mode: - files file names - keyword keyword completion in 'complete' and current file - whole_line whole lines + A comma-separated list of option enables fuzzy collection for specific + |ins-completion| modes, affecting how items are gathered during + completion. When set, fuzzy matching is used to find completion + candidates instead of the standard prefix-based matching. This option + can contain the following values are: + + keyword keywords in the current file |i_CTRL-X_CTRL-N| + keywords with the ".", "w", "b", "u", "U" and + "k{dict}" flags in 'complete'. |i_CTRL-N| |i_CTRL-P| + + files file names |i_CTRL-X_CTRL-F| + + whole_line whole lines |i_CTRL-X_CTRL-L| + + When used with 'completeopt' "longest" option, fuzzy collection can + identify the longest common string among the best fuzzy matches and + automatically insert it. *'completeitemalign'* *'cia'* 'completeitemalign' 'cia' string (default "abbr,kind,menu") diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index e473558207..e1e793b533 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -1044,14 +1044,23 @@ vim.o.cfu = vim.o.completefunc vim.bo.completefunc = vim.o.completefunc vim.bo.cfu = vim.bo.completefunc ---- This option enables fuzzy collection for (only some) specific ---- `ins-completion` modes, adjusting how items are gathered for fuzzy ---- matching based on input. ---- The option can contain the following values (separated by commas), ---- each enabling fuzzy collection for a specific completion mode: ---- files file names ---- keyword keyword completion in 'complete' and current file ---- whole_line whole lines +--- A comma-separated list of option enables fuzzy collection for specific +--- `ins-completion` modes, affecting how items are gathered during +--- completion. When set, fuzzy matching is used to find completion +--- candidates instead of the standard prefix-based matching. This option +--- can contain the following values are: +--- +--- keyword keywords in the current file `i_CTRL-X_CTRL-N` +--- keywords with the ".", "w", "b", "u", "U" and +--- "k{dict}" flags in 'complete'. `i_CTRL-N` `i_CTRL-P` +--- +--- files file names `i_CTRL-X_CTRL-F` +--- +--- whole_line whole lines `i_CTRL-X_CTRL-L` +--- +--- When used with 'completeopt' "longest" option, fuzzy collection can +--- identify the longest common string among the best fuzzy matches and +--- automatically insert it. --- --- @type string vim.o.completefuzzycollect = "" -- cgit