Mercurial > vim
changeset 14407:631344964949 v8.1.0218
patch 8.1.0218: cannot add matches to another window
commit https://github.com/vim/vim/commit/95e51470f10e1ddcc4b2ce53e4f7ff7aa2e58417
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 28 16:55:56 2018 +0200
patch 8.1.0218: cannot add matches to another window
Problem: Cannot add matches to another window. (Qiming Zhao)
Solution: Add the "window" argument to matchadd() and matchaddpos().
(closes #3260)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 28 Jul 2018 17:00:05 +0200 |
parents | 9b4fa7ed95a0 |
children | 91bc4a6e3a4e |
files | runtime/doc/eval.txt src/evalfunc.c src/testdir/test_match.vim src/version.c |
diffstat | 4 files changed, 68 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6016,7 +6016,7 @@ match({expr}, {pat} [, {start} [, {count the pattern. 'smartcase' is NOT used. The matching is always done like 'magic' is set and 'cpoptions' is empty. - *matchadd()* *E798* *E799* *E801* + *matchadd()* *E798* *E799* *E801* *E957* matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]]) Defines a pattern to be highlighted in the current window (a "match"). It will be highlighted with {group}. Returns an @@ -6055,6 +6055,8 @@ matchadd({group}, {pattern} [, {priority conceal Special character to show instead of the match (only for |hl-Conceal| highlighted matches, see |:syn-cchar|) + window Instead of the current window use the + window with this number or window ID. The number of matches is not limited, as it is the case with the |:match| commands.
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7988,6 +7988,36 @@ f_match(typval_T *argvars, typval_T *ret find_some_match(argvars, rettv, MATCH_MATCH); } +#ifdef FEAT_SEARCH_EXTRA + static int +matchadd_dict_arg(typval_T *tv, char_u **conceal_char, win_T **win) +{ + dictitem_T *di; + + if (tv->v_type != VAR_DICT) + { + EMSG(_(e_dictreq)); + return FAIL; + } + + if (dict_find(tv->vval.v_dict, (char_u *)"conceal", -1) != NULL) + *conceal_char = get_dict_string(tv->vval.v_dict, + (char_u *)"conceal", FALSE); + + if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) != NULL) + { + *win = find_win_by_nr(&di->di_tv, NULL); + if (*win == NULL) + { + EMSG(_("E957: Invalid window number")); + return FAIL; + } + } + + return OK; +} +#endif + /* * "matchadd()" function */ @@ -8002,6 +8032,7 @@ f_matchadd(typval_T *argvars UNUSED, typ int id = -1; int error = FALSE; char_u *conceal_char = NULL; + win_T *win = curwin; rettv->vval.v_number = -1; @@ -8013,18 +8044,9 @@ f_matchadd(typval_T *argvars UNUSED, typ if (argvars[3].v_type != VAR_UNKNOWN) { id = (int)get_tv_number_chk(&argvars[3], &error); - if (argvars[4].v_type != VAR_UNKNOWN) - { - if (argvars[4].v_type != VAR_DICT) - { - EMSG(_(e_dictreq)); - return; - } - if (dict_find(argvars[4].vval.v_dict, - (char_u *)"conceal", -1) != NULL) - conceal_char = get_dict_string(argvars[4].vval.v_dict, - (char_u *)"conceal", FALSE); - } + if (argvars[4].v_type != VAR_UNKNOWN + && matchadd_dict_arg(&argvars[4], &conceal_char, &win) == FAIL) + return; } } if (error == TRUE) @@ -8035,7 +8057,7 @@ f_matchadd(typval_T *argvars UNUSED, typ return; } - rettv->vval.v_number = match_add(curwin, grp, pat, prio, id, NULL, + rettv->vval.v_number = match_add(win, grp, pat, prio, id, NULL, conceal_char); #endif } @@ -8054,6 +8076,7 @@ f_matchaddpos(typval_T *argvars UNUSED, int error = FALSE; list_T *l; char_u *conceal_char = NULL; + win_T *win = curwin; rettv->vval.v_number = -1; @@ -8076,18 +8099,10 @@ f_matchaddpos(typval_T *argvars UNUSED, if (argvars[3].v_type != VAR_UNKNOWN) { id = (int)get_tv_number_chk(&argvars[3], &error); - if (argvars[4].v_type != VAR_UNKNOWN) - { - if (argvars[4].v_type != VAR_DICT) - { - EMSG(_(e_dictreq)); - return; - } - if (dict_find(argvars[4].vval.v_dict, - (char_u *)"conceal", -1) != NULL) - conceal_char = get_dict_string(argvars[4].vval.v_dict, - (char_u *)"conceal", FALSE); - } + + if (argvars[4].v_type != VAR_UNKNOWN + && matchadd_dict_arg(&argvars[4], &conceal_char, &win) == FAIL) + return; } } if (error == TRUE) @@ -8100,7 +8115,7 @@ f_matchaddpos(typval_T *argvars UNUSED, return; } - rettv->vval.v_number = match_add(curwin, group, NULL, prio, id, l, + rettv->vval.v_number = match_add(win, group, NULL, prio, id, l, conceal_char); #endif }
--- a/src/testdir/test_match.vim +++ b/src/testdir/test_match.vim @@ -192,6 +192,28 @@ func Test_matchaddpos() set hlsearch& endfunc +func Test_matchaddpos_otherwin() + syntax on + new + call setline(1, ['12345', 'NP']) + let winid = win_getid() + + wincmd w + call matchadd('Search', '4', 10, -1, {'window': winid}) + call matchaddpos('Error', [[1,2], [2,2]], 10, -1, {'window': winid}) + redraw! + call assert_notequal(screenattr(1,2), 0) + call assert_notequal(screenattr(1,4), 0) + call assert_notequal(screenattr(2,2), 0) + call assert_equal(screenattr(1,2), screenattr(2,2)) + call assert_notequal(screenattr(1,2), screenattr(1,4)) + + wincmd w + bwipe! + call clearmatches() + syntax off +endfunc + func Test_matchaddpos_using_negative_priority() set hlsearch