forked from aniani/vim
patch 9.0.1795: Indentation issues
Problem: Indentation issues Solution: Fix code indentation issues. closes: #12906 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
committed by
Christian Brabandt
parent
74e1dada41
commit
d4e4ecbb37
@@ -4022,7 +4022,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
|
|||||||
{
|
{
|
||||||
xpc.xp_pattern = pat;
|
xpc.xp_pattern = pat;
|
||||||
xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
|
xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern);
|
||||||
xpc.xp_line = pat;
|
xpc.xp_line = pat;
|
||||||
|
|
||||||
xpc.xp_context = cmdcomplete_str_to_type(type);
|
xpc.xp_context = cmdcomplete_str_to_type(type);
|
||||||
if (xpc.xp_context == EXPAND_NOTHING)
|
if (xpc.xp_context == EXPAND_NOTHING)
|
||||||
@@ -4033,26 +4033,26 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
|
|||||||
|
|
||||||
if (xpc.xp_context == EXPAND_USER_DEFINED)
|
if (xpc.xp_context == EXPAND_USER_DEFINED)
|
||||||
{
|
{
|
||||||
// Must be "custom,funcname" pattern
|
// Must be "custom,funcname" pattern
|
||||||
if (STRNCMP(type, "custom,", 7) != 0)
|
if (STRNCMP(type, "custom,", 7) != 0)
|
||||||
{
|
{
|
||||||
semsg(_(e_invalid_argument_str), type);
|
semsg(_(e_invalid_argument_str), type);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
xpc.xp_arg = type + 7;
|
xpc.xp_arg = type + 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xpc.xp_context == EXPAND_USER_LIST)
|
if (xpc.xp_context == EXPAND_USER_LIST)
|
||||||
{
|
{
|
||||||
// Must be "customlist,funcname" pattern
|
// Must be "customlist,funcname" pattern
|
||||||
if (STRNCMP(type, "customlist,", 11) != 0)
|
if (STRNCMP(type, "customlist,", 11) != 0)
|
||||||
{
|
{
|
||||||
semsg(_(e_invalid_argument_str), type);
|
semsg(_(e_invalid_argument_str), type);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
xpc.xp_arg = type + 11;
|
xpc.xp_arg = type + 11;
|
||||||
}
|
}
|
||||||
|
|
||||||
# if defined(FEAT_MENU)
|
# if defined(FEAT_MENU)
|
||||||
|
@@ -4167,7 +4167,7 @@ get_cmdline_completion(void)
|
|||||||
|
|
||||||
char_u *cmd_compl = cmdcomplete_type_to_str(p->xpc->xp_context);
|
char_u *cmd_compl = cmdcomplete_type_to_str(p->xpc->xp_context);
|
||||||
if (cmd_compl == NULL)
|
if (cmd_compl == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (p->xpc->xp_context == EXPAND_USER_LIST || p->xpc->xp_context == EXPAND_USER_DEFINED)
|
if (p->xpc->xp_context == EXPAND_USER_LIST || p->xpc->xp_context == EXPAND_USER_DEFINED)
|
||||||
{
|
{
|
||||||
|
@@ -109,7 +109,7 @@ PyObject* Vim_PyObject_New(PyTypeObject *type, size_t objsize)
|
|||||||
{
|
{
|
||||||
PyObject *obj = (PyObject *)PyObject_Malloc(objsize);
|
PyObject *obj = (PyObject *)PyObject_Malloc(objsize);
|
||||||
if (obj == NULL)
|
if (obj == NULL)
|
||||||
return PyErr_NoMemory();
|
return PyErr_NoMemory();
|
||||||
return PyObject_Init(obj, type);
|
return PyObject_Init(obj, type);
|
||||||
}
|
}
|
||||||
# undef PyObject_NEW
|
# undef PyObject_NEW
|
||||||
@@ -270,7 +270,7 @@ int Vim_PyRun_SimpleString(const char *str)
|
|||||||
// This function emulates CPython's implementation.
|
// This function emulates CPython's implementation.
|
||||||
PyObject* m = PyImport_AddModule("__main__");
|
PyObject* m = PyImport_AddModule("__main__");
|
||||||
if (m == NULL)
|
if (m == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
PyObject* d = PyModule_GetDict(m);
|
PyObject* d = PyModule_GetDict(m);
|
||||||
PyObject* output = Vim_PyRun_String(str, Py_file_input, d, d);
|
PyObject* output = Vim_PyRun_String(str, Py_file_input, d, d);
|
||||||
if (output == NULL)
|
if (output == NULL)
|
||||||
|
@@ -817,7 +817,7 @@ apply_general_options(win_T *wp, dict_T *dict)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (set_padding_border(dict, wp->w_popup_padding, "padding", 999) == FAIL ||
|
if (set_padding_border(dict, wp->w_popup_padding, "padding", 999) == FAIL ||
|
||||||
set_padding_border(dict, wp->w_popup_border, "border", 1) == FAIL)
|
set_padding_border(dict, wp->w_popup_border, "border", 1) == FAIL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
|
|
||||||
di = dict_find(dict, (char_u *)"borderhighlight", -1);
|
di = dict_find(dict, (char_u *)"borderhighlight", -1);
|
||||||
|
@@ -2180,7 +2180,7 @@ qf_add_entry(
|
|||||||
qfp->qf_end_col = end_col;
|
qfp->qf_end_col = end_col;
|
||||||
qfp->qf_viscol = vis_col;
|
qfp->qf_viscol = vis_col;
|
||||||
if (user_data == NULL || user_data->v_type == VAR_UNKNOWN)
|
if (user_data == NULL || user_data->v_type == VAR_UNKNOWN)
|
||||||
qfp->qf_user_data.v_type = VAR_UNKNOWN;
|
qfp->qf_user_data.v_type = VAR_UNKNOWN;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
copy_tv(user_data, &qfp->qf_user_data);
|
copy_tv(user_data, &qfp->qf_user_data);
|
||||||
|
@@ -699,6 +699,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 */
|
||||||
|
/**/
|
||||||
|
1795,
|
||||||
/**/
|
/**/
|
||||||
1794,
|
1794,
|
||||||
/**/
|
/**/
|
||||||
|
@@ -96,8 +96,8 @@ parse_member(
|
|||||||
fill_evalarg_from_eap(&evalarg, eap, FALSE);
|
fill_evalarg_from_eap(&evalarg, eap, FALSE);
|
||||||
(void)skip_expr_concatenate(&init_arg, &expr_start, &expr_end, &evalarg);
|
(void)skip_expr_concatenate(&init_arg, &expr_start, &expr_end, &evalarg);
|
||||||
|
|
||||||
// No type specified for the member. Set it to "any" and the correct type will be
|
// No type specified for the member. Set it to "any" and the correct
|
||||||
// set when the object is instantiated.
|
// type will be set when the object is instantiated.
|
||||||
if (type == NULL)
|
if (type == NULL)
|
||||||
type = &t_any;
|
type = &t_any;
|
||||||
|
|
||||||
@@ -1743,7 +1743,7 @@ object_clear(object_T *obj)
|
|||||||
class_T *cl = obj->obj_class;
|
class_T *cl = obj->obj_class;
|
||||||
|
|
||||||
if (!cl)
|
if (!cl)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// the member values are just after the object structure
|
// the member values are just after the object structure
|
||||||
typval_T *tv = (typval_T *)(obj + 1);
|
typval_T *tv = (typval_T *)(obj + 1);
|
||||||
@@ -1914,8 +1914,8 @@ object_free_nonref(int copyID)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return TRUE when the class "cl", its base class or one of the implemented interfaces
|
* Return TRUE when the class "cl", its base class or one of the implemented
|
||||||
* matches the class "other_cl".
|
* interfaces matches the class "other_cl".
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
class_instance_of(class_T *cl, class_T *other_cl)
|
class_instance_of(class_T *cl, class_T *other_cl)
|
||||||
|
@@ -2075,7 +2075,7 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u *var_start, cctx_T *cctx)
|
|||||||
// Also for "obj.value".
|
// Also for "obj.value".
|
||||||
char_u *dot = vim_strchr(var_start, '.');
|
char_u *dot = vim_strchr(var_start, '.');
|
||||||
if (dot == NULL)
|
if (dot == NULL)
|
||||||
return FAIL;
|
return FAIL;
|
||||||
|
|
||||||
class_T *cl = lhs->lhs_type->tt_class;
|
class_T *cl = lhs->lhs_type->tt_class;
|
||||||
type_T *type = class_member_type(cl, dot + 1,
|
type_T *type = class_member_type(cl, dot + 1,
|
||||||
|
@@ -1804,11 +1804,11 @@ handle_viminfo_register(garray_T *values, int force)
|
|||||||
y_ptr->y_array[i] = vp[i + 6].bv_string;
|
y_ptr->y_array[i] = vp[i + 6].bv_string;
|
||||||
vp[i + 6].bv_string = NULL;
|
vp[i + 6].bv_string = NULL;
|
||||||
}
|
}
|
||||||
else if (vp[i + 6].bv_type != BVAL_STRING)
|
else if (vp[i + 6].bv_type != BVAL_STRING)
|
||||||
{
|
{
|
||||||
free(y_ptr->y_array);
|
free(y_ptr->y_array);
|
||||||
y_ptr->y_array = NULL;
|
y_ptr->y_array = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string);
|
y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user