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.0168: output of :marks is too short with multi-byte chars

Browse Source 
Problem:    Output of :marks is too short with multi-byte chars. (Tony
            Mechelynck)
Solution:   Get more bytes from the text line.
9d5185bf9d
This commit is contained in:
Jan Edmund Lazo 2018-09-13 20:07:19 -04:00
parent a78d465927
commit 64e74dc784
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/mark.c
View File

@ -599,9 +599,10 @@ static char_u *mark_line(pos_T *mp, int lead_len)
if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count)
return vim_strsave((char_u *)"-invalid-");
assert(Columns >= 0 && (size_t)Columns <= SIZE_MAX);
s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns);
// Allow for up to 5 bytes per character.
s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns * 5);
/* Truncate the line to fit it in the window */
// Truncate the line to fit it in the window
len = 0;
for (p = s; *p != NUL; MB_PTR_ADV(p)) {
len += ptr2cells(p);

25
src/nvim/testdir/test_marks.vim
View File

@ -80,7 +80,7 @@ func Test_marks_cmd()
w!
b Xone
let a=split(execute('marks'), "\n")
let a = split(execute('marks'), "\n")
call assert_equal(9, len(a))
call assert_equal('mark line col file/text', a[0])
call assert_equal(" ' 2 0 bbb", a[1])
@ -93,7 +93,7 @@ func Test_marks_cmd()
call assert_equal(' . 2 0 bbb', a[8])
b Xtwo
let a=split(execute('marks'), "\n")
let a = split(execute('marks'), "\n")
call assert_equal(9, len(a))
call assert_equal('mark line col file/text', a[0])
call assert_equal(" ' 1 0 ccc", a[1])
@ -107,7 +107,7 @@ func Test_marks_cmd()
b Xone
delmarks aB
let a=split(execute('marks aBcD'), "\n")
let a = split(execute('marks aBcD'), "\n")
call assert_equal(2, len(a))
call assert_equal('mark line col file/text', a[0])
call assert_equal(' D 2 0 Xtwo', a[1])
@ -120,3 +120,22 @@ func Test_marks_cmd()
call delete('Xtwo')
%bwipe
endfunc
func Test_marks_cmd_multibyte()
if !has('multi_byte')
return
endif
new Xone
call setline(1, ['ááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááááá'])
norm! ma
let a = split(execute('marks a'), "\n")
call assert_equal(2, len(a))
let expected = ' a 1 0 '
while strwidth(expected) < &columns - 1
let expected .= 'á'
endwhile
call assert_equal(expected, a[1])
bwipe!
endfunc