Mercurial > vim
annotate src/match.c @ 32252:f99b85fc18e7 v9.0.1457
patch 9.0.1457: no regression test for what patch 9.0.1333 fixes
Commit: https://github.com/vim/vim/commit/ceff9cd1bb194f252c63da8e1c2dc7d6764d9d1f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 16 17:17:37 2023 +0100
patch 9.0.1457: no regression test for what patch 9.0.1333 fixes
Problem: No regression test for what patch 9.0.1333 fixes.
Solution: Extend existing test to cover the fixed problem. (issue https://github.com/vim/vim/issues/11930)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 16 Apr 2023 18:30:03 +0200 |
parents | 238ca27dbfd2 |
children | a357a624e487 |
rev | line source |
---|---|
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
2 * |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
3 * VIM - Vi IMproved by Bram Moolenaar |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
4 * |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
5 * Do ":help uganda" in Vim to read copying and usage conditions. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
6 * Do ":help credits" in Vim to see a list of people who contributed. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
7 * See README.txt for an overview of the Vim source code. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
8 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
9 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
10 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
11 * match.c: functions for highlighting matches |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
12 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
13 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
14 #include "vim.h" |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
15 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
16 #if defined(FEAT_SEARCH_EXTRA) || defined(PROTO) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
17 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
18 # define SEARCH_HL_PRIORITY 0 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
19 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
20 /* |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
21 * Add match to the match list of window "wp". |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
22 * If "pat" is not NULL the pattern will be highlighted with the group "grp" |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
23 * with priority "prio". |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
24 * If "pos_list" is not NULL the list of posisions defines the highlights. |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
25 * Optionally, a desired ID "id" can be specified (greater than or equal to 1). |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
26 * If no particular ID is desired, -1 must be specified for "id". |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
27 * Return ID of added match, -1 on failure. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
28 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
29 static int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
30 match_add( |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
31 win_T *wp, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
32 char_u *grp, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
33 char_u *pat, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
34 int prio, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
35 int id, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
36 list_T *pos_list, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
37 char_u *conceal_char UNUSED) // pointer to conceal replacement char |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
38 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
39 matchitem_T *cur; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
40 matchitem_T *prev; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
41 matchitem_T *m; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
42 int hlg_id; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
43 regprog_T *regprog = NULL; |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29442
diff
changeset
|
44 int rtype = UPD_SOME_VALID; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
45 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
46 if (*grp == NUL || (pat != NULL && *pat == NUL)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
47 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
48 if (id < -1 || id == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
49 { |
26964
5de60e0d65fa
patch 8.2.4011: test fails because of changed error number
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
50 semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_1), id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
51 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
52 } |
30574
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
53 if (id == -1) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
54 { |
30574
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
55 // use the next available match ID |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
56 id = wp->w_next_match_id++; |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
57 } |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
58 else |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
59 { |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
60 // check the given ID is not already in use |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
61 for (cur = wp->w_match_head; cur != NULL; cur = cur->mit_next) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
62 if (cur->mit_id == id) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
63 { |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
64 semsg(_(e_id_already_taken_nr), id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
65 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
66 } |
30574
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
67 |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
68 // Make sure the next match ID is always higher than the highest |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
69 // manually selected ID. Add some extra in case a few more IDs are |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
70 // added soon. |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
71 if (wp->w_next_match_id < id + 100) |
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
72 wp->w_next_match_id = id + 100; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
73 } |
30574
66de6909e102
patch 9.0.0622: matchaddpos() can get slow when adding many matches
Bram Moolenaar <Bram@vim.org>
parents:
30570
diff
changeset
|
74 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
75 if ((hlg_id = syn_namen2id(grp, (int)STRLEN(grp))) == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
76 { |
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
25302
diff
changeset
|
77 semsg(_(e_no_such_highlight_group_name_str), grp); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
78 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
79 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
80 if (pat != NULL && (regprog = vim_regcomp(pat, RE_MAGIC)) == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
81 { |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26823
diff
changeset
|
82 semsg(_(e_invalid_argument_str), pat); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
83 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
84 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
85 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
86 // Build new match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
87 m = ALLOC_CLEAR_ONE(matchitem_T); |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
88 if (m == NULL) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
89 return -1; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
90 if (pos_list != NULL) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
91 { |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
92 m->mit_pos_array = ALLOC_CLEAR_MULT(llpos_T, pos_list->lv_len); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
93 if (m->mit_pos_array == NULL) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
94 { |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
95 vim_free(m); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
96 return -1; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
97 } |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
98 m->mit_pos_count = pos_list->lv_len; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
99 } |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
100 m->mit_id = id; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
101 m->mit_priority = prio; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
102 m->mit_pattern = pat == NULL ? NULL : vim_strsave(pat); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
103 m->mit_hlg_id = hlg_id; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
104 m->mit_match.regprog = regprog; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
105 m->mit_match.rmm_ic = FALSE; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
106 m->mit_match.rmm_maxcol = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
107 # if defined(FEAT_CONCEAL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
108 m->mit_conceal_char = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
109 if (conceal_char != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
110 m->mit_conceal_char = (*mb_ptr2char)(conceal_char); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
111 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
112 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
113 // Set up position matches |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
114 if (pos_list != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
115 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
116 linenr_T toplnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
117 linenr_T botlnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
118 listitem_T *li; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
119 int i; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
120 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
121 CHECK_LIST_MATERIALIZE(pos_list); |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
122 for (i = 0, li = pos_list->lv_first; li != NULL; i++, li = li->li_next) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
123 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
124 linenr_T lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
125 colnr_T col = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
126 int len = 1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
127 list_T *subl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
128 listitem_T *subli; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
129 int error = FALSE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
130 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
131 if (li->li_tv.v_type == VAR_LIST) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
132 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
133 subl = li->li_tv.vval.v_list; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
134 if (subl == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
135 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
136 subli = subl->lv_first; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
137 if (subli == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
138 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
139 lnum = tv_get_number_chk(&subli->li_tv, &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
140 if (error == TRUE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
141 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
142 if (lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
143 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
144 --i; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
145 continue; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
146 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
147 m->mit_pos_array[i].lnum = lnum; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
148 subli = subli->li_next; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
149 if (subli != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
150 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
151 col = tv_get_number_chk(&subli->li_tv, &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
152 if (error == TRUE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
153 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
154 subli = subli->li_next; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
155 if (subli != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
156 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
157 len = tv_get_number_chk(&subli->li_tv, &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
158 if (error == TRUE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
159 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
160 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
161 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
162 m->mit_pos_array[i].col = col; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
163 m->mit_pos_array[i].len = len; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
164 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
165 else if (li->li_tv.v_type == VAR_NUMBER) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
166 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
167 if (li->li_tv.vval.v_number == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
168 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
169 --i; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
170 continue; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
171 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
172 m->mit_pos_array[i].lnum = li->li_tv.vval.v_number; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
173 m->mit_pos_array[i].col = 0; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
174 m->mit_pos_array[i].len = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
175 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
176 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
177 { |
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26887
diff
changeset
|
178 emsg(_(e_list_or_number_required)); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
179 goto fail; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
180 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
181 if (toplnum == 0 || lnum < toplnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
182 toplnum = lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
183 if (botlnum == 0 || lnum >= botlnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
184 botlnum = lnum + 1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
185 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
186 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
187 // Calculate top and bottom lines for redrawing area |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
188 if (toplnum != 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
189 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
190 if (wp->w_buffer->b_mod_set) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
191 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
192 if (wp->w_buffer->b_mod_top > toplnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
193 wp->w_buffer->b_mod_top = toplnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
194 if (wp->w_buffer->b_mod_bot < botlnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
195 wp->w_buffer->b_mod_bot = botlnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
196 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
197 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
198 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
199 wp->w_buffer->b_mod_set = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
200 wp->w_buffer->b_mod_top = toplnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
201 wp->w_buffer->b_mod_bot = botlnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
202 wp->w_buffer->b_mod_xlines = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
203 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
204 m->mit_toplnum = toplnum; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
205 m->mit_botlnum = botlnum; |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29442
diff
changeset
|
206 rtype = UPD_VALID; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
207 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
208 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
209 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
210 // Insert new match. The match list is in ascending order with regard to |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
211 // the match priorities. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
212 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
213 prev = cur; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
214 while (cur != NULL && prio >= cur->mit_priority) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
215 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
216 prev = cur; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
217 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
218 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
219 if (cur == prev) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
220 wp->w_match_head = m; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
221 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
222 prev->mit_next = m; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
223 m->mit_next = cur; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
224 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
225 redraw_win_later(wp, rtype); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
226 return id; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
227 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
228 fail: |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
229 vim_free(m->mit_pattern); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
230 vim_free(m->mit_pos_array); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
231 vim_free(m); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
232 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
233 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
234 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
235 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
236 * Delete match with ID 'id' in the match list of window 'wp'. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
237 * Print error messages if 'perr' is TRUE. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
238 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
239 static int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
240 match_delete(win_T *wp, int id, int perr) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
241 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
242 matchitem_T *cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
243 matchitem_T *prev = cur; |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29442
diff
changeset
|
244 int rtype = UPD_SOME_VALID; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
245 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
246 if (id < 1) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
247 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
248 if (perr == TRUE) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
249 semsg(_(e_invalid_id_nr_must_be_greater_than_or_equal_to_one_2), |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
250 id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
251 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
252 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
253 while (cur != NULL && cur->mit_id != id) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
254 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
255 prev = cur; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
256 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
257 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
258 if (cur == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
259 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
260 if (perr == TRUE) |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
261 semsg(_(e_id_not_found_nr), id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
262 return -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
263 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
264 if (cur == prev) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
265 wp->w_match_head = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
266 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
267 prev->mit_next = cur->mit_next; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
268 vim_regfree(cur->mit_match.regprog); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
269 vim_free(cur->mit_pattern); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
270 if (cur->mit_toplnum != 0) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
271 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
272 if (wp->w_buffer->b_mod_set) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
273 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
274 if (wp->w_buffer->b_mod_top > cur->mit_toplnum) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
275 wp->w_buffer->b_mod_top = cur->mit_toplnum; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
276 if (wp->w_buffer->b_mod_bot < cur->mit_botlnum) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
277 wp->w_buffer->b_mod_bot = cur->mit_botlnum; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
278 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
279 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
280 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
281 wp->w_buffer->b_mod_set = TRUE; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
282 wp->w_buffer->b_mod_top = cur->mit_toplnum; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
283 wp->w_buffer->b_mod_bot = cur->mit_botlnum; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
284 wp->w_buffer->b_mod_xlines = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
285 } |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29442
diff
changeset
|
286 rtype = UPD_VALID; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
287 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
288 vim_free(cur->mit_pos_array); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
289 vim_free(cur); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
290 redraw_win_later(wp, rtype); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
291 return 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
292 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
293 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
294 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
295 * Delete all matches in the match list of window 'wp'. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
296 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
297 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
298 clear_matches(win_T *wp) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
299 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
300 matchitem_T *m; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
301 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
302 while (wp->w_match_head != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
303 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
304 m = wp->w_match_head->mit_next; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
305 vim_regfree(wp->w_match_head->mit_match.regprog); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
306 vim_free(wp->w_match_head->mit_pattern); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
307 vim_free(wp->w_match_head->mit_pos_array); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
308 vim_free(wp->w_match_head); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
309 wp->w_match_head = m; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
310 } |
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29442
diff
changeset
|
311 redraw_win_later(wp, UPD_SOME_VALID); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
312 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
313 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
314 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
315 * Get match from ID 'id' in window 'wp'. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
316 * Return NULL if match not found. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
317 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
318 static matchitem_T * |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
319 get_match(win_T *wp, int id) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
320 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
321 matchitem_T *cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
322 |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
323 while (cur != NULL && cur->mit_id != id) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
324 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
325 return cur; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
326 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
327 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
328 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
329 * Init for calling prepare_search_hl(). |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
330 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
331 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
332 init_search_hl(win_T *wp, match_T *search_hl) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
333 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
334 matchitem_T *cur; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
335 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
336 // Setup for match and 'hlsearch' highlighting. Disable any previous |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
337 // match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
338 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
339 while (cur != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
340 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
341 cur->mit_hl.rm = cur->mit_match; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
342 if (cur->mit_hlg_id == 0) |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
343 cur->mit_hl.attr = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
344 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
345 cur->mit_hl.attr = syn_id2attr(cur->mit_hlg_id); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
346 cur->mit_hl.buf = wp->w_buffer; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
347 cur->mit_hl.lnum = 0; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
348 cur->mit_hl.first_lnum = 0; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
349 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
350 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
351 search_hl->buf = wp->w_buffer; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
352 search_hl->lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
353 search_hl->first_lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
354 // time limit is set at the toplevel, for all windows |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
355 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
356 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
357 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
358 * If there is a match fill "shl" and return one. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
359 * Return zero otherwise. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
360 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
361 static int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
362 next_search_hl_pos( |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
363 match_T *shl, // points to a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
364 linenr_T lnum, |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
365 matchitem_T *match, // match item with positions |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
366 colnr_T mincol) // minimal column for a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
367 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
368 int i; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
369 int found = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
370 |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
371 for (i = match->mit_pos_cur; i < match->mit_pos_count; i++) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
372 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
373 llpos_T *pos = &match->mit_pos_array[i]; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
374 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
375 if (pos->lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
376 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
377 if (pos->len == 0 && pos->col < mincol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
378 continue; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
379 if (pos->lnum == lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
380 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
381 if (found >= 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
382 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
383 // if this match comes before the one at "found" then swap them |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
384 if (pos->col < match->mit_pos_array[found].col) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
385 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
386 llpos_T tmp = *pos; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
387 |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
388 *pos = match->mit_pos_array[found]; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
389 match->mit_pos_array[found] = tmp; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
390 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
391 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
392 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
393 found = i; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
394 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
395 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
396 match->mit_pos_cur = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
397 if (found >= 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
398 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
399 colnr_T start = match->mit_pos_array[found].col == 0 |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
400 ? 0 : match->mit_pos_array[found].col - 1; |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
401 colnr_T end = match->mit_pos_array[found].col == 0 |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
402 ? MAXCOL : start + match->mit_pos_array[found].len; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
403 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
404 shl->lnum = lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
405 shl->rm.startpos[0].lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
406 shl->rm.startpos[0].col = start; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
407 shl->rm.endpos[0].lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
408 shl->rm.endpos[0].col = end; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
409 shl->is_addpos = TRUE; |
28469
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
410 shl->has_cursor = FALSE; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
411 match->mit_pos_cur = found + 1; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
412 return 1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
413 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
414 return 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
415 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
416 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
417 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
418 * Search for a next 'hlsearch' or match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
419 * Uses shl->buf. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
420 * Sets shl->lnum and shl->rm contents. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
421 * Note: Assumes a previous match is always before "lnum", unless |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
422 * shl->lnum is zero. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
423 * Careful: Any pointers for buffer lines will become invalid. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
424 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
425 static void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
426 next_search_hl( |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
427 win_T *win, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
428 match_T *search_hl, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
429 match_T *shl, // points to search_hl or a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
430 linenr_T lnum, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
431 colnr_T mincol, // minimal column for a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
432 matchitem_T *cur) // to retrieve match positions if any |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
433 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
434 linenr_T l; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
435 colnr_T matchcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
436 long nmatched; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
437 int called_emsg_before = called_emsg; |
31140
a52697bcffa6
patch 9.0.0904: various comment and indent flaws
Bram Moolenaar <Bram@vim.org>
parents:
30574
diff
changeset
|
438 int timed_out = FALSE; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
439 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
440 // for :{range}s/pat only highlight inside the range |
26823
f1618f8705e4
patch 8.2.3940: match highlight disappears when doing incsearch for ":s/pat"
Bram Moolenaar <Bram@vim.org>
parents:
26334
diff
changeset
|
441 if ((lnum < search_first_line || lnum > search_last_line) && cur == NULL) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
442 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
443 shl->lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
444 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
445 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
446 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
447 if (shl->lnum != 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
448 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
449 // Check for three situations: |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
450 // 1. If the "lnum" is below a previous match, start a new search. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
451 // 2. If the previous match includes "mincol", use it. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
452 // 3. Continue after the previous match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
453 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
454 if (lnum > l) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
455 shl->lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
456 else if (lnum < l || shl->rm.endpos[0].col > mincol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
457 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
458 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
459 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
460 // Repeat searching for a match until one is found that includes "mincol" |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
461 // or none is found in this line. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
462 for (;;) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
463 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
464 // Three situations: |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
465 // 1. No useful previous match: search from start of line. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
466 // 2. Not Vi compatible or empty match: continue at next character. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
467 // Break the loop if this is beyond the end of the line. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
468 // 3. Vi compatible searching: continue at end of previous match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
469 if (shl->lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
470 matchcol = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
471 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
472 || (shl->rm.endpos[0].lnum == 0 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
473 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
474 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
475 char_u *ml; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
476 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
477 matchcol = shl->rm.startpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
478 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
479 if (*ml == NUL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
480 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
481 ++matchcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
482 shl->lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
483 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
484 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
485 if (has_mbyte) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
486 matchcol += mb_ptr2len(ml); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
487 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
488 ++matchcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
489 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
490 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
491 matchcol = shl->rm.endpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
492 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
493 shl->lnum = lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
494 if (shl->rm.regprog != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
495 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
496 // Remember whether shl->rm is using a copy of the regprog in |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
497 // cur->mit_match. |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
498 int regprog_is_copy = (shl != search_hl && cur != NULL |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
499 && shl == &cur->mit_hl |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
500 && cur->mit_match.regprog == cur->mit_hl.rm.regprog); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
501 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
502 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
29050
diff
changeset
|
503 matchcol, &timed_out); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
504 // Copy the regprog, in case it got freed and recompiled. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
505 if (regprog_is_copy) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
506 cur->mit_match.regprog = cur->mit_hl.rm.regprog; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
507 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
508 if (called_emsg > called_emsg_before || got_int || timed_out) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
509 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
510 // Error while handling regexp: stop using this regexp. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
511 if (shl == search_hl) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
512 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
513 // don't free regprog in the match list, it's a copy |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
514 vim_regfree(shl->rm.regprog); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
515 set_no_hlsearch(TRUE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
516 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
517 shl->rm.regprog = NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
518 shl->lnum = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
519 got_int = FALSE; // avoid the "Type :quit to exit Vim" message |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
520 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
521 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
522 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
523 else if (cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
524 nmatched = next_search_hl_pos(shl, lnum, cur, matchcol); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
525 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
526 nmatched = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
527 if (nmatched == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
528 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
529 shl->lnum = 0; // no match found |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
530 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
531 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
532 if (shl->rm.startpos[0].lnum > 0 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
533 || shl->rm.startpos[0].col >= mincol |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
534 || nmatched > 1 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
535 || shl->rm.endpos[0].col > mincol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
536 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
537 shl->lnum += shl->rm.startpos[0].lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
538 break; // useful match found |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
539 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
540 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
541 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
542 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
543 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
544 * Advance to the match in window "wp" line "lnum" or past it. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
545 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
546 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
547 prepare_search_hl(win_T *wp, match_T *search_hl, linenr_T lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
548 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
549 matchitem_T *cur; // points to the match list |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
550 match_T *shl; // points to search_hl or a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
551 int shl_flag; // flag to indicate whether search_hl |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
552 // has been processed or not |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
553 int pos_inprogress; // marks that position match search is |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
554 // in progress |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
555 int n; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
556 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
557 // When using a multi-line pattern, start searching at the top |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
558 // of the window or just after a closed fold. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
559 // Do this both for search_hl and the match list. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
560 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
561 shl_flag = WIN_IS_POPUP(wp); // skip search_hl in a popup window |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
562 while (cur != NULL || shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
563 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
564 if (shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
565 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
566 shl = search_hl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
567 shl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
568 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
569 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
570 shl = &cur->mit_hl; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
571 if (shl->rm.regprog != NULL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
572 && shl->lnum == 0 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
573 && re_multiline(shl->rm.regprog)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
574 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
575 if (shl->first_lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
576 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
577 # ifdef FEAT_FOLDING |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
578 for (shl->first_lnum = lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
579 shl->first_lnum > wp->w_topline; --shl->first_lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
580 if (hasFoldingWin(wp, shl->first_lnum - 1, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
581 NULL, NULL, TRUE, NULL)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
582 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
583 # else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
584 shl->first_lnum = wp->w_topline; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
585 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
586 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
587 if (cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
588 cur->mit_pos_cur = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
589 pos_inprogress = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
590 n = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
591 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
592 || (cur != NULL && pos_inprogress))) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
593 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
594 next_search_hl(wp, search_hl, shl, shl->first_lnum, (colnr_T)n, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
595 shl == search_hl ? NULL : cur); |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
596 pos_inprogress = cur == NULL || cur->mit_pos_cur == 0 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
597 ? FALSE : TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
598 if (shl->lnum != 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
599 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
600 shl->first_lnum = shl->lnum |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
601 + shl->rm.endpos[0].lnum |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
602 - shl->rm.startpos[0].lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
603 n = shl->rm.endpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
604 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
605 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
606 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
607 ++shl->first_lnum; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
608 n = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
609 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
610 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
611 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
612 if (shl != search_hl && cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
613 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
614 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
615 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
616 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
617 /* |
28562
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
618 * Update "shl->has_cursor" based on the match in "shl" and the cursor |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
619 * position. |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
620 */ |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
621 static void |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
622 check_cur_search_hl(win_T *wp, match_T *shl) |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
623 { |
28576
3a16a350614f
patch 8.2.4812: unused struct item
Bram Moolenaar <Bram@vim.org>
parents:
28562
diff
changeset
|
624 linenr_T linecount = shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; |
28562
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
625 |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
626 if (wp->w_cursor.lnum >= shl->lnum |
28576
3a16a350614f
patch 8.2.4812: unused struct item
Bram Moolenaar <Bram@vim.org>
parents:
28562
diff
changeset
|
627 && wp->w_cursor.lnum <= shl->lnum + linecount |
28562
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
628 && (wp->w_cursor.lnum > shl->lnum |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
629 || wp->w_cursor.col >= shl->rm.startpos[0].col) |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
630 && (wp->w_cursor.lnum < shl->lnum + linecount |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
631 || wp->w_cursor.col < shl->rm.endpos[0].col)) |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
632 shl->has_cursor = TRUE; |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
633 else |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
634 shl->has_cursor = FALSE; |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
635 } |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
636 |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
637 /* |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
638 * Prepare for 'hlsearch' and match highlighting in one window line. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
639 * Return TRUE if there is such highlighting and set "search_attr" to the |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
640 * current highlight attribute. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
641 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
642 int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
643 prepare_search_hl_line( |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
644 win_T *wp, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
645 linenr_T lnum, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
646 colnr_T mincol, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
647 char_u **line, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
648 match_T *search_hl, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
649 int *search_attr) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
650 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
651 matchitem_T *cur; // points to the match list |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
652 match_T *shl; // points to search_hl or a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
653 int shl_flag; // flag to indicate whether search_hl |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
654 // has been processed or not |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
655 int area_highlighting = FALSE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
656 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
657 // Handle highlighting the last used search pattern and matches. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
658 // Do this for both search_hl and the match list. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
659 // Do not use search_hl in a popup window. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
660 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
661 shl_flag = WIN_IS_POPUP(wp); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
662 while (cur != NULL || shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
663 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
664 if (shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
665 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
666 shl = search_hl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
667 shl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
668 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
669 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
670 shl = &cur->mit_hl; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
671 shl->startcol = MAXCOL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
672 shl->endcol = MAXCOL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
673 shl->attr_cur = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
674 shl->is_addpos = FALSE; |
28469
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
675 shl->has_cursor = FALSE; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
676 if (cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
677 cur->mit_pos_cur = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
678 next_search_hl(wp, search_hl, shl, lnum, mincol, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
679 shl == search_hl ? NULL : cur); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
680 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
681 // Need to get the line again, a multi-line regexp may have made it |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
682 // invalid. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
683 *line = ml_get_buf(wp->w_buffer, lnum, FALSE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
684 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
685 if (shl->lnum != 0 && shl->lnum <= lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
686 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
687 if (shl->lnum == lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
688 shl->startcol = shl->rm.startpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
689 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
690 shl->startcol = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
691 if (lnum == shl->lnum + shl->rm.endpos[0].lnum |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
692 - shl->rm.startpos[0].lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
693 shl->endcol = shl->rm.endpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
694 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
695 shl->endcol = MAXCOL; |
28469
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
696 |
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
697 // check if the cursor is in the match before changing the columns |
28562
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
698 if (shl == search_hl) |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
699 check_cur_search_hl(wp, shl); |
28469
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
700 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
701 // Highlight one character for an empty match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
702 if (shl->startcol == shl->endcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
703 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
704 if (has_mbyte && (*line)[shl->endcol] != NUL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
705 shl->endcol += (*mb_ptr2len)((*line) + shl->endcol); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
706 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
707 ++shl->endcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
708 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
709 if ((long)shl->startcol < mincol) // match at leftcol |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
710 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
711 shl->attr_cur = shl->attr; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
712 *search_attr = shl->attr; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
713 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
714 area_highlighting = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
715 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
716 if (shl != search_hl && cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
717 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
718 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
719 return area_highlighting; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
720 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
721 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
722 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
723 * For a position in a line: Check for start/end of 'hlsearch' and other |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
724 * matches. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
725 * After end, check for start/end of next match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
726 * When another match, have to check for start again. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
727 * Watch out for matching an empty string! |
26334
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
728 * "on_last_col" is set to TRUE with non-zero search_attr and the next column |
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
729 * is endcol. |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
730 * Return the updated search_attr. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
731 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
732 int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
733 update_search_hl( |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
734 win_T *wp, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
735 linenr_T lnum, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
736 colnr_T col, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
737 char_u **line, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
738 match_T *search_hl, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
739 int *has_match_conc UNUSED, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
740 int *match_conc UNUSED, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
741 int did_line_attr, |
26334
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
742 int lcs_eol_one, |
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
743 int *on_last_col) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
744 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
745 matchitem_T *cur; // points to the match list |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
746 match_T *shl; // points to search_hl or a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
747 int shl_flag; // flag to indicate whether search_hl |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
748 // has been processed or not |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
749 int pos_inprogress; // marks that position match search is in |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
750 // progress |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
751 int search_attr = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
752 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
753 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
754 // Do this for 'search_hl' and the match list (ordered by priority). |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
755 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
756 shl_flag = WIN_IS_POPUP(wp); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
757 while (cur != NULL || shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
758 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
759 if (shl_flag == FALSE |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
760 && (cur == NULL |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
761 || cur->mit_priority > SEARCH_HL_PRIORITY)) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
762 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
763 shl = search_hl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
764 shl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
765 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
766 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
767 shl = &cur->mit_hl; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
768 if (cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
769 cur->mit_pos_cur = 0; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
770 pos_inprogress = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
771 while (shl->rm.regprog != NULL || (cur != NULL && pos_inprogress)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
772 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
773 if (shl->startcol != MAXCOL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
774 && col >= shl->startcol |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
775 && col < shl->endcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
776 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
777 int next_col = col + mb_ptr2len(*line + col); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
778 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
779 if (shl->endcol < next_col) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
780 shl->endcol = next_col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
781 shl->attr_cur = shl->attr; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
782 # ifdef FEAT_CONCEAL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
783 // Match with the "Conceal" group results in hiding |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
784 // the match. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
785 if (cur != NULL |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
786 && shl != search_hl |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
787 && syn_name2id((char_u *)"Conceal") == cur->mit_hlg_id) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
788 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
789 *has_match_conc = col == shl->startcol ? 2 : 1; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
790 *match_conc = cur->mit_conceal_char; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
791 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
792 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
793 *has_match_conc = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
794 # endif |
28399
d395fadbaf67
patch 8.2.4724: current instance of last search pattern not easily spotted
Bram Moolenaar <Bram@vim.org>
parents:
28315
diff
changeset
|
795 // Highlight the match were the cursor is using the CurSearch |
d395fadbaf67
patch 8.2.4724: current instance of last search pattern not easily spotted
Bram Moolenaar <Bram@vim.org>
parents:
28315
diff
changeset
|
796 // group. |
28469
9ff0e5a29037
patch 8.2.4759: CurSearch highlight does not work for multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
28399
diff
changeset
|
797 if (shl == search_hl && shl->has_cursor) |
29050
a2710736125a
patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents:
28576
diff
changeset
|
798 { |
28399
d395fadbaf67
patch 8.2.4724: current instance of last search pattern not easily spotted
Bram Moolenaar <Bram@vim.org>
parents:
28315
diff
changeset
|
799 shl->attr_cur = HL_ATTR(HLF_LC); |
29050
a2710736125a
patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents:
28576
diff
changeset
|
800 if (shl->attr_cur != shl->attr) |
a2710736125a
patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents:
28576
diff
changeset
|
801 search_hl_has_cursor_lnum = lnum; |
a2710736125a
patch 8.2.5047: CurSearch highlight is often wrong
Bram Moolenaar <Bram@vim.org>
parents:
28576
diff
changeset
|
802 } |
28399
d395fadbaf67
patch 8.2.4724: current instance of last search pattern not easily spotted
Bram Moolenaar <Bram@vim.org>
parents:
28315
diff
changeset
|
803 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
804 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
805 else if (col == shl->endcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
806 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
807 shl->attr_cur = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
808 next_search_hl(wp, search_hl, shl, lnum, col, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
809 shl == search_hl ? NULL : cur); |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
810 pos_inprogress = !(cur == NULL || cur->mit_pos_cur == 0); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
811 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
812 // Need to get the line again, a multi-line regexp may have |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
813 // made it invalid. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
814 *line = ml_get_buf(wp->w_buffer, lnum, FALSE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
815 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
816 if (shl->lnum == lnum) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
817 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
818 shl->startcol = shl->rm.startpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
819 if (shl->rm.endpos[0].lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
820 shl->endcol = shl->rm.endpos[0].col; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
821 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
822 shl->endcol = MAXCOL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
823 |
28562
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
824 // check if the cursor is in the match |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
825 if (shl == search_hl) |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
826 check_cur_search_hl(wp, shl); |
e96111a91a21
patch 8.2.4805: CurSearch used for all matches in current line
Bram Moolenaar <Bram@vim.org>
parents:
28469
diff
changeset
|
827 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
828 if (shl->startcol == shl->endcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
829 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
830 // highlight empty match, try again after |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
831 // it |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
832 if (has_mbyte) |
24000
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
833 { |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
834 char_u *p = *line + shl->endcol; |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
835 |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
836 if (*p == NUL) |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
837 // consistent with non-mbyte |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
838 ++shl->endcol; |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
839 else |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
840 shl->endcol += (*mb_ptr2len)(p); |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
841 } |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
842 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
843 ++shl->endcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
844 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
845 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
846 // Loop to check if the match starts at the |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
847 // current position |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
848 continue; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
849 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
850 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
851 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
852 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
853 if (shl != search_hl && cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
854 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
855 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
856 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
857 // Use attributes from match with highest priority among 'search_hl' and |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
858 // the match list. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
859 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
860 shl_flag = WIN_IS_POPUP(wp); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
861 while (cur != NULL || shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
862 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
863 if (shl_flag == FALSE |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
864 && (cur == NULL || |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
865 cur->mit_priority > SEARCH_HL_PRIORITY)) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
866 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
867 shl = search_hl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
868 shl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
869 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
870 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
871 shl = &cur->mit_hl; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
872 if (shl->attr_cur != 0) |
26334
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
873 { |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
874 search_attr = shl->attr_cur; |
26334
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
875 *on_last_col = col + 1 >= shl->endcol; |
baec4e1cee43
patch 8.2.3698: match highlighting continues over breakindent
Bram Moolenaar <Bram@vim.org>
parents:
25384
diff
changeset
|
876 } |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
877 if (shl != search_hl && cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
878 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
879 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
880 // Only highlight one character after the last column. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
881 if (*(*line + col) == NUL && (did_line_attr >= 1 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
882 || (wp->w_p_list && lcs_eol_one == -1))) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
883 search_attr = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
884 return search_attr; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
885 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
886 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
887 int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
888 get_prevcol_hl_flag(win_T *wp, match_T *search_hl, long curcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
889 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
890 long prevcol = curcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
891 int prevcol_hl_flag = FALSE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
892 matchitem_T *cur; // points to the match list |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
893 |
24000
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
894 #if defined(FEAT_PROP_POPUP) |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
895 // don't do this in a popup window |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
896 if (popup_is_popup(wp)) |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
897 return FALSE; |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
898 #endif |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
899 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
900 // we're not really at that column when skipping some text |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
901 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
902 ++prevcol; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
903 |
24000
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
904 // Highlight a character after the end of the line if the match started |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
905 // at the end of the line or when the match continues in the next line |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
906 // (match includes the line break). |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
907 if (!search_hl->is_addpos && (prevcol == (long)search_hl->startcol |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
908 || (prevcol > (long)search_hl->startcol |
bb2e921d2601
patch 8.2.2542: highlight of char beyond line end is not correct
Bram Moolenaar <Bram@vim.org>
parents:
21821
diff
changeset
|
909 && search_hl->endcol == MAXCOL))) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
910 prevcol_hl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
911 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
912 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
913 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
914 while (cur != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
915 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
916 if (!cur->mit_hl.is_addpos && (prevcol == (long)cur->mit_hl.startcol |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
917 || (prevcol > (long)cur->mit_hl.startcol |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
918 && cur->mit_hl.endcol == MAXCOL))) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
919 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
920 prevcol_hl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
921 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
922 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
923 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
924 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
925 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
926 return prevcol_hl_flag; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
927 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
928 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
929 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
930 * Get highlighting for the char after the text in "char_attr" from 'hlsearch' |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
931 * or match highlighting. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
932 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
933 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
934 get_search_match_hl(win_T *wp, match_T *search_hl, long col, int *char_attr) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
935 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
936 matchitem_T *cur; // points to the match list |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
937 match_T *shl; // points to search_hl or a match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
938 int shl_flag; // flag to indicate whether search_hl |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
939 // has been processed or not |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
940 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
941 cur = wp->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
942 shl_flag = WIN_IS_POPUP(wp); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
943 while (cur != NULL || shl_flag == FALSE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
944 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
945 if (shl_flag == FALSE |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
946 && ((cur != NULL |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
947 && cur->mit_priority > SEARCH_HL_PRIORITY) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
948 || cur == NULL)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
949 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
950 shl = search_hl; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
951 shl_flag = TRUE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
952 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
953 else |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
954 shl = &cur->mit_hl; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
955 if (col - 1 == (long)shl->startcol |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
956 && (shl == search_hl || !shl->is_addpos)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
957 *char_attr = shl->attr; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
958 if (shl != search_hl && cur != NULL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
959 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
960 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
961 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
962 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
963 #endif // FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
964 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
965 #if defined(FEAT_EVAL) || defined(PROTO) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
966 # ifdef FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
967 static int |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
968 matchadd_dict_arg(typval_T *tv, char_u **conceal_char, win_T **win) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
969 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
970 dictitem_T *di; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
971 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
972 if (tv->v_type != VAR_DICT) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
973 { |
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
974 emsg(_(e_dictionary_required)); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
975 return FAIL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
976 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
977 |
28315
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
978 if (dict_has_key(tv->vval.v_dict, "conceal")) |
29442
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
979 *conceal_char = dict_get_string(tv->vval.v_dict, "conceal", FALSE); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
980 |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
981 if ((di = dict_find(tv->vval.v_dict, (char_u *)"window", -1)) == NULL) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
982 return OK; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
983 |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
984 *win = find_win_by_nr_or_id(&di->di_tv); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
985 if (*win == NULL) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
986 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
987 emsg(_(e_invalid_window_number)); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
988 return FAIL; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
989 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
990 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
991 return OK; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
992 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
993 #endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
994 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
995 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
996 * "clearmatches()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
997 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
998 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
999 f_clearmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1000 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1001 #ifdef FEAT_SEARCH_EXTRA |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1002 win_T *win; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1003 |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1004 if (in_vim9script() && check_for_opt_number_arg(argvars, 0) == FAIL) |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1005 return; |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1006 |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1007 win = get_optional_window(argvars, 0); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1008 if (win != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1009 clear_matches(win); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1010 #endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1011 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1012 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1013 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1014 * "getmatches()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1015 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1016 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1017 f_getmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1018 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1019 # ifdef FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1020 dict_T *dict; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1021 matchitem_T *cur; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1022 int i; |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1023 win_T *win; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1024 |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1025 if (in_vim9script() && check_for_opt_number_arg(argvars, 0) == FAIL) |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1026 return; |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1027 |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1028 win = get_optional_window(argvars, 0); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1029 if (rettv_list_alloc(rettv) == FAIL || win == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1030 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1031 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1032 cur = win->w_match_head; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1033 while (cur != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1034 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1035 dict = dict_alloc(); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1036 if (dict == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1037 return; |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1038 if (cur->mit_match.regprog == NULL) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1039 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1040 // match added with matchaddpos() |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1041 for (i = 0; i < cur->mit_pos_count; ++i) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1042 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1043 llpos_T *llpos; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1044 char buf[30]; // use 30 to avoid compiler warning |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1045 list_T *l; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1046 |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1047 llpos = &cur->mit_pos_array[i]; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1048 if (llpos->lnum == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1049 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1050 l = list_alloc(); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1051 if (l == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1052 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1053 list_append_number(l, (varnumber_T)llpos->lnum); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1054 if (llpos->col > 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1055 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1056 list_append_number(l, (varnumber_T)llpos->col); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1057 list_append_number(l, (varnumber_T)llpos->len); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1058 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1059 sprintf(buf, "pos%d", i + 1); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1060 dict_add_list(dict, buf, l); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1061 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1062 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1063 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1064 { |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1065 dict_add_string(dict, "pattern", cur->mit_pattern); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1066 } |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1067 dict_add_string(dict, "group", syn_id2name(cur->mit_hlg_id)); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1068 dict_add_number(dict, "priority", (long)cur->mit_priority); |
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1069 dict_add_number(dict, "id", (long)cur->mit_id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1070 # if defined(FEAT_CONCEAL) |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1071 if (cur->mit_conceal_char) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1072 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1073 char_u buf[MB_MAXBYTES + 1]; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1074 |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1075 buf[(*mb_char2bytes)(cur->mit_conceal_char, buf)] = NUL; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1076 dict_add_string(dict, "conceal", (char_u *)&buf); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1077 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1078 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1079 list_append_dict(rettv->vval.v_list, dict); |
30570
86683eee58ac
patch 9.0.0620: matchaddpos() can only add up to 8 matches
Bram Moolenaar <Bram@vim.org>
parents:
30015
diff
changeset
|
1080 cur = cur->mit_next; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1081 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1082 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1083 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1084 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1085 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1086 * "setmatches()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1087 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1088 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1089 f_setmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1090 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1091 #ifdef FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1092 list_T *l; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1093 listitem_T *li; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1094 dict_T *d; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1095 list_T *s = NULL; |
25302
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1096 win_T *win; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1097 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1098 rettv->vval.v_number = -1; |
25302
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1099 |
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1100 if (in_vim9script() |
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1101 && (check_for_list_arg(argvars, 0) == FAIL |
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1102 || check_for_opt_number_arg(argvars, 1) == FAIL)) |
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1103 return; |
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1104 |
30015
adb0de8be4ce
patch 9.0.0345: error message for list argument could be clearer
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
1105 if (check_for_list_arg(argvars, 0) == FAIL) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1106 return; |
25302
4d3c68196d05
patch 8.2.3188: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
24000
diff
changeset
|
1107 win = get_optional_window(argvars, 1); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1108 if (win == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1109 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1110 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1111 if ((l = argvars[0].vval.v_list) != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1112 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1113 // To some extent make sure that we are dealing with a list from |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1114 // "getmatches()". |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1115 li = l->lv_first; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1116 while (li != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1117 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1118 if (li->li_tv.v_type != VAR_DICT |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1119 || (d = li->li_tv.vval.v_dict) == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1120 { |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26823
diff
changeset
|
1121 emsg(_(e_invalid_argument)); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1122 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1123 } |
28315
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1124 if (!(dict_has_key(d, "group") |
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1125 && (dict_has_key(d, "pattern") |
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1126 || dict_has_key(d, "pos1")) |
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1127 && dict_has_key(d, "priority") |
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1128 && dict_has_key(d, "id"))) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1129 { |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26823
diff
changeset
|
1130 emsg(_(e_invalid_argument)); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1131 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1132 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1133 li = li->li_next; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1134 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1135 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1136 clear_matches(win); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1137 li = l->lv_first; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1138 while (li != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1139 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1140 int i = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1141 char buf[30]; // use 30 to avoid compiler warning |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1142 dictitem_T *di; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1143 char_u *group; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1144 int priority; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1145 int id; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1146 char_u *conceal; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1147 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1148 d = li->li_tv.vval.v_dict; |
28315
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1149 if (!dict_has_key(d, "pattern")) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1150 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1151 if (s == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1152 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1153 s = list_alloc(); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1154 if (s == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1155 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1156 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1157 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1158 // match from matchaddpos() |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1159 for (i = 1; i < 9; i++) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1160 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1161 sprintf((char *)buf, (char *)"pos%d", i); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1162 if ((di = dict_find(d, (char_u *)buf, -1)) != NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1163 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1164 if (di->di_tv.v_type != VAR_LIST) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1165 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1166 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1167 list_append_tv(s, &di->di_tv); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1168 s->lv_refcount++; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1169 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1170 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1171 break; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1172 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1173 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1174 |
29442
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
1175 group = dict_get_string(d, "group", TRUE); |
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
1176 priority = (int)dict_get_number(d, "priority"); |
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
1177 id = (int)dict_get_number(d, "id"); |
28315
62cc3b60493b
patch 8.2.4683: verbose check with dict_find() to see if a key is present
Bram Moolenaar <Bram@vim.org>
parents:
27426
diff
changeset
|
1178 conceal = dict_has_key(d, "conceal") |
29442
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
1179 ? dict_get_string(d, "conceal", TRUE) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1180 : NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1181 if (i == 0) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1182 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1183 match_add(win, group, |
29442
827d9f2b7a71
patch 9.0.0063: too many type casts for dict_get functions
Bram Moolenaar <Bram@vim.org>
parents:
29081
diff
changeset
|
1184 dict_get_string(d, "pattern", FALSE), |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1185 priority, id, NULL, conceal); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1186 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1187 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1188 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1189 match_add(win, group, NULL, priority, id, s, conceal); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1190 list_unref(s); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1191 s = NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1192 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1193 vim_free(group); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1194 vim_free(conceal); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1195 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1196 li = li->li_next; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1197 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1198 rettv->vval.v_number = 0; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1199 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1200 #endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1201 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1202 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1203 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1204 * "matchadd()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1205 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1206 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1207 f_matchadd(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1208 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1209 # ifdef FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1210 char_u buf[NUMBUFLEN]; |
25338
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1211 char_u *grp; // group |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1212 char_u *pat; // pattern |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1213 int prio = 10; // default priority |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1214 int id = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1215 int error = FALSE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1216 char_u *conceal_char = NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1217 win_T *win = curwin; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1218 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1219 rettv->vval.v_number = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1220 |
25338
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1221 if (in_vim9script() |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1222 && (check_for_string_arg(argvars, 0) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1223 || check_for_string_arg(argvars, 1) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1224 || check_for_opt_number_arg(argvars, 2) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1225 || (argvars[2].v_type != VAR_UNKNOWN |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1226 && (check_for_opt_number_arg(argvars, 3) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1227 || (argvars[3].v_type != VAR_UNKNOWN |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1228 && check_for_opt_dict_arg(argvars, 4) == FAIL))))) |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1229 return; |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1230 |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1231 grp = tv_get_string_buf_chk(&argvars[0], buf); // group |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1232 pat = tv_get_string_buf_chk(&argvars[1], buf); // pattern |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1233 if (grp == NULL || pat == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1234 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1235 if (argvars[2].v_type != VAR_UNKNOWN) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1236 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1237 prio = (int)tv_get_number_chk(&argvars[2], &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1238 if (argvars[3].v_type != VAR_UNKNOWN) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1239 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1240 id = (int)tv_get_number_chk(&argvars[3], &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1241 if (argvars[4].v_type != VAR_UNKNOWN |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1242 && matchadd_dict_arg(&argvars[4], &conceal_char, &win) == FAIL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1243 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1244 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1245 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1246 if (error == TRUE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1247 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1248 if (id >= 1 && id <= 3) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1249 { |
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1250 semsg(_(e_id_is_reserved_for_match_nr), id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1251 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1252 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1253 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1254 rettv->vval.v_number = match_add(win, grp, pat, prio, id, NULL, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1255 conceal_char); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1256 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1257 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1258 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1259 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1260 * "matchaddpos()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1261 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1262 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1263 f_matchaddpos(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1264 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1265 # ifdef FEAT_SEARCH_EXTRA |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1266 char_u buf[NUMBUFLEN]; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1267 char_u *group; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1268 int prio = 10; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1269 int id = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1270 int error = FALSE; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1271 list_T *l; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1272 char_u *conceal_char = NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1273 win_T *win = curwin; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1274 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1275 rettv->vval.v_number = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1276 |
25338
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1277 if (in_vim9script() |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1278 && (check_for_string_arg(argvars, 0) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1279 || check_for_list_arg(argvars, 1) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1280 || check_for_opt_number_arg(argvars, 2) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1281 || (argvars[2].v_type != VAR_UNKNOWN |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1282 && (check_for_opt_number_arg(argvars, 3) == FAIL |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1283 || (argvars[3].v_type != VAR_UNKNOWN |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1284 && check_for_opt_dict_arg(argvars, 4) == FAIL))))) |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1285 return; |
e2be9f3c5907
patch 8.2.3206: Vim9: argument types are not checked at compile time
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
1286 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1287 group = tv_get_string_buf_chk(&argvars[0], buf); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1288 if (group == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1289 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1290 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1291 if (argvars[1].v_type != VAR_LIST) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1292 { |
26887
612339679616
patch 8.2.3972: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26883
diff
changeset
|
1293 semsg(_(e_argument_of_str_must_be_list), "matchaddpos()"); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1294 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1295 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1296 l = argvars[1].vval.v_list; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1297 if (l == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1298 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1299 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1300 if (argvars[2].v_type != VAR_UNKNOWN) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1301 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1302 prio = (int)tv_get_number_chk(&argvars[2], &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1303 if (argvars[3].v_type != VAR_UNKNOWN) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1304 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1305 id = (int)tv_get_number_chk(&argvars[3], &error); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1306 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1307 if (argvars[4].v_type != VAR_UNKNOWN |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1308 && matchadd_dict_arg(&argvars[4], &conceal_char, &win) == FAIL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1309 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1310 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1311 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1312 if (error == TRUE) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1313 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1314 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1315 // id == 3 is ok because matchaddpos() is supposed to substitute :3match |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1316 if (id == 1 || id == 2) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1317 { |
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
1318 semsg(_(e_id_is_reserved_for_match_nr), id); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1319 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1320 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1321 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1322 rettv->vval.v_number = match_add(win, group, NULL, prio, id, l, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1323 conceal_char); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1324 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1325 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1326 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1327 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1328 * "matcharg()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1329 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1330 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1331 f_matcharg(typval_T *argvars UNUSED, typval_T *rettv) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1332 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1333 if (rettv_list_alloc(rettv) != OK) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1334 return; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1335 |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1336 # ifdef FEAT_SEARCH_EXTRA |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1337 int id; |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1338 matchitem_T *m; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1339 |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1340 if (in_vim9script() && check_for_number_arg(argvars, 0) == FAIL) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1341 return; |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1342 |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1343 id = (int)tv_get_number(&argvars[0]); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1344 if (id >= 1 && id <= 3) |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1345 { |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1346 if ((m = get_match(curwin, id)) != NULL) |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1347 { |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1348 list_append_string(rettv->vval.v_list, |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1349 syn_id2name(m->mit_hlg_id), -1); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1350 list_append_string(rettv->vval.v_list, m->mit_pattern, -1); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1351 } |
31728
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1352 else |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1353 { |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1354 list_append_string(rettv->vval.v_list, NULL, -1); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1355 list_append_string(rettv->vval.v_list, NULL, -1); |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1356 } |
238ca27dbfd2
patch 9.0.1196: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31140
diff
changeset
|
1357 } |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1358 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1359 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1360 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1361 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1362 * "matchdelete()" function |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1363 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1364 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1365 f_matchdelete(typval_T *argvars UNUSED, typval_T *rettv UNUSED) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1366 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1367 # ifdef FEAT_SEARCH_EXTRA |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1368 win_T *win; |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1369 |
25384
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1370 if (in_vim9script() |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1371 && (check_for_number_arg(argvars, 0) == FAIL |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1372 || check_for_opt_number_arg(argvars, 1) == FAIL)) |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1373 return; |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1374 |
e8e2c4d33b9b
patch 8.2.3229: Vim9: runtime and compile time type checks are not the same
Bram Moolenaar <Bram@vim.org>
parents:
25338
diff
changeset
|
1375 win = get_optional_window(argvars, 1); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1376 if (win == NULL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1377 rettv->vval.v_number = -1; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1378 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1379 rettv->vval.v_number = match_delete(win, |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1380 (int)tv_get_number(&argvars[0]), TRUE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1381 # endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1382 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1383 #endif |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1384 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1385 #if defined(FEAT_SEARCH_EXTRA) || defined(PROTO) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1386 /* |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1387 * ":[N]match {group} {pattern}" |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1388 * Sets nextcmd to the start of the next command, if any. Also called when |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1389 * skipping commands to find the next command. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1390 */ |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1391 void |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1392 ex_match(exarg_T *eap) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1393 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1394 char_u *p; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1395 char_u *g = NULL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1396 char_u *end; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1397 int c; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1398 int id; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1399 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1400 if (eap->line2 <= 3) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1401 id = eap->line2; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1402 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1403 { |
21821
0deb6f96a5a3
patch 8.2.1460: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
21459
diff
changeset
|
1404 emsg(_(e_invalid_command)); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1405 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1406 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1407 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1408 // First clear any old pattern. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1409 if (!eap->skip) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1410 match_delete(curwin, id, FALSE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1411 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1412 if (ends_excmd2(eap->cmd, eap->arg)) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1413 end = eap->arg; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1414 else if ((STRNICMP(eap->arg, "none", 4) == 0 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1415 && (VIM_ISWHITE(eap->arg[4]) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1416 || ends_excmd2(eap->arg, eap->arg + 4)))) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1417 end = eap->arg + 4; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1418 else |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1419 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1420 p = skiptowhite(eap->arg); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1421 if (!eap->skip) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1422 g = vim_strnsave(eap->arg, p - eap->arg); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1423 p = skipwhite(p); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1424 if (*p == NUL) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1425 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1426 // There must be two arguments. |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1427 vim_free(g); |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26823
diff
changeset
|
1428 semsg(_(e_invalid_argument_str), eap->arg); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1429 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1430 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1431 end = skip_regexp(p + 1, *p, TRUE); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1432 if (!eap->skip) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1433 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1434 if (*end != NUL && !ends_excmd2(end, skipwhite(end + 1))) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1435 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1436 vim_free(g); |
26883
7f150a4936f2
patch 8.2.3970: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
1437 eap->errmsg = ex_errmsg(e_trailing_characters_str, end); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1438 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1439 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1440 if (*end != *p) |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1441 { |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1442 vim_free(g); |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26823
diff
changeset
|
1443 semsg(_(e_invalid_argument_str), p); |
21054
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1444 return; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1445 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1446 |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1447 c = *end; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1448 *end = NUL; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1449 match_add(curwin, g, p + 1, 10, id, NULL, NULL); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1450 vim_free(g); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1451 *end = c; |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1452 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1453 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1454 eap->nextcmd = find_nextcmd(end); |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1455 } |
b1fac55cf8a3
patch 8.2.1078: highlight and match functionality together in one file
Bram Moolenaar <Bram@vim.org>
parents:
diff
changeset
|
1456 #endif |