aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2911: pattern "\%V" does not match all of block selection

Browse Source 
Problem:    Pattern "\%V" does not match all of block selection. (Rick Howe)
Solution:   Use the value of vi_curswant. (closes #8285)
This commit is contained in:
Bram Moolenaar
2021-05-30 16:43:11 +02:00
parent 0b49648486
commit e71c0ebe2c
4 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/regexp.c
View File

@@ -1279,6 +1279,7 @@ reg_match_visual(void)
colnr_T start, end; colnr_T start, end;
colnr_T start2, end2; colnr_T start2, end2;
colnr_T cols; colnr_T cols;
colnr_T curswant;
// Check if the buffer is the current buffer. // Check if the buffer is the current buffer.
if (rex.reg_buf != curbuf || VIsual.lnum == 0) if (rex.reg_buf != curbuf || VIsual.lnum == 0)
@@ -1297,6 +1298,7 @@ reg_match_visual(void)
bot = VIsual; bot = VIsual;
} }
mode = VIsual_mode; mode = VIsual_mode;
curswant = wp->w_curswant;
} }
else else
{ {
@@ -1311,6 +1313,7 @@ reg_match_visual(void)
bot = curbuf->b_visual.vi_start; bot = curbuf->b_visual.vi_start;
} }
mode = curbuf->b_visual.vi_mode; mode = curbuf->b_visual.vi_mode;
curswant = curbuf->b_visual.vi_curswant;
} }
lnum = rex.lnum + rex.reg_firstlnum; lnum = rex.lnum + rex.reg_firstlnum;
if (lnum < top.lnum || lnum > bot.lnum) if (lnum < top.lnum || lnum > bot.lnum)
@@ -1331,7 +1334,7 @@ reg_match_visual(void)
start = start2; start = start2;
if (end2 > end) if (end2 > end)
end = end2; end = end2;
if (top.col == MAXCOL || bot.col == MAXCOL) if (top.col == MAXCOL || bot.col == MAXCOL || curswant == MAXCOL)
end = MAXCOL; end = MAXCOL;
cols = win_linetabsize(wp, rex.line, (colnr_T)(rex.input - rex.line)); cols = win_linetabsize(wp, rex.line, (colnr_T)(rex.input - rex.line));
if (cols < start || cols > end - (*p_sel == 'e')) if (cols < start || cols > end - (*p_sel == 'e'))

9
src/testdir/dumps/Test_hlsearch_block_visual_match.dump Normal file
View File

@@ -0,0 +1,9 @@
|a+0&#ffff4012@1| | +0&#ffffff0@56
>b+0&#ffff4012@3| | +0&#ffffff0@54
|c+0&#ffff4012@5| | +0&#ffffff0@52
|~+0#4040ff13&| @58
|~| @58
|~| @58
|~| @58
|~| @58
|/+0#0000000&|\|%|V| @37|2|,|1| @10|A|l@1|

20
src/testdir/test_search.vim
View File

@@ -984,6 +984,26 @@ func Test_hlsearch_and_visual()
call delete('Xhlvisual_script') call delete('Xhlvisual_script')
endfunc endfunc
func Test_hlsearch_block_visual_match()
CheckScreendump
let lines =<< trim END
set hlsearch
call setline(1, ['aa', 'bbbb', 'cccccc'])
END
call writefile(lines, 'Xhlsearch_block')
let buf = RunVimInTerminal('-S Xhlsearch_block', {'rows': 9, 'cols': 60})
call term_sendkeys(buf, "G\<C-V>$kk\<Esc>")
sleep 100m
call term_sendkeys(buf, "/\\%V\<CR>")
sleep 100m
call VerifyScreenDump(buf, 'Test_hlsearch_block_visual_match', {})
call StopVimInTerminal(buf)
call delete('Xhlsearch_block')
endfunc
func Test_incsearch_substitute() func Test_incsearch_substitute()
CheckOption incsearch CheckOption incsearch

2
src/version.c
View File

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