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.0303: line2byte() is wrong for last line with 'noeol'

Browse Source 
Problem:    line2byte() is wrong for last line with 'noeol' and 'nofixeol'.
Solution:   Fix off-by-one error. (Shane Harper, closes vim/vim#3351)
c26f7c6053
This commit is contained in:
Jan Edmund Lazo 2018-08-21 09:41:41 -04:00
parent 3807520001
commit 822ae1a81c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/memline.c
View File

@ -3955,7 +3955,7 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp)
/* Don't count the last line break if 'noeol' and ('bin' or /* Don't count the last line break if 'noeol' and ('bin' or
* 'nofixeol'). */ * 'nofixeol'). */
if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol
&& buf->b_ml.ml_line_count == lnum) { && lnum > buf->b_ml.ml_line_count) {
size -= ffdos + 1; size -= ffdos + 1;
} }
} }

12
src/nvim/testdir/test_functions.vim
View File

@ -701,6 +701,7 @@ endfunc
func Test_byte2line_line2byte() func Test_byte2line_line2byte()
new new
set endofline
call setline(1, ['a', 'bc', 'd']) call setline(1, ['a', 'bc', 'd'])
set fileformat=unix set fileformat=unix
@ -721,7 +722,16 @@ func Test_byte2line_line2byte()
call assert_equal([-1, -1, 1, 4, 8, 11, -1], call assert_equal([-1, -1, 1, 4, 8, 11, -1],
\ map(range(-1, 5), 'line2byte(v:val)')) \ map(range(-1, 5), 'line2byte(v:val)'))
set fileformat& bw!
set noendofline nofixendofline
normal a-
for ff in ["unix", "mac", "dos"]
let &fileformat = ff
call assert_equal(1, line2byte(1))
call assert_equal(2, line2byte(2)) " line2byte(line("$") + 1) is the buffer size plus one (as per :help line2byte).
endfor
set endofline& fixendofline& fileformat&
bw! bw!
endfunc endfunc