mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(optionstr.c): break up did_set_string_option 49

Browse Source
This commit is contained in:
Lewis Russell
2023-01-23 11:10:04 +00:00
parent 01e51d3bd1
commit 6dac70bbfe
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nvim/optionstr.c
View File

@@ -1467,6 +1467,34 @@ static void did_set_foldmarker(win_T *win, char **varp, char **errmsg)
} }
} }
static void did_set_commentstring(char **varp, char **errmsg)
{
if (**varp != NUL && strstr(*varp, "%s") == NULL) {
*errmsg = N_("E537: 'commentstring' must be empty or contain %s");
}
}
static void did_set_foldopen(char **errmsg)
{
if (opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, true) != OK) {
*errmsg = e_invarg;
}
}
static void did_set_foldclose(char **errmsg)
{
if (check_opt_strings(p_fcl, p_fcl_values, true) != OK) {
*errmsg = e_invarg;
}
}
static void did_set_foldignore(win_T *win)
{
if (foldmethodIsIndent(win)) {
foldUpdateAll(win);
}
}
static void did_set_virtualedit(win_T *win, int opt_flags, char *oldval, char **errmsg) static void did_set_virtualedit(win_T *win, int opt_flags, char *oldval, char **errmsg)
{ {
char *ve = p_ve; char *ve = p_ve;
@@ -1844,21 +1872,13 @@ char *did_set_string_option(int opt_idx, char **varp, char *oldval, char *errbuf
} else if (gvarp == &curwin->w_allbuf_opt.wo_fmr) { // 'foldmarker' } else if (gvarp == &curwin->w_allbuf_opt.wo_fmr) { // 'foldmarker'
did_set_foldmarker(curwin, varp, &errmsg); did_set_foldmarker(curwin, varp, &errmsg);
} else if (gvarp == &p_cms) { // 'commentstring' } else if (gvarp == &p_cms) { // 'commentstring'
if (**varp != NUL && strstr(*varp, "%s") == NULL) { did_set_commentstring(varp, &errmsg);
errmsg = N_("E537: 'commentstring' must be empty or contain %s");
}
} else if (varp == &p_fdo) { // 'foldopen' } else if (varp == &p_fdo) { // 'foldopen'
if (opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, true) != OK) { did_set_foldopen(&errmsg);
errmsg = e_invarg;
}
} else if (varp == &p_fcl) { // 'foldclose' } else if (varp == &p_fcl) { // 'foldclose'
if (check_opt_strings(p_fcl, p_fcl_values, true) != OK) { did_set_foldclose(&errmsg);
errmsg = e_invarg;
}
} else if (gvarp == &curwin->w_allbuf_opt.wo_fdi) { // 'foldignore' } else if (gvarp == &curwin->w_allbuf_opt.wo_fdi) { // 'foldignore'
if (foldmethodIsIndent(curwin)) { did_set_foldignore(curwin);
foldUpdateAll(curwin);
}
} else if (gvarp == &p_ve) { // 'virtualedit' } else if (gvarp == &p_ve) { // 'virtualedit'
did_set_virtualedit(curwin, opt_flags, oldval, &errmsg); did_set_virtualedit(curwin, opt_flags, oldval, &errmsg);
} else if (gvarp == &p_cino) { // 'cinoptions' } else if (gvarp == &p_cino) { // 'cinoptions'