diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-07-28 19:49:18 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-28 19:49:18 +0800 |
commit | 9cb8b5f8dbef6c81d287639726e425d80c15c70d (patch) | |
tree | cb908e25444cdfbcd457a9d46fc2dfd0d389122a /src | |
parent | b4e12bfa0044720b39fc08c18149167b3ca9b255 (diff) | |
download | rneovim-9cb8b5f8dbef6c81d287639726e425d80c15c70d.tar.gz rneovim-9cb8b5f8dbef6c81d287639726e425d80c15c70d.tar.bz2 rneovim-9cb8b5f8dbef6c81d287639726e425d80c15c70d.zip |
vim-patch:9.0.0097: long quickfix line is truncated for :clist (#19561)
Problem: Long quickfix line is truncated for :clist.
Solution: Allocate a buffer if needed.
https://github.com/vim/vim/commit/5f30e26f6946f0d0396499f91fbcfaa9d1f8acf7
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/quickfix.c | 24 | ||||
-rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 8 |
2 files changed, 29 insertions, 3 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 2138437b29..d5797e87e5 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -3147,13 +3147,31 @@ static void qf_list_entry(qfline_T *qfp, int qf_idx, bool cursel) } msg_puts(" "); + char_u *tbuf = IObuff; + size_t tbuflen = IOSIZE; + size_t len = STRLEN(qfp->qf_text) + 3; + + if (len > IOSIZE) { + tbuf = xmalloc(len); + if (tbuf != NULL) { + tbuflen = len; + } else { + tbuf = IObuff; + } + } + // Remove newlines and leading whitespace from the text. For an // unrecognized line keep the indent, the compiler may mark a word - // with ^^^^. */ + // with ^^^^. qf_fmt_text((fname != NULL || qfp->qf_lnum != 0) ? skipwhite(qfp->qf_text) : qfp->qf_text, - (char *)IObuff, IOSIZE); - msg_prt_line(IObuff, false); + (char *)tbuf, (int)tbuflen); + msg_prt_line(tbuf, false); + + if (tbuf != IObuff) { + xfree(tbuf); + } + ui_flush(); // show one line at a time } diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim index ddd4229f17..f6d573d76b 100644 --- a/src/nvim/testdir/test_quickfix.vim +++ b/src/nvim/testdir/test_quickfix.vim @@ -172,6 +172,14 @@ func XlistTests(cchar) \ ' 2 Data.Text:20 col 10 warning 22: ModuleWarning', \ ' 3 Data/Text.hs:30 col 15 warning 33: FileWarning'], l) + " Very long line should be displayed. + let text = 'Line' .. repeat('1234567890', 130) + let lines = ['Xtestfile9:2:9:' .. text] + Xgetexpr lines + + let l = split(execute('Xlist', ''), "\n") + call assert_equal([' 1 Xtestfile9:2 col 9: ' .. text] , l) + " For help entries in the quickfix list, only the filename without directory " should be displayed Xhelpgrep setqflist() |