diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-09-13 20:07:19 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-09-13 20:13:02 -0400 |
| commit | 64e74dc784b873767a5f2a764811c4ef72f81319 (patch) | |
| tree | 64a6edd5875b6cdd4837f4afd4c3710676a9e7f3 | |
| parent | a78d4659270cb600276774eb04c967f132c13ffb (diff) | |
| download | rneovim-64e74dc784b873767a5f2a764811c4ef72f81319.tar.gz rneovim-64e74dc784b873767a5f2a764811c4ef72f81319.tar.bz2 rneovim-64e74dc784b873767a5f2a764811c4ef72f81319.zip | |
vim-patch:8.1.0168: output of :marks is too short with multi-byte chars
Problem: Output of :marks is too short with multi-byte chars. (Tony
Mechelynck)
Solution: Get more bytes from the text line.
https://github.com/vim/vim/commit/9d5185bf9dfaef59e47c573a60044a21d5e29c0c
| -rw-r--r-- | src/nvim/mark.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_marks.vim | 25 |
2 files changed, 25 insertions, 5 deletions
diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 5366fa4b7f..05f78c76bc 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -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); diff --git a/src/nvim/testdir/test_marks.vim b/src/nvim/testdir/test_marks.vim index d22f9051b5..b05246e064 100644 --- a/src/nvim/testdir/test_marks.vim +++ b/src/nvim/testdir/test_marks.vim @@ -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 |