mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(optionstr.c): break up did_option_listflags

Browse Source
This commit is contained in:
Lewis Russell
2023-01-25 10:20:45 +00:00
parent 38ed432164
commit b278e0740e
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/nvim/optionstr.c
View File

@@ -1533,30 +1533,14 @@ static void did_set_optexpr(buf_T *buf, win_T *win, char **varp, char **gvarp)
} }
} }
// handle options that are a list of flags. // handle option that is a list of flags.
static void did_set_option_listflags(buf_T *buf, win_T *win, char **varp, char *errbuf, static void did_set_option_listflag(char **varp, char *flags, char *errbuf, size_t errbuflen,
size_t errbuflen, char **errmsg) char **errmsg)
{ {
char *p = NULL; for (char *s = *varp; *s; s++) {
if (varp == &p_ww) { // 'whichwrap' if (vim_strchr(flags, *s) == NULL) {
p = WW_ALL; *errmsg = illegal_char(errbuf, errbuflen, *s);
} else if (varp == &p_shm) { // 'shortmess' break;
p = SHM_ALL;
} else if (varp == &(p_cpo)) { // 'cpoptions'
p = CPO_VI;
} else if (varp == &(buf->b_p_fo)) { // 'formatoptions'
p = FO_ALL;
} else if (varp == &win->w_p_cocu) { // 'concealcursor'
p = COCU_ALL;
} else if (varp == &p_mouse) { // 'mouse'
p = MOUSE_ALL;
}
if (p != NULL) {
for (char *s = *varp; *s; s++) {
if (vim_strchr(p, (uint8_t)(*s)) == NULL) {
*errmsg = illegal_char(errbuf, errbuflen, *s);
break;
}
} }
} }
} }
@@ -1871,8 +1855,18 @@ static char *did_set_string_option_for(buf_T *buf, win_T *win, int opt_idx, char
qf_process_qftf_option(&errmsg); qf_process_qftf_option(&errmsg);
} else if (gvarp == &p_tfu) { // 'tagfunc' } else if (gvarp == &p_tfu) { // 'tagfunc'
set_tagfunc_option(&errmsg); set_tagfunc_option(&errmsg);
} else { } else if (varp == &p_ww) { // 'whichwrap'
did_set_option_listflags(buf, win, varp, errbuf, errbuflen, &errmsg); did_set_option_listflag(varp, WW_ALL, errbuf, errbuflen, &errmsg);
} else if (varp == &p_shm) { // 'shortmess'
did_set_option_listflag(varp, SHM_ALL, errbuf, errbuflen, &errmsg);
} else if (varp == &(p_cpo)) { // 'cpoptions'
did_set_option_listflag(varp, CPO_VI, errbuf, errbuflen, &errmsg);
} else if (varp == &(buf->b_p_fo)) { // 'formatoptions'
did_set_option_listflag(varp, FO_ALL, errbuf, errbuflen, &errmsg);
} else if (varp == &win->w_p_cocu) { // 'concealcursor'
did_set_option_listflag(varp, COCU_ALL, errbuf, errbuflen, &errmsg);
} else if (varp == &p_mouse) { // 'mouse'
did_set_option_listflag(varp, MOUSE_ALL, errbuf, errbuflen, &errmsg);
} }
// If error detected, restore the previous value. // If error detected, restore the previous value.