aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.1105: code is indented too much

Browse Source 
Problem:    Code is indented too much.
Solution:   Use an early return. (Yegappan Lakshmanan, closes #11756)
This commit is contained in:
Yegappan Lakshmanan
2022-12-27 19:54:52 +00:00
committed by Bram Moolenaar
parent 56310d38d8
commit 87c1cbbe98
4 changed files with 194 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/dict.c
View File

@@ -1270,50 +1270,52 @@ dict_extend_func(
return; return;
} }
d2 = argvars[1].vval.v_dict; d2 = argvars[1].vval.v_dict;
if ((is_new || !value_check_lock(d1->dv_lock, arg_errmsg, TRUE)) if (d2 == NULL)
&& d2 != NULL) return;
if (!is_new && value_check_lock(d1->dv_lock, arg_errmsg, TRUE))
return;
if (is_new)
{ {
if (is_new) d1 = dict_copy(d1, FALSE, TRUE, get_copyID());
{ if (d1 == NULL)
d1 = dict_copy(d1, FALSE, TRUE, get_copyID());
if (d1 == NULL)
return;
}
// Check the third argument.
if (argvars[2].v_type != VAR_UNKNOWN)
{
static char *(av[]) = {"keep", "force", "error"};
action = tv_get_string_chk(&argvars[2]);
if (action == NULL)
return;
for (i = 0; i < 3; ++i)
if (STRCMP(action, av[i]) == 0)
break;
if (i == 3)
{
semsg(_(e_invalid_argument_str), action);
return;
}
}
else
action = (char_u *)"force";
if (type != NULL && check_typval_arg_type(type, &argvars[1],
func_name, 2) == FAIL)
return; return;
dict_extend(d1, d2, action, func_name);
if (is_new)
{
rettv->v_type = VAR_DICT;
rettv->vval.v_dict = d1;
rettv->v_lock = FALSE;
}
else
copy_tv(&argvars[0], rettv);
} }
// Check the third argument.
if (argvars[2].v_type != VAR_UNKNOWN)
{
static char *(av[]) = {"keep", "force", "error"};
action = tv_get_string_chk(&argvars[2]);
if (action == NULL)
return;
for (i = 0; i < 3; ++i)
if (STRCMP(action, av[i]) == 0)
break;
if (i == 3)
{
semsg(_(e_invalid_argument_str), action);
return;
}
}
else
action = (char_u *)"force";
if (type != NULL && check_typval_arg_type(type, &argvars[1],
func_name, 2) == FAIL)
return;
dict_extend(d1, d2, action, func_name);
if (is_new)
{
rettv->v_type = VAR_DICT;
rettv->vval.v_dict = d1;
rettv->v_lock = FALSE;
}
else
copy_tv(&argvars[0], rettv);
} }
/* /*

110
src/edit.c
View File

@@ -1664,49 +1664,49 @@ edit_putchar(int c, int highlight)
{ {
int attr; int attr;
if (ScreenLines != NULL) if (ScreenLines == NULL)
{ return;
update_topline(); // just in case w_topline isn't valid
validate_cursor();
if (highlight)
attr = HL_ATTR(HLF_8);
else
attr = 0;
pc_row = W_WINROW(curwin) + curwin->w_wrow;
pc_col = curwin->w_wincol;
pc_status = PC_STATUS_UNSET;
#ifdef FEAT_RIGHTLEFT
if (curwin->w_p_rl)
{
pc_col += curwin->w_width - 1 - curwin->w_wcol;
if (has_mbyte)
{
int fix_col = mb_fix_col(pc_col, pc_row);
if (fix_col != pc_col) update_topline(); // just in case w_topline isn't valid
{ validate_cursor();
screen_putchar(' ', pc_row, fix_col, attr); if (highlight)
--curwin->w_wcol; attr = HL_ATTR(HLF_8);
pc_status = PC_STATUS_RIGHT; else
} attr = 0;
pc_row = W_WINROW(curwin) + curwin->w_wrow;
pc_col = curwin->w_wincol;
pc_status = PC_STATUS_UNSET;
#ifdef FEAT_RIGHTLEFT
if (curwin->w_p_rl)
{
pc_col += curwin->w_width - 1 - curwin->w_wcol;
if (has_mbyte)
{
int fix_col = mb_fix_col(pc_col, pc_row);
if (fix_col != pc_col)
{
screen_putchar(' ', pc_row, fix_col, attr);
--curwin->w_wcol;
pc_status = PC_STATUS_RIGHT;
} }
} }
else
#endif
{
pc_col += curwin->w_wcol;
if (mb_lefthalve(pc_row, pc_col))
pc_status = PC_STATUS_LEFT;
}
// save the character to be able to put it back
if (pc_status == PC_STATUS_UNSET)
{
screen_getbytes(pc_row, pc_col, pc_bytes, &pc_attr);
pc_status = PC_STATUS_SET;
}
screen_putchar(c, pc_row, pc_col, attr);
} }
else
#endif
{
pc_col += curwin->w_wcol;
if (mb_lefthalve(pc_row, pc_col))
pc_status = PC_STATUS_LEFT;
}
// save the character to be able to put it back
if (pc_status == PC_STATUS_UNSET)
{
screen_getbytes(pc_row, pc_col, pc_bytes, &pc_attr);
pc_status = PC_STATUS_SET;
}
screen_putchar(c, pc_row, pc_col, attr);
} }
#if defined(FEAT_JOB_CHANNEL) || defined(PROTO) #if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
@@ -1782,11 +1782,11 @@ display_dollar(colnr_T col_arg)
void void
undisplay_dollar(void) undisplay_dollar(void)
{ {
if (dollar_vcol >= 0) if (dollar_vcol < 0)
{ return;
dollar_vcol = -1;
redrawWinline(curwin, curwin->w_cursor.lnum); dollar_vcol = -1;
} redrawWinline(curwin, curwin->w_cursor.lnum);
} }
/* /*
@@ -2554,17 +2554,17 @@ set_last_insert(int c)
vim_free(last_insert); vim_free(last_insert);
last_insert = alloc(MB_MAXBYTES * 3 + 5); last_insert = alloc(MB_MAXBYTES * 3 + 5);
if (last_insert != NULL) if (last_insert == NULL)
{ return;
s = last_insert;
// Use the CTRL-V only when entering a special char s = last_insert;
if (c < ' ' || c == DEL) // Use the CTRL-V only when entering a special char
*s++ = Ctrl_V; if (c < ' ' || c == DEL)
s = add_char2buf(c, s); *s++ = Ctrl_V;
*s++ = ESC; s = add_char2buf(c, s);
*s++ = NUL; *s++ = ESC;
last_insert_skip = 0; *s++ = NUL;
} last_insert_skip = 0;
} }
#if defined(EXITFREE) || defined(PROTO) #if defined(EXITFREE) || defined(PROTO)

187
src/eval.c
View File

@@ -128,14 +128,15 @@ fill_evalarg_from_eap(evalarg_T *evalarg, exarg_T *eap, int skip)
{ {
init_evalarg(evalarg); init_evalarg(evalarg);
evalarg->eval_flags = skip ? 0 : EVAL_EVALUATE; evalarg->eval_flags = skip ? 0 : EVAL_EVALUATE;
if (eap != NULL)
if (eap == NULL)
return;
evalarg->eval_cstack = eap->cstack;
if (sourcing_a_script(eap) || eap->getline == get_list_line)
{ {
evalarg->eval_cstack = eap->cstack; evalarg->eval_getline = eap->getline;
if (sourcing_a_script(eap) || eap->getline == get_list_line) evalarg->eval_cookie = eap->cookie;
{
evalarg->eval_getline = eap->getline;
evalarg->eval_cookie = eap->cookie;
}
} }
} }
@@ -404,15 +405,15 @@ init_evalarg(evalarg_T *evalarg)
static void static void
free_eval_tofree_later(evalarg_T *evalarg) free_eval_tofree_later(evalarg_T *evalarg)
{ {
if (evalarg->eval_tofree != NULL) if (evalarg->eval_tofree == NULL)
{ return;
if (ga_grow(&evalarg->eval_tofree_ga, 1) == OK)
((char_u **)evalarg->eval_tofree_ga.ga_data) if (ga_grow(&evalarg->eval_tofree_ga, 1) == OK)
[evalarg->eval_tofree_ga.ga_len++] ((char_u **)evalarg->eval_tofree_ga.ga_data)
= evalarg->eval_tofree; [evalarg->eval_tofree_ga.ga_len++]
else = evalarg->eval_tofree;
vim_free(evalarg->eval_tofree); else
} vim_free(evalarg->eval_tofree);
} }
/* /*
@@ -421,39 +422,39 @@ free_eval_tofree_later(evalarg_T *evalarg)
void void
clear_evalarg(evalarg_T *evalarg, exarg_T *eap) clear_evalarg(evalarg_T *evalarg, exarg_T *eap)
{ {
if (evalarg != NULL) if (evalarg == NULL)
return;
garray_T *etga = &evalarg->eval_tofree_ga;
if (evalarg->eval_tofree != NULL || evalarg->eval_using_cmdline)
{ {
garray_T *etga = &evalarg->eval_tofree_ga; if (eap != NULL)
if (evalarg->eval_tofree != NULL || evalarg->eval_using_cmdline)
{ {
if (eap != NULL) // We may need to keep the original command line, e.g. for
{ // ":let" it has the variable names. But we may also need
// We may need to keep the original command line, e.g. for // the new one, "nextcmd" points into it. Keep both.
// ":let" it has the variable names. But we may also need vim_free(eap->cmdline_tofree);
// the new one, "nextcmd" points into it. Keep both. eap->cmdline_tofree = *eap->cmdlinep;
vim_free(eap->cmdline_tofree);
eap->cmdline_tofree = *eap->cmdlinep;
if (evalarg->eval_using_cmdline && etga->ga_len > 0) if (evalarg->eval_using_cmdline && etga->ga_len > 0)
{ {
// "nextcmd" points into the last line in eval_tofree_ga, // "nextcmd" points into the last line in eval_tofree_ga,
// need to keep it around. // need to keep it around.
--etga->ga_len; --etga->ga_len;
*eap->cmdlinep = ((char_u **)etga->ga_data)[etga->ga_len]; *eap->cmdlinep = ((char_u **)etga->ga_data)[etga->ga_len];
vim_free(evalarg->eval_tofree); vim_free(evalarg->eval_tofree);
}
else
*eap->cmdlinep = evalarg->eval_tofree;
} }
else else
vim_free(evalarg->eval_tofree); *eap->cmdlinep = evalarg->eval_tofree;
evalarg->eval_tofree = NULL;
} }
else
ga_clear_strings(etga); vim_free(evalarg->eval_tofree);
VIM_CLEAR(evalarg->eval_tofree_lambda); evalarg->eval_tofree = NULL;
} }
ga_clear_strings(etga);
VIM_CLEAR(evalarg->eval_tofree_lambda);
} }
/* /*
@@ -3219,16 +3220,16 @@ eval_addblob(typval_T *tv1, typval_T *tv2)
blob_T *b = blob_alloc(); blob_T *b = blob_alloc();
int i; int i;
if (b != NULL) if (b == NULL)
{ return;
for (i = 0; i < blob_len(b1); i++)
ga_append(&b->bv_ga, blob_get(b1, i));
for (i = 0; i < blob_len(b2); i++)
ga_append(&b->bv_ga, blob_get(b2, i));
clear_tv(tv1); for (i = 0; i < blob_len(b1); i++)
rettv_blob_set(tv1, b); ga_append(&b->bv_ga, blob_get(b1, i));
} for (i = 0; i < blob_len(b2); i++)
ga_append(&b->bv_ga, blob_get(b2, i));
clear_tv(tv1);
rettv_blob_set(tv1, b);
} }
/* /*
@@ -4818,13 +4819,13 @@ f_slice(typval_T *argvars, typval_T *rettv)
|| check_for_opt_number_arg(argvars, 2) == FAIL)) || check_for_opt_number_arg(argvars, 2) == FAIL))
return; return;
if (check_can_index(argvars, TRUE, FALSE) == OK) if (check_can_index(argvars, TRUE, FALSE) != OK)
{ return;
copy_tv(argvars, rettv);
eval_index_inner(rettv, TRUE, argvars + 1, copy_tv(argvars, rettv);
argvars[2].v_type == VAR_UNKNOWN ? NULL : argvars + 2, eval_index_inner(rettv, TRUE, argvars + 1,
TRUE, NULL, 0, FALSE); argvars[2].v_type == VAR_UNKNOWN ? NULL : argvars + 2,
} TRUE, NULL, 0, FALSE);
} }
/* /*
@@ -5045,31 +5046,31 @@ partial_free(partial_T *pt)
void void
partial_unref(partial_T *pt) partial_unref(partial_T *pt)
{ {
if (pt != NULL) if (pt == NULL)
return;
int done = FALSE;
if (--pt->pt_refcount <= 0)
partial_free(pt);
// If the reference count goes down to one, the funcstack may be the
// only reference and can be freed if no other partials reference it.
else if (pt->pt_refcount == 1)
{ {
int done = FALSE; // careful: if the funcstack is freed it may contain this partial
// and it gets freed as well
if (pt->pt_funcstack != NULL)
done = funcstack_check_refcount(pt->pt_funcstack);
if (--pt->pt_refcount <= 0) if (!done)
partial_free(pt);
// If the reference count goes down to one, the funcstack may be the
// only reference and can be freed if no other partials reference it.
else if (pt->pt_refcount == 1)
{ {
// careful: if the funcstack is freed it may contain this partial int depth;
// and it gets freed as well
if (pt->pt_funcstack != NULL)
done = funcstack_check_refcount(pt->pt_funcstack);
if (!done) for (depth = 0; depth < MAX_LOOP_DEPTH; ++depth)
{ if (pt->pt_loopvars[depth] != NULL
int depth; && loopvars_check_refcount(pt->pt_loopvars[depth]))
for (depth = 0; depth < MAX_LOOP_DEPTH; ++depth)
if (pt->pt_loopvars[depth] != NULL
&& loopvars_check_refcount(pt->pt_loopvars[depth]))
break; break;
}
} }
} }
} }
@@ -7225,23 +7226,23 @@ last_set_msg(sctx_T script_ctx)
{ {
char_u *p; char_u *p;
if (script_ctx.sc_sid != 0) if (script_ctx.sc_sid == 0)
return;
p = home_replace_save(NULL, get_scriptname(script_ctx.sc_sid));
if (p == NULL)
return;
verbose_enter();
msg_puts(_("\n\tLast set from "));
msg_puts((char *)p);
if (script_ctx.sc_lnum > 0)
{ {
p = home_replace_save(NULL, get_scriptname(script_ctx.sc_sid)); msg_puts(_(line_msg));
if (p != NULL) msg_outnum((long)script_ctx.sc_lnum);
{
verbose_enter();
msg_puts(_("\n\tLast set from "));
msg_puts((char *)p);
if (script_ctx.sc_lnum > 0)
{
msg_puts(_(line_msg));
msg_outnum((long)script_ctx.sc_lnum);
}
verbose_leave();
vim_free(p);
}
} }
verbose_leave();
vim_free(p);
} }
#endif // FEAT_EVAL #endif // FEAT_EVAL

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 */
/**/
1105,
/**/ /**/
1104, 1104,
/**/ /**/