diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-05 21:52:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-05 21:52:55 +0100 |
| commit | 49b79bd4888341d527c95f2aa73ed953203ce2b6 (patch) | |
| tree | d43e2c107c13b78845cf4e72670f696c21e88717 /src | |
| parent | 8f027fe470555252b258508c455e93700a969cb1 (diff) | |
| download | vim-git-49b79bd4888341d527c95f2aa73ed953203ce2b6.tar.gz | |
patch 8.2.0357: cannot delete a text property matching both id and typev8.2.0357
Problem: Cannot delete a text property matching both id and type. (Axel
Forsman)
Solution: Add the "both" argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_textprop.vim | 17 | ||||
| -rw-r--r-- | src/textprop.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index 6dbaa5350..0f28f0d37 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -270,6 +270,23 @@ func Test_prop_remove() call DeletePropTypes() bwipe! + + new + call AddPropTypes() + call SetupPropsInFirstLine() + call prop_add(1, 6, {'length': 2, 'id': 11, 'type': 'three'}) + let props = Get_expected_props() + call insert(props, {'col': 6, 'length': 2, 'id': 11, 'type': 'three', 'start': 1, 'end': 1}, 3) + call assert_equal(props, prop_list(1)) + call assert_equal(1, prop_remove({'type': 'three', 'id': 11, 'both': 1, 'all': 1}, 1)) + unlet props[3] + call assert_equal(props, prop_list(1)) + + call assert_fails("call prop_remove({'id': 11, 'both': 1})", 'E860') + call assert_fails("call prop_remove({'type': 'three', 'both': 1})", 'E860') + + call DeletePropTypes() + bwipe! endfunc func SetupOneLine() diff --git a/src/textprop.c b/src/textprop.c index 3ad84a242..2827af437 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -796,6 +796,7 @@ f_prop_remove(typval_T *argvars, typval_T *rettv) int do_all = FALSE; int id = -1; int type_id = -1; + int both = FALSE; rettv->vval.v_number = 0; if (argvars[0].v_type != VAR_DICT || argvars[0].vval.v_dict == NULL) @@ -838,11 +839,18 @@ f_prop_remove(typval_T *argvars, typval_T *rettv) return; type_id = type->pt_id; } + if (dict_find(dict, (char_u *)"both", -1) != NULL) + both = dict_get_number(dict, (char_u *)"both"); 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; + } if (end == 0) end = buf->b_ml.ml_line_count; @@ -868,7 +876,8 @@ f_prop_remove(typval_T *argvars, typval_T *rettv) size_t taillen; mch_memmove(&textprop, cur_prop, sizeof(textprop_T)); - if (textprop.tp_id == id || textprop.tp_type == type_id) + if (both ? textprop.tp_id == id && textprop.tp_type == type_id + : textprop.tp_id == id || textprop.tp_type == type_id) { if (!(buf->b_ml.ml_flags & ML_LINE_DIRTY)) { diff --git a/src/version.c b/src/version.c index 3e7115ba3..2e3b729aa 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 357, +/**/ 356, /**/ 355, |