diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-14 19:12:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 19:12:18 +0200 |
| commit | 1bc44a805a2c9213ebe2c0603dfc714c306f50ac (patch) | |
| tree | 65acbe67531cd0f340d350a313ee39cfb7e7bc4d | |
| parent | ae8515a5448d65856388f5104044e58702f82b1e (diff) | |
| parent | 315a8d22172de9bcf45bb86a0bf31640c626fcce (diff) | |
| download | rneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.tar.gz rneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.tar.bz2 rneovim-1bc44a805a2c9213ebe2c0603dfc714c306f50ac.zip | |
Merge #8993 from janlazo/vim-8.0.1184
| -rw-r--r-- | src/nvim/mark.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_marks.vim | 68 |
2 files changed, 71 insertions, 2 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 18a0c71aab..8858cd22b8 100644 --- a/src/nvim/testdir/test_marks.vim +++ b/src/nvim/testdir/test_marks.vim @@ -68,3 +68,71 @@ func Test_setpos() call win_gotoid(twowin) bwipe! endfunc + +func Test_marks_cmd() + new Xone + call setline(1, ['aaa', 'bbb']) + norm! maG$mB + w! + new Xtwo + call setline(1, ['ccc', 'ddd']) + norm! $mcGmD + w! + + b Xone + 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]) + call assert_equal(' a 1 0 aaa', a[2]) + call assert_equal(' B 2 2 bbb', a[3]) + call assert_equal(' D 2 0 Xtwo', a[4]) + call assert_equal(' " 1 0 aaa', a[5]) + call assert_equal(' [ 1 0 aaa', a[6]) + call assert_equal(' ] 2 0 bbb', a[7]) + call assert_equal(' . 2 0 bbb', a[8]) + + b Xtwo + 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]) + call assert_equal(' c 1 2 ccc', a[2]) + call assert_equal(' B 2 2 Xone', a[3]) + call assert_equal(' D 2 0 ddd', a[4]) + call assert_equal(' " 2 0 ddd', a[5]) + call assert_equal(' [ 1 0 ccc', a[6]) + call assert_equal(' ] 2 0 ddd', a[7]) + call assert_equal(' . 2 0 ddd', a[8]) + + b Xone + delmarks aB + 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]) + + b Xtwo + delmarks cD + call assert_fails('marks aBcD', 'E283:') + + call delete('Xone') + call delete('Xtwo') + %bwipe +endfunc + +func Test_marks_cmd_multibyte() + if !has('multi_byte') + return + endif + new Xone + call setline(1, [repeat('á', &columns)]) + norm! ma + + let a = split(execute('marks a'), "\n") + call assert_equal(2, len(a)) + let expected = ' a 1 0 ' . repeat('á', &columns - 16) + call assert_equal(expected, a[1]) + + bwipe! +endfunc |