diff options
| author | luukvbaal <31730729+luukvbaal@users.noreply.github.com> | 2023-02-02 10:35:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 09:35:51 +0000 |
| commit | 64fa75a86a9e2e301e884e21911d71688fc8f122 (patch) | |
| tree | cd9286f4df6659bc4432403b285e46ad9bdfcd00 /test/functional/ui/statuscolumn_spec.lua | |
| parent | 2c5906b55bb6092121f4d3b032d5449da7675c2b (diff) | |
| download | rneovim-64fa75a86a9e2e301e884e21911d71688fc8f122.tar.gz rneovim-64fa75a86a9e2e301e884e21911d71688fc8f122.tar.bz2 rneovim-64fa75a86a9e2e301e884e21911d71688fc8f122.zip | |
fix(column): estimate 'statuscolumn' width appropriately
Problem: The 'statuscolumn' width is being estimated without the
proper context. In particular, this resulted in the fact
that a custom fold column could be included in the estimated
`number_width()`, and doubly added when actually drawing the
statuscolumn due to `win_col_off()` also adding the
`'foldcolumn'` width. Resulting in a status column that is
`'foldcolumn'` cells wider than necessary.
Solution: Estimate 'statuscolumn' width in `get_statuscol_str()` when
a buffer's line count has changed.
Diffstat (limited to 'test/functional/ui/statuscolumn_spec.lua')
| -rw-r--r-- | test/functional/ui/statuscolumn_spec.lua | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua index ae3b95fb0f..3233e6cd19 100644 --- a/test/functional/ui/statuscolumn_spec.lua +++ b/test/functional/ui/statuscolumn_spec.lua @@ -439,7 +439,7 @@ describe('statuscolumn', function() vim.api.nvim_buf_set_extmark(0, ns, 7, 0, { virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} }) ]]) - feed('lh') -- force update wcol/row + feed('lh') -- force update cursor row screen:expect([[ 4 aaaaa | 5 aaaaa | @@ -458,5 +458,24 @@ describe('statuscolumn', function() ]]) command('set stc=') -- also for the default sign column screen:expect_unchanged() + -- 'statuscolumn' is not too wide with custom (bogus) fold column + command([[set stc=%{foldlevel(v:lnum)>0?repeat('-',foldlevel(v:lnum)):''}%=%l\ ]]) + feed('Gd10Ggg<C-l>') + screen:expect([[ + 1 ^aaaaa | + 2 aaaaa | + 3 aaaaa | + 4 aaaaa | + 5 aaaaa | + 6 aaaaa | + 7 aaaaa | + virt | + ---------8 aaaaa | + virt | + ---------9 aaaaa | + ~ | + ~ | + | + ]]) end) end) |