kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(column): set signcolumn width after splitting window (#30556)

Browse Source 
(cherry picked from commit d5f6f61879)
This commit is contained in:
zeertzjq 2024-09-28 17:16:22 +08:00 committed by github-actions[bot]
parent 28fba3bf27
commit 1fc09b0738
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/nvim/optionstr.c
View File

@ -300,26 +300,26 @@ int check_signcolumn(win_T *wp)
wp->w_minscwidth = 0;
wp->w_maxscwidth = 1;
}
return OK;
} else {
if (strncmp(val, "auto:", 5) != 0
|| strlen(val) != 8
|| !ascii_isdigit(val[5])
|| val[6] != '-'
|| !ascii_isdigit(val[7])) {
return FAIL;
}
// auto:<NUM>-<NUM>
int min = val[5] - '0';
int max = val[7] - '0';
if (min < 1 || max < 2 || min > 8 || min >= max) {
return FAIL;
}
wp->w_minscwidth = min;
wp->w_maxscwidth = max;
}
if (strncmp(val, "auto:", 5) != 0
|| strlen(val) != 8
|| !ascii_isdigit(val[5])
|| val[6] != '-'
|| !ascii_isdigit(val[7])) {
return FAIL;
}
// auto:<NUM>-<NUM>
int min = val[5] - '0';
int max = val[7] - '0';
if (min < 1 || max < 2 || min > 8 || min >= max) {
return FAIL;
}
wp->w_minscwidth = min;
wp->w_maxscwidth = max;
int scwidth = wp->w_minscwidth <= 0 ? 0 : MIN(wp->w_maxscwidth, wp->w_scwidth);
wp->w_scwidth = MAX(wp->w_minscwidth, scwidth);
return OK;
}
@ -2019,8 +2019,6 @@ const char *did_set_signcolumn(optset_T *args)
if (check_signcolumn(win) != OK) {
return e_invarg;
}
int scwidth = win->w_minscwidth <= 0 ? 0 : MIN(win->w_maxscwidth, win->w_scwidth);
win->w_scwidth = MAX(win->w_minscwidth, scwidth);
// When changing the 'signcolumn' to or from 'number', recompute the
// width of the number column if 'number' or 'relativenumber' is set.
if ((*oldval == 'n' && *(oldval + 1) == 'u') || win->w_minscwidth == SCL_NUM) {

12
test/functional/ui/sign_spec.lua
View File

@ -4,6 +4,7 @@ local Screen = require('test.functional.ui.screen')
local api, clear, eq = n.api, n.clear, t.eq
local eval, exec, feed = n.eval, n.exec, n.feed
local exec_lua = n.exec_lua
describe('Signs', function()
local screen
@ -607,4 +608,15 @@ describe('Signs', function()
exec('sign unplace 1')
screen:expect(s1)
end)
it('signcolumn width is set immediately after splitting window #30547', function()
local infos = exec_lua([[
vim.o.number = true
vim.o.signcolumn = 'yes'
vim.cmd.wincmd('v')
return vim.fn.getwininfo()
]])
eq(6, infos[1].textoff)
eq(6, infos[2].textoff)
end)
end)