Mercurial > vim
changeset 28811:bd5b6ac5998f v8.2.4929
patch 8.2.4929: off-by-one error in in statusline item
Commit: https://github.com/vim/vim/commit/57ff52677bf5ba1651281ffe40505df8feba4a36
Author: LemonBoy <thatlemon@gmail.com>
Date: Mon May 9 21:03:47 2022 +0100
patch 8.2.4929: off-by-one error in in statusline item
Problem: Off-by-one error in in statusline item.
Solution: Subtrace one less. (closes https://github.com/vim/vim/issues/10394, closes https://github.com/vim/vim/issues/5599)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 09 May 2022 22:15:03 +0200 |
| parents | b8850d9e3e6e |
| children | 483371d05cd5 |
| files | src/buffer.c src/testdir/dumps/Test_statusline_hl.dump src/testdir/test_statusline.vim src/version.c |
| diffstat | 4 files changed, 28 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -4446,7 +4446,8 @@ build_stl_str_hl( // correct the start of the items for the truncation for (l = stl_groupitem[groupdepth] + 1; l < curitem; l++) { - stl_items[l].stl_start -= n; + // Minus one for the leading '<' added above. + stl_items[l].stl_start -= n - 1; if (stl_items[l].stl_start < t) stl_items[l].stl_start = t; }
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_statusline_hl.dump @@ -0,0 +1,6 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|<+0#ffffff16#e000002|F|G+0#0000e05#ffffff0|H|I| @69 +| +0#0000000&@74
--- a/src/testdir/test_statusline.vim +++ b/src/testdir/test_statusline.vim @@ -469,7 +469,6 @@ func Test_statusline_removed_group() call writefile(lines, 'XTest_statusline') let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 10, 'cols': 50}) - call TermWait(buf, 50) call VerifyScreenDump(buf, 'Test_statusline_1', {}) " clean up @@ -541,4 +540,22 @@ func Test_statusline_verylong_filename() bwipe! endfunc +func Test_statusline_highlight_truncate() + CheckScreendump + + let lines =<< trim END + set laststatus=2 + hi! link User1 Directory + hi! link User2 ErrorMsg + set statusline=%.5(%1*ABC%2*DEF%1*GHI%) + END + call writefile(lines, 'XTest_statusline') + + let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 6}) + call VerifyScreenDump(buf, 'Test_statusline_hl', {}) + + call StopVimInTerminal(buf) + call delete('XTest_statusline') +endfunc + " vim: shiftwidth=2 sts=2 expandtab