kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(options): disallow empty 'fdc' and 'scl' (#16765)

Browse Source 
Empty string values for these options aren't actually allowed, but
check_opt_strings allows empty string options.

It so happens that 'scl' handles empty string like "auto", but empty 'fdc'
causes glitchiness (win_fdccol_count returns an incorrect value).

Just disallow empty string values for these options completely.
This commit is contained in:
Sean Dewar 2021-12-25 05:30:34 +00:00 committed by GitHub
parent 0d7a97224f
commit 70a68dc2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/option.c
View File

@ -2991,7 +2991,7 @@ ambw_end:
} }
} else if (varp == &curwin->w_p_fdc || varp == &curwin->w_allbuf_opt.wo_fdc) { } else if (varp == &curwin->w_p_fdc || varp == &curwin->w_allbuf_opt.wo_fdc) {
// 'foldcolumn' // 'foldcolumn'
if (check_opt_strings(*varp, p_fdc_values, false) != OK) { if (**varp == NUL || check_opt_strings(*varp, p_fdc_values, false) != OK) {
errmsg = e_invarg; errmsg = e_invarg;
} }
} else if (varp == &p_pt) { } else if (varp == &p_pt) {
@ -3370,6 +3370,9 @@ static int int_cmp(const void *a, const void *b)
/// @return OK when the value is valid, FAIL otherwise /// @return OK when the value is valid, FAIL otherwise
int check_signcolumn(char_u *val) int check_signcolumn(char_u *val)
{ {
if (*val == NUL) {
return FAIL;
}
// check for basic match // check for basic match
if (check_opt_strings(val, p_scl_values, false) == OK) { if (check_opt_strings(val, p_scl_values, false) == OK) {
return OK; return OK;

5
test/functional/legacy/options_spec.lua
View File

@ -83,4 +83,9 @@ describe('set', function()
Press ENTER or type command to continue^ | Press ENTER or type command to continue^ |
]]) ]])
end) end)
it('foldcolumn and signcolumn to empty string is disallowed', function()
matches('E474: Invalid argument: fdc=', exc_exec('set fdc='))
matches('E474: Invalid argument: scl=', exc_exec('set scl='))
end)
end) end)