diff options
| -rw-r--r-- | src/nvim/drawscreen.c | 5 | ||||
| -rw-r--r-- | src/nvim/option.c | 12 | ||||
| -rw-r--r-- | src/nvim/optionstr.c | 4 | ||||
| -rw-r--r-- | test/functional/ui/statuscolumn_spec.lua | 68 |
4 files changed, 65 insertions, 24 deletions
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index 810175aeba..71dbbdabfc 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -1397,10 +1397,6 @@ static void win_update(win_T *wp, DecorProviders *providers) if (type >= UPD_NOT_VALID) { wp->w_redr_status = true; wp->w_lines_valid = 0; - if (*wp->w_p_stc != NUL) { - wp->w_nrwidth_line_count = 0; // make sure width is reset - wp->w_statuscol_line_count = 0; // make sure width is re-estimated - } } // Window is zero-height: Only need to draw the separator @@ -2528,6 +2524,7 @@ int number_width(win_T *wp) // reset for 'statuscolumn' if (*wp->w_p_stc != NUL) { + wp->w_statuscol_line_count = 0; // make sure width is re-estimated wp->w_nrwidth_width = (wp->w_p_nu || wp->w_p_rnu) * (int)wp->w_p_nuw; return wp->w_nrwidth_width; } diff --git a/src/nvim/option.c b/src/nvim/option.c index aff824e9e2..bcb78ea685 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2189,9 +2189,8 @@ static const char *set_bool_option(const int opt_idx, char *const varp, const in errmsg = did_set_spelllang(curwin); } } else if ((int *)varp == &curwin->w_p_nu && *curwin->w_p_stc != NUL) { - // When 'statuscolumn' is set and 'number' is changed: - curwin->w_nrwidth_line_count = 0; // make sure width is reset - curwin->w_statuscol_line_count = 0; // make sure width is re-estimated + // When 'number' is changed and 'statuscolumn' is set, make sure width is reset. + curwin->w_nrwidth_line_count = 0; } if ((int *)varp == &curwin->w_p_arab) { @@ -5530,6 +5529,13 @@ int win_signcol_configured(win_T *wp, int *is_fixed) if (*scl == 'n' && (*(scl + 1) == 'o' || (*(scl + 1) == 'u' && (wp->w_p_nu || wp->w_p_rnu)))) { + if (!wp->w_buffer->b_signcols.valid) { + FOR_ALL_WINDOWS_IN_TAB(win, curtab) { + if (*win->w_p_stc != NUL) { + win->w_nrwidth_line_count = 0; + } + } + } if (*wp->w_p_stc != NUL) { buf_signcols(wp->w_buffer, 0); } diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index 6c6190cb08..1f3fb942ff 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -1202,8 +1202,8 @@ static void did_set_statusline(win_T *win, char **varp, char **gvarp, const char if (varp == &p_ruf) { // reset ru_wid first ru_wid = 0; } else if (varp == &win->w_p_stc) { - win->w_nrwidth_line_count = 0; // make sure width is reset - win->w_statuscol_line_count = 0; // make sure width is re-estimated + // reset 'statuscolumn' width + win->w_nrwidth_line_count = 0; } char *s = *varp; if (varp == &p_ruf && *s == '%') { diff --git a/test/functional/ui/statuscolumn_spec.lua b/test/functional/ui/statuscolumn_spec.lua index 0eec693182..c4b055d289 100644 --- a/test/functional/ui/statuscolumn_spec.lua +++ b/test/functional/ui/statuscolumn_spec.lua @@ -15,6 +15,7 @@ describe('statuscolumn', function() clear('--cmd', 'set number nuw=1 | call setline(1, repeat(["aaaaa"], 16)) | norm GM') screen = Screen.new() screen:attach() + exec_lua('ns = vim.api.nvim_create_namespace("")') end) it("fails with invalid 'statuscolumn'", function() @@ -352,7 +353,6 @@ describe('statuscolumn', function() ]]) -- Status column is re-evaluated for virt_lines, buffer line, and wrapped line exec_lua([[ - local ns = vim.api.nvim_create_namespace("ns") vim.api.nvim_buf_set_extmark(0, ns, 5, 0, { virt_lines_above = true, virt_lines = {{{"virt_line above", ""}}} }) vim.api.nvim_buf_set_extmark(0, ns, 4, 0, { virt_lines = {{{"virt_line", ""}}} }) @@ -377,7 +377,6 @@ describe('statuscolumn', function() ]]) -- Also test virt_lines at the end of buffer exec_lua([[ - local ns = vim.api.nvim_create_namespace("ns") vim.api.nvim_buf_set_extmark(0, ns, 15, 0, { virt_lines = {{{"END", ""}}} }) ]]) feed('Gzz') @@ -400,7 +399,6 @@ describe('statuscolumn', function() -- Also test virt_lines when 'cpoptions' includes "n" exec_lua([[ vim.opt.cpoptions:append("n") - local ns = vim.api.nvim_create_namespace("ns") vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line1", ""}}} }) vim.api.nvim_buf_set_extmark(0, ns, 14, 0, { virt_lines = {{{"virt_line2", ""}}} }) ]]) @@ -481,7 +479,6 @@ describe('statuscolumn', function() for _ = 0,8 do command('norm zfjzo') end -- 'statuscolumn' is not drawn for `virt_lines_leftcol` lines exec_lua([[ - local ns = vim.api.nvim_create_namespace("ns") vim.api.nvim_buf_set_extmark(0, ns, 6, 0, { virt_lines_leftcol = true, virt_lines = {{{"virt", ""}}} }) vim.api.nvim_buf_set_extmark(0, ns, 7, 0, { @@ -585,37 +582,78 @@ describe('statuscolumn', function() end) it("has correct width with custom sign column when (un)placing signs", function() - screen:try_resize(screen._width, 6) + screen:try_resize(screen._width, 3) exec_lua([[ vim.cmd.norm('gg') vim.o.signcolumn = 'no' vim.fn.sign_define('sign', { text = 'ss' }) _G.StatusCol = function() local s = vim.fn.sign_getplaced(1)[1].signs + local es = vim.api.nvim_buf_get_extmarks(0, ns, 0, -1, {type = "sign"}) local sign = '' - if #s > 0 then - sign = vim.v.lnum == 5 and 'ss' or ' ' + local signs = #s + #es + if signs > 0 then + sign = (vim.v.lnum == 2 and 'ss' or ' '):rep(signs) end return vim.v.lnum .. '%=' .. sign end vim.o.statuscolumn = "%!v:lua.StatusCol()" - vim.fn.sign_place(0, '', 'sign', 1, { lnum = 5 }) ]]) + command('sign place 1 line=2 name=sign') + screen:expect([[ + 1 ^aaaaa | + 2 ssaaaaa | + | + ]]) + command('sign place 2 line=2 name=sign') + screen:expect([[ + 1 ^aaaaa | + 2 ssssaaaaa | + | + ]]) + command('sign unplace 2') screen:expect([[ 1 ^aaaaa | - 2 aaaaa | - 3 aaaaa | - 4 aaaaa | - 5 ssaaaaa | + 2 ssaaaaa | | ]]) command('sign unplace 1') screen:expect([[ 1 ^aaaaa | 2 aaaaa | - 3 aaaaa | - 4 aaaaa | - 5 aaaaa | + | + ]]) + -- Also for extmark signs + exec_lua('id1 = vim.api.nvim_buf_set_extmark(0, ns, 1, 0, {sign_text = "ss"})') + screen:expect([[ + 1 ^aaaaa | + 2 ssaaaaa | + | + ]]) + exec_lua('id2 = vim.api.nvim_buf_set_extmark(0, ns, 1, 0, {sign_text = "ss"})') + screen:expect([[ + 1 ^aaaaa | + 2 ssssaaaaa | + | + ]]) + exec_lua("vim.api.nvim_buf_del_extmark(0, ns, id1)") + screen:expect([[ + 1 ^aaaaa | + 2 ssaaaaa | + | + ]]) + exec_lua("vim.api.nvim_buf_del_extmark(0, ns, id2)") + screen:expect([[ + 1 ^aaaaa | + 2 aaaaa | + | + ]]) + -- In all windows + command('wincmd v | set ls=0') + command('sign place 1 line=2 name=sign') + screen:expect([[ + 1 ^aaaaa │1 aaaaa | + 2 ssaaaaa │2 ssaaaaa | | ]]) end) |