thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1293: the set_num_option() is too long

Browse Source 
Problem:    The set_num_option() is too long.
Solution:   Move code to separate functions. (Yegappan Lakshmanan,
            closes #11954)
This commit is contained in:
Yegappan Lakshmanan
2023-02-09 12:23:17 +00:00
committed by Bram Moolenaar
parent 313e4724c3
commit 0caaf1e465
2 changed files with 558 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

457
src/option.c
View File

@@ -540,7 +540,7 @@ static char_u *fencs_utf8_default = (char_u *)"ucs-bom,utf-8,default,latin1";
* utf-8. * utf-8.
*/ */
void void
set_fencs_unicode() set_fencs_unicode(void)
{ {
set_string_option_direct((char_u *)"fencs", -1, fencs_utf8_default, set_string_option_direct((char_u *)"fencs", -1, fencs_utf8_default,
OPT_FREE, 0); OPT_FREE, 0);
@@ -3479,74 +3479,11 @@ set_bool_option(
} }
/* /*
* Set the value of a number option, and take care of side effects. * Process the new 'winheight' or the 'helpheight' option value.
* Returns NULL for success, or an error message for an error.
*/ */
static char * static char *
set_num_option( did_set_winheight_helpheight(long *pp, char *errmsg)
int opt_idx, // index in options[] table
char_u *varp, // pointer to the option variable
long value, // new value
char *errbuf, // buffer for error messages
size_t errbuflen, // length of "errbuf"
int opt_flags) // OPT_LOCAL, OPT_GLOBAL,
// OPT_MODELINE, etc.
{ {
char *errmsg = NULL;
long old_value = *(long *)varp;
#if defined(FEAT_EVAL)
long old_global_value = 0; // only used when setting a local and
// global option
#endif
long old_Rows = Rows; // remember old Rows
long old_Columns = Columns; // remember old Columns
long *pp = (long *)varp;
// Disallow changing some options from secure mode.
if ((secure
#ifdef HAVE_SANDBOX
|| sandbox != 0
#endif
) && (options[opt_idx].flags & P_SECURE))
return e_not_allowed_here;
#if defined(FEAT_EVAL)
// Save the global value before changing anything. This is needed as for
// a global-only option setting the "local value" in fact sets the global
// value (since there is only one value).
if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)
old_global_value = *(long *)get_varp_scope(&(options[opt_idx]),
OPT_GLOBAL);
#endif
*pp = value;
#ifdef FEAT_EVAL
// Remember where the option was set.
set_option_sctx_idx(opt_idx, opt_flags, current_sctx);
#endif
#ifdef FEAT_GUI
need_mouse_correct = TRUE;
#endif
if (curbuf->b_p_sw < 0)
{
errmsg = e_argument_must_be_positive;
#ifdef FEAT_VARTABS
// Use the first 'vartabstop' value, or 'tabstop' if vts isn't in use.
curbuf->b_p_sw = tabstop_count(curbuf->b_p_vts_array) > 0
? tabstop_first(curbuf->b_p_vts_array)
: curbuf->b_p_ts;
#else
curbuf->b_p_sw = curbuf->b_p_ts;
#endif
}
/*
* Number options that need some action when changed
*/
if (pp == &p_wh || pp == &p_hh)
{
// 'winheight' and 'helpheight'
if (p_wh < 1) if (p_wh < 1)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3571,10 +3508,16 @@ set_num_option(
if (pp == &p_hh && curbuf->b_help && curwin->w_height < p_hh) if (pp == &p_hh && curbuf->b_help && curwin->w_height < p_hh)
win_setheight((int)p_hh); win_setheight((int)p_hh);
} }
return errmsg;
} }
else if (pp == &p_wmh)
/*
* Process the new 'winminheight' option value.
*/
static char *
did_set_winminheight(char *errmsg)
{ {
// 'winminheight'
if (p_wmh < 0) if (p_wmh < 0)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3586,10 +3529,16 @@ set_num_option(
p_wmh = p_wh; p_wmh = p_wh;
} }
win_setminheight(); win_setminheight();
return errmsg;
} }
else if (pp == &p_wiw)
/*
* Process the new 'winwidth' option value.
*/
static char *
did_set_winwidth(char *errmsg)
{ {
// 'winwidth'
if (p_wiw < 1) if (p_wiw < 1)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3604,10 +3553,16 @@ set_num_option(
// Change window width NOW // Change window width NOW
if (!ONE_WINDOW && curwin->w_width < p_wiw) if (!ONE_WINDOW && curwin->w_width < p_wiw)
win_setwidth((int)p_wiw); win_setwidth((int)p_wiw);
return errmsg;
} }
else if (pp == &p_wmw)
/*
* Process the new 'winminwidth' option value.
*/
static char *
did_set_winminwidth(char *errmsg)
{ {
// 'winminwidth'
if (p_wmw < 0) if (p_wmw < 0)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3619,22 +3574,34 @@ set_num_option(
p_wmw = p_wiw; p_wmw = p_wiw;
} }
win_setminwidth(); win_setminwidth();
return errmsg;
} }
// (re)set last window status line /*
else if (pp == &p_ls) * Process the new 'laststatus' option value.
*/
static void
did_set_laststatus(void)
{ {
last_status(FALSE); last_status(FALSE); // (re)set last window status line
} }
// (re)set tab page line /*
else if (pp == &p_stal) * Process the new 'showtabline' option value.
*/
static void
did_set_showtabline(void)
{ {
shell_new_rows(); // recompute window positions and heights shell_new_rows(); // recompute window positions and heights
} }
#ifdef FEAT_GUI #ifdef FEAT_GUI
else if (pp == &p_linespace) /*
* Process the new 'linespace' option value.
*/
static void
did_set_linespace(void)
{ {
// Recompute gui.char_height and resize the Vim window to keep the // Recompute gui.char_height and resize the Vim window to keep the
// same number of lines. // same number of lines.
@@ -3644,29 +3611,41 @@ set_num_option(
#endif #endif
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
// 'foldlevel' /*
else if (pp == &curwin->w_p_fdl) * Process the new 'foldlevel' option value.
*/
static void
did_set_foldlevel(void)
{ {
if (curwin->w_p_fdl < 0) if (curwin->w_p_fdl < 0)
curwin->w_p_fdl = 0; curwin->w_p_fdl = 0;
newFoldLevel(); newFoldLevel();
} }
// 'foldminlines' /*
else if (pp == &curwin->w_p_fml) * Process the new 'foldminlines' option value.
*/
static void
did_set_foldminlines(void)
{ {
foldUpdateAll(curwin); foldUpdateAll(curwin);
} }
// 'foldnestmax' /*
else if (pp == &curwin->w_p_fdn) * Process the new 'foldnestmax' option value.
*/
static void
did_set_foldnestmax(void)
{ {
if (foldmethodIsSyntax(curwin) || foldmethodIsIndent(curwin)) if (foldmethodIsSyntax(curwin) || foldmethodIsIndent(curwin))
foldUpdateAll(curwin); foldUpdateAll(curwin);
} }
// 'foldcolumn' /*
else if (pp == &curwin->w_p_fdc) * Process the new 'foldcolumn' option value.
*/
static char *
did_set_foldcolumn(char *errmsg)
{ {
if (curwin->w_p_fdc < 0) if (curwin->w_p_fdc < 0)
{ {
@@ -3678,11 +3657,16 @@ set_num_option(
errmsg = e_invalid_argument; errmsg = e_invalid_argument;
curwin->w_p_fdc = 12; curwin->w_p_fdc = 12;
} }
}
#endif // FEAT_FOLDING
// 'shiftwidth' or 'tabstop' return errmsg;
else if (pp == &curbuf->b_p_sw || pp == &curbuf->b_p_ts) }
#endif
/*
* Process the new 'shiftwidth' or the 'tabstop' option value.
*/
static void
did_set_shiftwidth_tabstop(long *pp)
{ {
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
if (foldmethodIsIndent(curwin)) if (foldmethodIsIndent(curwin))
@@ -3694,8 +3678,11 @@ set_num_option(
parse_cino(curbuf); parse_cino(curbuf);
} }
// 'maxcombine' /*
else if (pp == &p_mco) * Process the new 'maxcombine' option value.
*/
static void
did_set_maxcombine(void)
{ {
if (p_mco > MAX_MCO) if (p_mco > MAX_MCO)
p_mco = MAX_MCO; p_mco = MAX_MCO;
@@ -3704,7 +3691,11 @@ set_num_option(
screenclear(); // will re-allocate the screen screenclear(); // will re-allocate the screen
} }
else if (pp == &curbuf->b_p_iminsert) /*
* Process the new 'iminsert' option value.
*/
static char *
did_set_iminsert(char *errmsg)
{ {
if (curbuf->b_p_iminsert < 0 || curbuf->b_p_iminsert > B_IMODE_LAST) if (curbuf->b_p_iminsert < 0 || curbuf->b_p_iminsert > B_IMODE_LAST)
{ {
@@ -3718,18 +3709,29 @@ set_num_option(
// Show/unshow value of 'keymap' in status lines. // Show/unshow value of 'keymap' in status lines.
status_redraw_curbuf(); status_redraw_curbuf();
#endif #endif
return errmsg;
} }
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
// 'imstyle' /*
else if (pp == &p_imst) * Process the new 'imstyle' option value.
*/
static char *
did_set_imstyle(char *errmsg)
{ {
if (p_imst != IM_ON_THE_SPOT && p_imst != IM_OVER_THE_SPOT) if (p_imst != IM_ON_THE_SPOT && p_imst != IM_OVER_THE_SPOT)
errmsg = e_invalid_argument; errmsg = e_invalid_argument;
return errmsg;
} }
#endif #endif
else if (pp == &p_window) /*
* Process the new 'window' option value.
*/
static void
did_set_window(void)
{ {
if (p_window < 1) if (p_window < 1)
p_window = 1; p_window = 1;
@@ -3737,7 +3739,11 @@ set_num_option(
p_window = Rows - 1; p_window = Rows - 1;
} }
else if (pp == &curbuf->b_p_imsearch) /*
* Process the new 'imsearch' option value.
*/
static char *
did_set_imsearch(char *errmsg)
{ {
if (curbuf->b_p_imsearch < -1 || curbuf->b_p_imsearch > B_IMODE_LAST) if (curbuf->b_p_imsearch < -1 || curbuf->b_p_imsearch > B_IMODE_LAST)
{ {
@@ -3745,11 +3751,17 @@ set_num_option(
curbuf->b_p_imsearch = B_IMODE_NONE; curbuf->b_p_imsearch = B_IMODE_NONE;
} }
p_imsearch = curbuf->b_p_imsearch; p_imsearch = curbuf->b_p_imsearch;
return errmsg;
} }
// if 'titlelen' has changed, redraw the title /*
else if (pp == &p_titlelen) * Process the new 'titlelen' option value.
*/
static char *
did_set_titlelen(long old_value, char *errmsg)
{ {
// if 'titlelen' has changed, redraw the title
if (p_titlelen < 0) if (p_titlelen < 0)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3757,11 +3769,17 @@ set_num_option(
} }
if (starting != NO_SCREEN && old_value != p_titlelen) if (starting != NO_SCREEN && old_value != p_titlelen)
need_maketitle = TRUE; need_maketitle = TRUE;
return errmsg;
} }
// if p_ch changed value, change the command line height /*
else if (pp == &p_ch) * Process the new 'cmdheight' option value.
*/
static char *
did_set_cmdheight(long old_value, char *errmsg)
{ {
// if p_ch changed value, change the command line height
if (p_ch < 1) if (p_ch < 1)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3780,11 +3798,17 @@ set_num_option(
#endif #endif
) )
command_height(); command_height();
return errmsg;
} }
// when 'updatecount' changes from zero to non-zero, open swap files /*
else if (pp == &p_uc) * Process the new 'updatecount' option value.
*/
static char *
did_set_updatecount(long old_value, char *errmsg)
{ {
// when 'updatecount' changes from zero to non-zero, open swap files
if (p_uc < 0) if (p_uc < 0)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3792,9 +3816,16 @@ set_num_option(
} }
if (p_uc && !old_value) if (p_uc && !old_value)
ml_open_files(); ml_open_files();
return errmsg;
} }
#ifdef FEAT_CONCEAL #ifdef FEAT_CONCEAL
else if (pp == &curwin->w_p_cole) /*
* Process the new 'conceallevel' option value.
*/
static char *
did_set_conceallevel(char *errmsg)
{ {
if (curwin->w_p_cole < 0) if (curwin->w_p_cole < 0)
{ {
@@ -3806,31 +3837,44 @@ set_num_option(
errmsg = e_invalid_argument; errmsg = e_invalid_argument;
curwin->w_p_cole = 3; curwin->w_p_cole = 3;
} }
return errmsg;
} }
#endif #endif
#ifdef MZSCHEME_GUI_THREADS
else if (pp == &p_mzq)
mzvim_reset_timer();
#endif
#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) #if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3)
// 'pyxversion' /*
else if (pp == &p_pyx) * Process the new 'pyxversion' option value.
*/
static char *
did_set_pyxversion(char *errmsg)
{ {
if (p_pyx != 0 && p_pyx != 2 && p_pyx != 3) if (p_pyx != 0 && p_pyx != 2 && p_pyx != 3)
errmsg = e_invalid_argument; errmsg = e_invalid_argument;
return errmsg;
} }
#endif #endif
// sync undo before 'undolevels' changes /*
else if (pp == &p_ul) * Process the new global 'undolevels' option value.
*/
static void
did_set_global_undolevels(long value, long old_value)
{ {
// sync undo before 'undolevels' changes
// use the old value, otherwise u_sync() may not work properly // use the old value, otherwise u_sync() may not work properly
p_ul = old_value; p_ul = old_value;
u_sync(TRUE); u_sync(TRUE);
p_ul = value; p_ul = value;
} }
else if (pp == &curbuf->b_p_ul)
/*
* Process the new buffer local 'undolevels' option value.
*/
static void
did_set_buflocal_undolevels(long value, long old_value)
{ {
// use the old value, otherwise u_sync() may not work properly // use the old value, otherwise u_sync() may not work properly
curbuf->b_p_ul = old_value; curbuf->b_p_ul = old_value;
@@ -3839,9 +3883,13 @@ set_num_option(
} }
#ifdef FEAT_LINEBREAK #ifdef FEAT_LINEBREAK
// 'numberwidth' must be positive /*
else if (pp == &curwin->w_p_nuw) * Process the new 'numberwidth' option value.
*/
static char *
did_set_numberwidth(char *errmsg)
{ {
// 'numberwidth' must be positive
if (curwin->w_p_nuw < 1) if (curwin->w_p_nuw < 1)
{ {
errmsg = e_argument_must_be_positive; errmsg = e_argument_must_be_positive;
@@ -3853,10 +3901,16 @@ set_num_option(
curwin->w_p_nuw = 20; curwin->w_p_nuw = 20;
} }
curwin->w_nrwidth_line_count = 0; // trigger a redraw curwin->w_nrwidth_line_count = 0; // trigger a redraw
return errmsg;
} }
#endif #endif
else if (pp == &curbuf->b_p_tw) /*
* Process the new 'textwidth' option value.
*/
static char *
did_set_textwidth(char *errmsg)
{ {
if (curbuf->b_p_tw < 0) if (curbuf->b_p_tw < 0)
{ {
@@ -3872,11 +3926,103 @@ set_num_option(
check_colorcolumn(wp); check_colorcolumn(wp);
} }
#endif #endif
return errmsg;
} }
/* /*
* Check the bounds for numeric options here * When some number options are changed, need to take some action.
*/ */
static char *
did_set_num_option(long *pp, long value, long old_value, char *errmsg)
{
if (pp == &p_wh // 'winheight'
|| pp == &p_hh) // 'helpheight'
errmsg = did_set_winheight_helpheight(pp, errmsg);
else if (pp == &p_wmh) // 'winminheight'
errmsg = did_set_winminheight(errmsg);
else if (pp == &p_wiw) // 'winwidth'
errmsg = did_set_winwidth(errmsg);
else if (pp == &p_wmw) // 'winminwidth'
errmsg = did_set_winminwidth(errmsg);
else if (pp == &p_ls)
did_set_laststatus(); // 'laststatus'
else if (pp == &p_stal)
did_set_showtabline(); // 'showtabline'
#ifdef FEAT_GUI
else if (pp == &p_linespace) // 'linespace'
did_set_linespace();
#endif
#ifdef FEAT_FOLDING
else if (pp == &curwin->w_p_fdl) // 'foldlevel'
did_set_foldlevel();
else if (pp == &curwin->w_p_fml) // 'foldminlines'
did_set_foldminlines();
else if (pp == &curwin->w_p_fdn) // 'foldnestmax'
did_set_foldnestmax();
else if (pp == &curwin->w_p_fdc) // 'foldcolumn'
errmsg = did_set_foldcolumn(errmsg);
#endif // FEAT_FOLDING
else if ( pp == &curbuf->b_p_sw // 'shiftwidth'
|| pp == &curbuf->b_p_ts) // 'tabstop'
did_set_shiftwidth_tabstop(pp);
else if (pp == &p_mco) // 'maxcombine'
did_set_maxcombine();
else if (pp == &curbuf->b_p_iminsert) // 'iminsert'
errmsg = did_set_iminsert(errmsg);
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
else if (pp == &p_imst) // 'imstyle'
errmsg = did_set_imstyle(errmsg);
#endif
else if (pp == &p_window) // 'window'
did_set_window();
else if (pp == &curbuf->b_p_imsearch) // 'imsearch'
errmsg = did_set_imsearch(errmsg);
else if (pp == &p_titlelen) // 'titlelen'
errmsg = did_set_titlelen(old_value, errmsg);
else if (pp == &p_ch) // 'cmdheight'
errmsg = did_set_cmdheight(old_value, errmsg);
else if (pp == &p_uc) // 'updatecount'
errmsg = did_set_updatecount(old_value, errmsg);
#ifdef FEAT_CONCEAL
else if (pp == &curwin->w_p_cole) // 'conceallevel'
errmsg = did_set_conceallevel(errmsg);
#endif
#ifdef MZSCHEME_GUI_THREADS
else if (pp == &p_mzq) // 'mzquantum'
mzvim_reset_timer();
#endif
#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3)
else if (pp == &p_pyx) // 'pyxversion'
errmsg = did_set_pyxversion(errmsg);
#endif
else if (pp == &p_ul) // global 'undolevels'
did_set_global_undolevels(value, old_value);
else if (pp == &curbuf->b_p_ul) // buffer local 'undolevels'
did_set_buflocal_undolevels(value, old_value);
#ifdef FEAT_LINEBREAK
else if (pp == &curwin->w_p_nuw) // 'numberwidth'
errmsg = did_set_numberwidth(errmsg);
#endif
else if (pp == &curbuf->b_p_tw) // 'textwidth'
errmsg = did_set_textwidth(errmsg);
return errmsg;
}
/*
* Check the bounds of numeric options.
*/
static char *
check_num_option_bounds(
long *pp,
long old_value,
long old_Rows,
long old_Columns,
char *errbuf,
size_t errbuflen,
char *errmsg)
{
if (Rows < min_rows() && full_screen) if (Rows < min_rows() && full_screen)
{ {
if (errbuf != NULL) if (errbuf != NULL)
@@ -4015,6 +4161,83 @@ set_num_option(
p_ss = 0; p_ss = 0;
} }
return errmsg;
}
/*
* Set the value of a number option, and take care of side effects.
* Returns NULL for success, or an error message for an error.
*/
static char *
set_num_option(
int opt_idx, // index in options[] table
char_u *varp, // pointer to the option variable
long value, // new value
char *errbuf, // buffer for error messages
size_t errbuflen, // length of "errbuf"
int opt_flags) // OPT_LOCAL, OPT_GLOBAL,
// OPT_MODELINE, etc.
{
char *errmsg = NULL;
long old_value = *(long *)varp;
#if defined(FEAT_EVAL)
long old_global_value = 0; // only used when setting a local and
// global option
#endif
long old_Rows = Rows; // remember old Rows
long old_Columns = Columns; // remember old Columns
long *pp = (long *)varp;
// Disallow changing some options from secure mode.
if ((secure
#ifdef HAVE_SANDBOX
|| sandbox != 0
#endif
) && (options[opt_idx].flags & P_SECURE))
return e_not_allowed_here;
#if defined(FEAT_EVAL)
// Save the global value before changing anything. This is needed as for
// a global-only option setting the "local value" in fact sets the global
// value (since there is only one value).
if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)
old_global_value = *(long *)get_varp_scope(&(options[opt_idx]),
OPT_GLOBAL);
#endif
*pp = value;
#ifdef FEAT_EVAL
// Remember where the option was set.
set_option_sctx_idx(opt_idx, opt_flags, current_sctx);
#endif
#ifdef FEAT_GUI
need_mouse_correct = TRUE;
#endif
if (curbuf->b_p_sw < 0)
{
errmsg = e_argument_must_be_positive;
#ifdef FEAT_VARTABS
// Use the first 'vartabstop' value, or 'tabstop' if vts isn't in use.
curbuf->b_p_sw = tabstop_count(curbuf->b_p_vts_array) > 0
? tabstop_first(curbuf->b_p_vts_array)
: curbuf->b_p_ts;
#else
curbuf->b_p_sw = curbuf->b_p_ts;
#endif
}
/*
* Number options that need some action when changed
*/
errmsg = did_set_num_option(pp, value, old_value, errmsg);
/*
* Check the bounds for numeric options here
*/
errmsg = check_num_option_bounds(pp, old_value, old_Rows, old_Columns,
errbuf, errbuflen, errmsg);
// May set global value for local option. // May set global value for local option.
if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0) if ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0)
*(long *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) = *pp; *(long *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) = *pp;

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1293,
/**/ /**/
1292, 1292,
/**/ /**/