Skip to content

Commit

Permalink
fix(options): disallow empty 'fdc' and 'scl' (#16765)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
seandewar committed Dec 25, 2021
1 parent 0d7a972 commit 70a68dc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/nvim/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -2991,7 +2991,7 @@ static char *did_set_string_option(int opt_idx, char_u **varp, bool new_value_al
}
} else if (varp == &curwin->w_p_fdc || varp == &curwin->w_allbuf_opt.wo_fdc) {
// '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;
}
} else if (varp == &p_pt) {
Expand Down Expand Up @@ -3370,6 +3370,9 @@ static int int_cmp(const void *a, const void *b)
/// @return OK when the value is valid, FAIL otherwise
int check_signcolumn(char_u *val)
{
if (*val == NUL) {
return FAIL;
}
// check for basic match
if (check_opt_strings(val, p_scl_values, false) == OK) {
return OK;
Expand Down
5 changes: 5 additions & 0 deletions test/functional/legacy/options_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,9 @@ describe('set', function()
Press ENTER or type command to continue^ |
]])
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)

0 comments on commit 70a68dc

Please sign in to comment.