Mercurial > vim
view src/libvterm/t/25state_input.test @ 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 | b13f723a7ec6 |
children |
line wrap: on
line source
INIT WANTSTATE !Unmodified ASCII INCHAR 0 41 output "A" INCHAR 0 61 output "a" !Ctrl modifier on ASCII letters INCHAR C 41 output "\e[65;5u" INCHAR C 61 output "\x01" !Alt modifier on ASCII letters INCHAR A 41 output "\eA" INCHAR A 61 output "\ea" !Ctrl-Alt modifier on ASCII letters INCHAR CA 41 output "\e[65;7u" INCHAR CA 61 output "\e\x01" !Special handling of Ctrl-I INCHAR 0 49 output "I" INCHAR 0 69 output "i" INCHAR C 49 output "\e[73;5u" INCHAR C 69 output "\e[105;5u" INCHAR A 49 output "\eI" INCHAR A 69 output "\ei" INCHAR CA 49 output "\e[73;7u" INCHAR CA 69 output "\e[105;7u" !Special handling of Space INCHAR 0 20 output " " INCHAR S 20 output "\e[32;2u" INCHAR C 20 output "\0" INCHAR SC 20 output "\e[32;6u" INCHAR A 20 output "\e " INCHAR SA 20 output "\e[32;4u" INCHAR CA 20 output "\e\0" INCHAR SCA 20 output "\e[32;8u" !Cursor keys in reset (cursor) mode INKEY 0 Up output "\e[A" INKEY S Up output "\e[1;2A" INKEY C Up output "\e[1;5A" INKEY SC Up output "\e[1;6A" INKEY A Up output "\e[1;3A" INKEY SA Up output "\e[1;4A" INKEY CA Up output "\e[1;7A" INKEY SCA Up output "\e[1;8A" !Cursor keys in application mode PUSH "\e[?1h" # Plain "Up" should be SS3 A now INKEY 0 Up output "\eOA" # Modified keys should still use CSI INKEY S Up output "\e[1;2A" INKEY C Up output "\e[1;5A" !Shift-Tab should be different INKEY 0 Tab output "\x09" INKEY S Tab output "\e[Z" INKEY C Tab output "\e[9;5u" INKEY A Tab output "\e\x09" INKEY CA Tab output "\e[9;7u" !Enter in linefeed mode INKEY 0 Enter output "\x0d" !Enter in newline mode PUSH "\e[20h" INKEY 0 Enter output "\x0d\x0a" !Unmodified F1 is SS3 P INKEY 0 F1 output "\eOP" !Modified F1 is CSI P INKEY S F1 output "\e[1;2P" INKEY A F1 output "\e[1;3P" INKEY C F1 output "\e[1;5P" !Keypad in DECKPNM INKEY 0 KP0 output "0" !Keypad in DECKPAM PUSH "\e=" INKEY 0 KP0 output "\eOp" !Bracketed paste mode off PASTE START PASTE END !Bracketed paste mode on PUSH "\e[?2004h" PASTE START output "\e[200~" PASTE END output "\e[201~" !Focus reporting disabled FOCUS IN FOCUS OUT !Focus reporting enabled WANTSTATE +p PUSH "\e[?1004h" settermprop 9 true FOCUS IN output "\e[I" FOCUS OUT output "\e[O"