IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2236: ml_get error if pattern matches beyond last line

Browse Source 
Problem:    Ml_get error if pattern matches beyond last line.
Solution:   Adjust position if needed. (Christian Brabandt, closes )
bb26596242
This commit is contained in:
Jan Edmund Lazo 2019-11-02 11:32:39 -04:00
parent 63ab994fba
commit 4a5adae950
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/ex_cmds.c
View File

@ -3524,6 +3524,11 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout,
// Note: If not first match on a line, column can't be known here // Note: If not first match on a line, column can't be known here
current_match.start.lnum = sub_firstlnum; current_match.start.lnum = sub_firstlnum;
// Match might be after the last line for "\n\zs" matching at
// the end of the last line.
if (lnum > curbuf->b_ml.ml_line_count) {
break;
}
if (sub_firstline == NULL) { if (sub_firstline == NULL) {
sub_firstline = vim_strsave(ml_get(sub_firstlnum)); sub_firstline = vim_strsave(ml_get(sub_firstlnum));
} }

10
src/nvim/testdir/test_substitute.vim
View File

@ -149,6 +149,7 @@ func Run_SubCmd_Tests(tests)
for t in a:tests for t in a:tests
let start = line('.') + 1 let start = line('.') + 1
let end = start + len(t[2]) - 1 let end = start + len(t[2]) - 1
" TODO: why is there a one second delay the first time we get here?
exe "normal o" . t[0] exe "normal o" . t[0]
call cursor(start, 1) call cursor(start, 1)
exe t[1] exe t[1]
@ -717,3 +718,12 @@ one two
close! close!
endfunc endfunc
func Test_sub_beyond_end()
new
call setline(1, '#')
let @/ = '^#\n\zs'
s///e
call assert_equal('#', getline(1))
bwipe!
endfunc