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

Merge pull request #18509 from zeertzjq/vim-8.2.4929

Browse Source 
vim-patch:8.2.4929: off-by-one error in in statusline item
This commit is contained in:
zeertzjq 2022-05-10 08:54:37 +08:00 committed by GitHub
commit 5359be7893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/buffer.c
View File

@ -3635,7 +3635,8 @@ int build_stl_str_hl(win_T *wp, char *out, size_t outlen, char *fmt, int use_san
// correct the start of the items for the truncation
for (int idx = stl_groupitems[groupdepth] + 1; idx < curitem; idx++) {
// Shift everything back by the number of removed bytes
stl_items[idx].start -= n;
// Minus one for the leading '<' added above.
stl_items[idx].start -= n - 1;
// If the item was partially or completely truncated, set its
// start to the start of the group

19
src/nvim/testdir/test_statusline.vim
View File

@ -461,7 +461,6 @@ func Test_statusline_removed_group()
call writefile(lines, 'XTest_statusline')
let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 10, 'cols': 50})
call term_wait(buf, 100)
call VerifyScreenDump(buf, 'Test_statusline_1', {})
" clean up
@ -535,4 +534,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

71
test/functional/legacy/statusline_spec.lua Normal file
View File

@ -0,0 +1,71 @@
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
local clear = helpers.clear
local exec = helpers.exec
local feed = helpers.feed
before_each(clear)
describe('statusline', function()
local screen
before_each(function()
screen = Screen.new(50, 7)
screen:attach()
end)
it('is updated in cmdline mode when using window-local statusline vim-patch:8.2.2737', function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- StatusLineNC, VertSplit
})
exec([[
setlocal statusline=-%{mode()}-
split
setlocal statusline=+%{mode()}+
]])
screen:expect([[
^ |
{1:~ }|
{2:+n+ }|
|
{1:~ }|
{3:-n- }|
|
]])
feed(':')
screen:expect([[
|
{1:~ }|
{2:+c+ }|
|
{1:~ }|
{3:-c- }|
:^ |
]])
end)
it('truncated item does not cause off-by-one highlight vim-patch:8.2.4929', function()
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {foreground = Screen.colors.Blue}, -- User1
[3] = {background = Screen.colors.Red, foreground = Screen.colors.White}, -- User2
})
exec([[
set laststatus=2
hi! link User1 Directory
hi! link User2 ErrorMsg
set statusline=%.5(%1*ABC%2*DEF%1*GHI%)
]])
screen:expect([[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{3:<F}{2:GHI }|
|
]])
end)
end)