mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 09:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zeertzjq
2024-09-28 17:16:22 +08:00
committed by GitHub
parent 4349bdbd0b
commit d5f6f61879
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/optionstr.c
View File

@@ -306,9 +306,7 @@ int check_signcolumn(win_T *wp)
wp->w_minscwidth = 0; wp->w_minscwidth = 0;
wp->w_maxscwidth = 1; wp->w_maxscwidth = 1;
} }
return OK; } else {
}
if (strncmp(val, "auto:", 5) != 0 if (strncmp(val, "auto:", 5) != 0
|| strlen(val) != 8 || strlen(val) != 8
|| !ascii_isdigit(val[5]) || !ascii_isdigit(val[5])
@@ -316,16 +314,18 @@ int check_signcolumn(win_T *wp)
|| !ascii_isdigit(val[7])) { || !ascii_isdigit(val[7])) {
return FAIL; return FAIL;
} }
// auto:<NUM>-<NUM> // auto:<NUM>-<NUM>
int min = val[5] - '0'; int min = val[5] - '0';
int max = val[7] - '0'; int max = val[7] - '0';
if (min < 1 || max < 2 || min > 8 || min >= max) { if (min < 1 || max < 2 || min > 8 || min >= max) {
return FAIL; return FAIL;
} }
wp->w_minscwidth = min; wp->w_minscwidth = min;
wp->w_maxscwidth = max; 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; return OK;
} }
@@ -2038,8 +2038,6 @@ const char *did_set_signcolumn(optset_T *args)
if (check_signcolumn(win) != OK) { if (check_signcolumn(win) != OK) {
return e_invarg; 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 // When changing the 'signcolumn' to or from 'number', recompute the
// width of the number column if 'number' or 'relativenumber' is set. // width of the number column if 'number' or 'relativenumber' is set.
if ((*oldval == 'n' && *(oldval + 1) == 'u') || win->w_minscwidth == SCL_NUM) { 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 api, clear, eq = n.api, n.clear, t.eq
local eval, exec, feed = n.eval, n.exec, n.feed local eval, exec, feed = n.eval, n.exec, n.feed
local exec_lua = n.exec_lua
describe('Signs', function() describe('Signs', function()
local screen local screen
@@ -607,4 +608,15 @@ describe('Signs', function()
exec('sign unplace 1') exec('sign unplace 1')
screen:expect(s1) screen:expect(s1)
end) 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) end)