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

patch 8.2.2667: prop_find() cannot find item matching both id and type

Browse Source 
Problem:    prop_find() cannot find item matching both id and type.
Solution:   Add the "both" argument. (Naohiro Ono, closes #8019)
This commit is contained in:
Bram Moolenaar
2021-03-27 22:07:29 +01:00
parent c580943965
commit 24f21fdfca
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/textprop.c
View File

@@ -600,6 +600,7 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
int lnum = -1;
int col = -1;
int dir = 1; // 1 = forward, -1 = backward
int both;
if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL)
{
@@ -661,11 +662,17 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
return;
type_id = type->pt_id;
}
both = dict_get_bool(dict, (char_u *)"both", FALSE);
if (id == -1 && type_id == -1)
{
emsg(_("E968: Need at least one of 'id' or 'type'"));
return;
}
if (both && (id == -1 || type_id == -1))
{
emsg(_("E860: Need 'id' and 'type' with 'both'"));
return;
}
lnum_start = lnum;
@@ -698,7 +705,8 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col)
continue;
}
if (prop.tp_id == id || prop.tp_type == type_id)
if (both ? prop.tp_id == id && prop.tp_type == type_id
: prop.tp_id == id || prop.tp_type == type_id)
{
// Check if the starting position has text props.
if (lnum_start == lnum