Mercurial > vim
view src/nbdebug.h @ 33521:1f9b1def80c8 v9.0.2009
patch 9.0.2009: cmdline-completion for comma-separated options wrong
Commit: https://github.com/vim/vim/commit/54844857fd6933fa4f6678e47610c4b9c9f7a091
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Mon Oct 9 18:12:31 2023 +0200
patch 9.0.2009: cmdline-completion for comma-separated options wrong
Problem: cmdline-completion for comma-separated options wrong
Solution: Fix command-line expansions for options with filenames with
commas
Fix command-line expansions for options with filenames with commas
Cmdline expansion for option values that take a comma-separated list
of file names is currently not handling file names with commas as the
commas are not escaped. For such options, the commas in file names need
to be escaped (to differentiate from a comma that delimit the list
items). The escaped comma is unescaped in `copy_option_part()` during
option parsing.
Fix as follows:
- Cmdline completion for option values with comma-separated file/folder
names will not start a new match when seeing `\\,` and will instead
consider it as one value.
- File/folder regex matching will strip the `\\` when seeing `\\,` to
make sure it can match the correct files/folders.
- The expanded value will escape `,` with `\\,`, similar to how spaces
are escaped to make sure the option value is correct on the cmdline.
This fix also takes into account the fact that Win32 Vim handles file
name escaping differently. Typing '\,' for a file name results in it
being handled literally but in other platforms '\,' is interpreted as a
simple ',' and commas need to be escaped using '\\,' instead.
Also, make sure this new logic only applies to comma-separated options
like 'path'. Non-list options like 'set makeprg=<Tab>' and regular ex
commands like `:edit <Tab>` do not require escaping and will continue to
work.
Also fix up documentation to be clearer. The original docs are slightly
misleading in how it discusses triple slashes for 'tags'.
closes: #13303
related: #13301
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 | Mon, 09 Oct 2023 18:30:04 +0200 |
parents | 50555279168b |
children |
line wrap: on
line source
/* vi:set ts=8 sw=8 noet: * * VIM - Vi IMproved by Bram Moolenaar * Visual Workshop integration by Gordon Prieur * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ #ifndef NBDEBUG_H #define NBDEBUG_H #ifdef NBDEBUG # ifndef ASSERT # define ASSERT(c) \ if (!(c)) \ { \ fprintf(stderr, "Assertion failed: line %d, file %s\n", \ __LINE__, __FILE__); \ fflush(stderr); \ abort(); \ } # endif # define nbdebug(a) nbdbg a # define NB_TRACE 0x00000001 # define NB_TRACE_VERBOSE 0x00000002 # define NB_TRACE_COLONCMD 0x00000004 # define NB_PRINT 0x00000008 # define NB_DEBUG_ALL 0xffffffff # define NBDLEVEL(flags) (nb_debug != NULL && (nb_dlevel & (flags))) # define NBDEBUG_TRACE 1 typedef enum { WT_ENV = 1, // look for env var if set WT_WAIT, // look for ~/.gvimwait if set WT_STOP // look for ~/.gvimstop if set } WtWait; void nbdbg(char *, ...) ATTRIBUTE_FORMAT_PRINTF(1, 2); void nbdebug_wait(u_int wait_flags, char *wait_var, u_int wait_secs); void nbdebug_log_init(char *log_var, char *level_var); extern FILE *nb_debug; extern u_int nb_dlevel; // nb_debug verbosity level #else // not NBDEBUG # ifndef ASSERT # define ASSERT(c) # endif /* * The following 3 stubs are needed because a macro cannot be used because of * the variable number of arguments. */ void nbdbg( char *fmt, ...) { } #endif // NBDEBUG #endif // NBDEBUG_H