Mercurial > vim
changeset 19601:67f39cb0a49c v8.2.0357
patch 8.2.0357: cannot delete a text property matching both id and type
Commit: https://github.com/vim/vim/commit/49b79bd4888341d527c95f2aa73ed953203ce2b6
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 5 21:52:55 2020 +0100
patch 8.2.0357: cannot delete a text property matching both id and type
Problem: Cannot delete a text property matching both id and type. (Axel
Forsman)
Solution: Add the "both" argument.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 05 Mar 2020 22:00:04 +0100 |
parents | 911eb7bbfebb |
children | 03c12433ae36 |
files | runtime/doc/textprop.txt src/testdir/test_textprop.vim src/textprop.c src/version.c |
diffstat | 4 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -231,6 +231,7 @@ prop_remove({props} [, {lnum} [, {lnum-e {props} is a dictionary with these fields: id remove text properties with this ID type remove text properties with this type name + both "id" and "type" must both match bufnr use this buffer instead of the current one all when TRUE remove all matching text properties, not just the first one
--- 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()
--- a/src/textprop.c +++ b/src/textprop.c @@ -796,6 +796,7 @@ f_prop_remove(typval_T *argvars, typval_ 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_ 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_ 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)) {