Mercurial > vim
view src/os_dos.h @ 34416:0a458b49e1e6 v9.1.0131
patch 9.1.0131: buffer-completion may not always find all matches
Commit: https://github.com/vim/vim/commit/0dc0bff000fd804c6b0778ccc4554a4e4c82c8c9
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Feb 24 14:12:13 2024 +0100
patch 9.1.0131: buffer-completion may not always find all matches
Problem: buffer-completion code too complicated and does not always
find all matches (irisjae)
Solution: do not try to anchor pattern to beginning of line or
directory-separator, always return all matches
Note: we are considering the non-fuzzy buffer-matching here.
Currently, the buffer-completion code makes 2 attempts to match a
pattern against the list of available patterns. First try is to match
the pattern and anchor it to either the beginning of the file name or
at a directory-separator (// or \\).
When a match is found, Vim returns the matching buffers and does not try
to find a match anywhere within a buffer name. So if you have opened two
buffers like /tmp/Foobar.c and /tmp/MyFoobar.c using `:b Foo` will only
complete to the first filename, but not the second (the same happens
with `getcompletion('Foo', 'buffer')`).
It may make sense, that completion priorities buffer names at directory
boundaries, but it inconsistent, may cause confusion why a certain
buffer name is not completed when typing `:b Foo<C-D>` which returns
only a single file name and then pressing Enter (to switch to that
buffer), Vim will error with 'E93: More than one match for Foo').
Similar things may happen when wiping the /tmp/Foobar.c pattern and
afterwards the completion starts completing other buffers.
So let's simplify the code and always match the pattern anywhere in the
buffer name, do not try to favor matches at directory boundaries. This
is also simplifies the code a bit, we do not need to run over the list
of buffers several times, but only twice.
fixes #13894
closes: #14082
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 24 Feb 2024 14:30:03 +0100 |
parents | 695b50472e85 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ /* * Common MS-DOS and Win32 (Windows NT and Windows 95) defines. * * Names for the EXRC, HELP and temporary files. * Some of these may have been defined in the makefile or feature.h. */ #ifndef SYS_VIMRC_FILE # define SYS_VIMRC_FILE "$VIM\\vimrc" #endif #ifndef USR_VIMRC_FILE # define USR_VIMRC_FILE "$HOME\\_vimrc" #endif #ifndef USR_VIMRC_FILE2 # define USR_VIMRC_FILE2 "$HOME\\vimfiles\\vimrc" #endif #ifndef USR_VIMRC_FILE3 # define USR_VIMRC_FILE3 "$VIM\\_vimrc" #endif #ifndef VIM_DEFAULTS_FILE # define VIM_DEFAULTS_FILE "$VIMRUNTIME\\defaults.vim" #endif #ifndef EVIM_FILE # define EVIM_FILE "$VIMRUNTIME\\evim.vim" #endif #ifndef USR_EXRC_FILE # define USR_EXRC_FILE "$HOME\\_exrc" #endif #ifndef USR_EXRC_FILE2 # define USR_EXRC_FILE2 "$VIM\\_exrc" #endif #ifdef FEAT_GUI # ifndef SYS_GVIMRC_FILE # define SYS_GVIMRC_FILE "$VIM\\gvimrc" # endif # ifndef USR_GVIMRC_FILE # define USR_GVIMRC_FILE "$HOME\\_gvimrc" # endif # ifndef USR_GVIMRC_FILE2 # define USR_GVIMRC_FILE2 "$HOME\\vimfiles\\gvimrc" # endif # ifndef USR_GVIMRC_FILE3 # define USR_GVIMRC_FILE3 "$VIM\\_gvimrc" # endif # ifndef SYS_MENU_FILE # define SYS_MENU_FILE "$VIMRUNTIME\\menu.vim" # endif #endif #ifndef SYS_OPTWIN_FILE # define SYS_OPTWIN_FILE "$VIMRUNTIME\\optwin.vim" #endif #ifdef FEAT_VIMINFO # ifndef VIMINFO_FILE # define VIMINFO_FILE "$HOME\\_viminfo" # endif # ifndef VIMINFO_FILE2 # define VIMINFO_FILE2 "$VIM\\_viminfo" # endif #endif #ifndef VIMRC_FILE # define VIMRC_FILE "_vimrc" #endif #ifndef EXRC_FILE # define EXRC_FILE "_exrc" #endif #ifdef FEAT_GUI # ifndef GVIMRC_FILE # define GVIMRC_FILE "_gvimrc" # endif #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt" #endif #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim" #endif #ifndef DFLT_BDIR # define DFLT_BDIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'backupdir' #endif #ifndef DFLT_VDIR # define DFLT_VDIR "$HOME/vimfiles/view" // default for 'viewdir' #endif #ifndef DFLT_DIR # define DFLT_DIR ".,$TEMP,c:\\tmp,c:\\temp" // default for 'directory' #endif #define DFLT_ERRORFILE "errors.err" #define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$HOME/vimfiles/after,$VIM/vimfiles/after" #define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after" #define CASE_INSENSITIVE_FILENAME // ignore case when comparing file names #define SPACE_IN_FILENAME #define BACKSLASH_IN_FILENAME #define USE_CRNL // lines end in CR-NL instead of NL #define HAVE_DUP // have dup() #define HAVE_ST_MODE // have stat.st_mode