aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.0396: :findrepl does not escape '&' and '~' properly

Browse Source 
Problem:    :findrepl does not escape '&' and '~' properly.
Solution:   Escape depending on the value of 'magic'. (closes #11067)
This commit is contained in:
matveyt 2022-09-06 17:00:15 +01:00 committed by Bram Moolenaar
parent 635bb49085
commit 2834ebdee4
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui.c
View File

@ -5360,8 +5360,10 @@ gui_do_findrepl(
if (type == FRD_REPLACEALL)
{
ga_concat(&ga, (char_u *)"/");
// escape slash and backslash
p = vim_strsave_escaped(repl_text, (char_u *)"/\\");
// Escape slash and backslash.
// Also escape tilde and ampersand if 'magic' is set.
p = vim_strsave_escaped(repl_text,
p_magic ? (char_u *)"/\\~&" : (char_u *)"/\\");
if (p != NULL)
ga_concat(&ga, p);
vim_free(p);

6
src/testdir/test_gui.vim
View File

@ -1580,6 +1580,12 @@ func Test_gui_findrepl()
call test_gui_event('findrepl', args)
call assert_equal(['ONE two ONE', 'Twoo ONE two ONEo'], getline(1, '$'))
" Replace all instances with sub-replace specials
call cursor(1, 1)
let args = #{find_text: 'ONE', repl_text: '&~&', flags: 0x4, forward: 1}
call test_gui_event('findrepl', args)
call assert_equal(['&~& two &~&', 'Twoo &~& two &~&o'], getline(1, '$'))
" Invalid arguments
call assert_false(test_gui_event('findrepl', {}))
let args = #{repl_text: 'a', flags: 1, forward: 1}

2
src/version.c
View File

@ -703,6 +703,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
396,
/**/
395,
/**/