Mercurial > vim
annotate src/syntax.c @ 31750:13cecb002fe6 v9.0.1207
patch 9.0.1207: error when object type is expected but getting "any"
Commit: https://github.com/vim/vim/commit/450c7a97d1a28f715acaf562298112b9b932adc3
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 16 16:39:37 2023 +0000
patch 9.0.1207: error when object type is expected but getting "any"
Problem: Error when object type is expected but getting "any".
Solution: When actual type is "any" use a runtime type check.
(closes #11826)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 16 Jan 2023 17:45:02 +0100 |
| parents | 53c3df37a2b0 |
| children | 543153d582d5 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * syntax.c: code for syntax highlighting | |
| 12 */ | |
| 13 | |
| 14 #include "vim.h" | |
| 15 | |
| 16 #if defined(FEAT_SYN_HL) || defined(PROTO) | |
| 17 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
18 #define SYN_NAMELEN 50 // maximum length of a syntax name |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
19 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
20 // different types of offsets that are possible |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
21 #define SPO_MS_OFF 0 // match start offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
22 #define SPO_ME_OFF 1 // match end offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
23 #define SPO_HS_OFF 2 // highl. start offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
24 #define SPO_HE_OFF 3 // highl. end offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
25 #define SPO_RS_OFF 4 // region start offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
26 #define SPO_RE_OFF 5 // region end offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
27 #define SPO_LC_OFF 6 // leading context offset |
| 7 | 28 #define SPO_COUNT 7 |
| 29 | |
| 30 static char *(spo_name_tab[SPO_COUNT]) = | |
| 31 {"ms=", "me=", "hs=", "he=", "rs=", "re=", "lc="}; | |
| 32 | |
| 33 /* | |
| 34 * The patterns that are being searched for are stored in a syn_pattern. | |
| 35 * A match item consists of one pattern. | |
| 36 * A start/end item consists of n start patterns and m end patterns. | |
| 37 * A start/skip/end item consists of n start patterns, one skip pattern and m | |
| 38 * end patterns. | |
| 39 * For the latter two, the patterns are always consecutive: start-skip-end. | |
| 40 * | |
| 41 * A character offset can be given for the matched text (_m_start and _m_end) | |
| 42 * and for the actually highlighted text (_h_start and _h_end). | |
|
13333
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
43 * |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
44 * Note that ordering of members is optimized to reduce padding. |
| 7 | 45 */ |
| 46 typedef struct syn_pattern | |
| 47 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
48 char sp_type; // see SPTYPE_ defines below |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
49 char sp_syncing; // this item used for syncing |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
50 short sp_syn_match_id; // highlight group ID of pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
51 short sp_off_flags; // see below |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
52 int sp_offsets[SPO_COUNT]; // offsets |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
53 int sp_flags; // see HL_ defines below |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
54 #ifdef FEAT_CONCEAL |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
55 int sp_cchar; // conceal substitute character |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
56 #endif |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
57 int sp_ic; // ignore-case flag for sp_prog |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
58 int sp_sync_idx; // sync item index (syncing only) |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
59 int sp_line_id; // ID of last line where tried |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
60 int sp_startcol; // next match in sp_line_id line |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
61 short *sp_cont_list; // cont. group IDs, if non-zero |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
62 short *sp_next_list; // next group IDs, if non-zero |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
63 struct sp_syn sp_syn; // struct passed to in_id_list() |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
64 char_u *sp_pattern; // regexp to match, pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
65 regprog_T *sp_prog; // regexp to match, program |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
66 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
67 syn_time_T sp_time; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
68 #endif |
| 7 | 69 } synpat_T; |
| 70 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
71 // The sp_off_flags are computed like this: |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
72 // offset from the start of the matched text: (1 << SPO_XX_OFF) |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
73 // offset from the end of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT)) |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
74 // When both are present, only one is used. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
75 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
76 #define SPTYPE_MATCH 1 // match keyword with this group ID |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
77 #define SPTYPE_START 2 // match a regexp, start of item |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
78 #define SPTYPE_END 3 // match a regexp, end of item |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
79 #define SPTYPE_SKIP 4 // match a regexp, skip within item |
| 7 | 80 |
| 81 | |
| 82 #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data)) | |
| 83 | |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27561
diff
changeset
|
84 #define NONE_IDX (-2) // value of sp_sync_idx for "NONE" |
| 7 | 85 |
| 86 /* | |
| 87 * Flags for b_syn_sync_flags: | |
| 88 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
89 #define SF_CCOMMENT 0x01 // sync on a C-style comment |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
90 #define SF_MATCH 0x02 // sync by matching a pattern |
| 7 | 91 |
| 92 #define SYN_STATE_P(ssp) ((bufstate_T *)((ssp)->ga_data)) | |
| 93 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
94 #define MAXKEYWLEN 80 // maximum length of a keyword |
| 7 | 95 |
| 96 /* | |
| 97 * The attributes of the syntax item that has been recognized. | |
| 98 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
99 static int current_attr = 0; // attr of current syntax word |
| 7 | 100 #ifdef FEAT_EVAL |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
101 static int current_id = 0; // ID of current char for syn_get_id() |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
102 static int current_trans_id = 0; // idem, transparency removed |
| 7 | 103 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
104 #ifdef FEAT_CONCEAL |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
105 static int current_flags = 0; |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
106 static int current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
107 static int current_sub_char = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
108 #endif |
| 7 | 109 |
| 221 | 110 typedef struct syn_cluster_S |
| 7 | 111 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
112 char_u *scl_name; // syntax cluster name |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
113 char_u *scl_name_u; // uppercase of scl_name |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
114 short *scl_list; // IDs in this syntax cluster |
| 221 | 115 } syn_cluster_T; |
| 7 | 116 |
| 117 /* | |
| 118 * Methods of combining two clusters | |
| 119 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
120 #define CLUSTER_REPLACE 1 // replace first list with second |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
121 #define CLUSTER_ADD 2 // add second list to first |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
122 #define CLUSTER_SUBTRACT 3 // subtract second list from first |
| 7 | 123 |
| 221 | 124 #define SYN_CLSTR(buf) ((syn_cluster_T *)((buf)->b_syn_clusters.ga_data)) |
| 7 | 125 |
| 126 /* | |
| 127 * Syntax group IDs have different types: | |
| 2743 | 128 * 0 - 19999 normal syntax groups |
| 129 * 20000 - 20999 ALLBUT indicator (current_syn_inc_tag added) | |
| 130 * 21000 - 21999 TOP indicator (current_syn_inc_tag added) | |
| 131 * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added) | |
| 132 * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID) | |
| 133 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
134 #define SYNID_ALLBUT MAX_HL_ID // syntax group ID for contains=ALLBUT |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
135 #define SYNID_TOP 21000 // syntax group ID for contains=TOP |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
136 #define SYNID_CONTAINED 22000 // syntax group ID for contains=CONTAINED |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
137 #define SYNID_CLUSTER 23000 // first syntax group ID for clusters |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
138 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
139 #define MAX_SYN_INC_TAG 999 // maximum before the above overflow |
| 2743 | 140 #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER) |
| 7 | 141 |
| 142 /* | |
| 143 * Annoying Hack(TM): ":syn include" needs this pointer to pass to | |
| 144 * expand_filename(). Most of the other syntax commands don't need it, so | |
| 145 * instead of passing it to them, we stow it here. | |
| 146 */ | |
| 147 static char_u **syn_cmdlinep; | |
| 148 | |
| 149 /* | |
| 150 * Another Annoying Hack(TM): To prevent rules from other ":syn include"'d | |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
151 * files from leaking into ALLBUT lists, we assign a unique ID to the |
| 7 | 152 * rules in each ":syn include"'d file. |
| 153 */ | |
| 154 static int current_syn_inc_tag = 0; | |
| 155 static int running_syn_inc_tag = 0; | |
| 156 | |
| 157 /* | |
| 134 | 158 * In a hashtable item "hi_key" points to "keyword" in a keyentry. |
| 159 * This avoids adding a pointer to the hashtable item. | |
| 160 * KE2HIKEY() converts a var pointer to a hashitem key pointer. | |
| 161 * HIKEY2KE() converts a hashitem key pointer to a var pointer. | |
| 162 * HI2KE() converts a hashitem pointer to a var pointer. | |
| 163 */ | |
| 164 static keyentry_T dumkey; | |
| 165 #define KE2HIKEY(kp) ((kp)->keyword) | |
| 166 #define HIKEY2KE(p) ((keyentry_T *)((p) - (dumkey.keyword - (char_u *)&dumkey))) | |
| 167 #define HI2KE(hi) HIKEY2KE((hi)->hi_key) | |
| 168 | |
| 169 /* | |
| 7 | 170 * To reduce the time spent in keepend(), remember at which level in the state |
| 171 * stack the first item with "keepend" is present. When "-1", there is no | |
| 172 * "keepend" on the stack. | |
| 173 */ | |
| 174 static int keepend_level = -1; | |
| 175 | |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
176 static char msg_no_items[] = N_("No Syntax items defined for this buffer"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
177 |
| 7 | 178 /* |
| 179 * For the current state we need to remember more than just the idx. | |
| 180 * When si_m_endpos.lnum is 0, the items other than si_idx are unknown. | |
| 181 * (The end positions have the column number of the next char) | |
| 182 */ | |
| 183 typedef struct state_item | |
| 184 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
185 int si_idx; // index of syntax pattern or |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
186 // KEYWORD_IDX |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
187 int si_id; // highlight group ID for keywords |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
188 int si_trans_id; // idem, transparency removed |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
189 int si_m_lnum; // lnum of the match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
190 int si_m_startcol; // starting column of the match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
191 lpos_T si_m_endpos; // just after end posn of the match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
192 lpos_T si_h_startpos; // start position of the highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
193 lpos_T si_h_endpos; // end position of the highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
194 lpos_T si_eoe_pos; // end position of end pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
195 int si_end_idx; // group ID for end pattern or zero |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
196 int si_ends; // if match ends before si_m_endpos |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
197 int si_attr; // attributes in this state |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
198 long si_flags; // HL_HAS_EOL flag in this state, and |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
199 // HL_SKIP* for si_next_list |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
200 #ifdef FEAT_CONCEAL |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
201 int si_seqnr; // sequence number |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
202 int si_cchar; // substitution character for conceal |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
203 #endif |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
204 short *si_cont_list; // list of contained groups |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
205 short *si_next_list; // nextgroup IDs after this item ends |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
206 reg_extmatch_T *si_extmatch; // \z(...\) matches from start |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
207 // pattern |
| 7 | 208 } stateitem_T; |
| 209 | |
|
27752
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27561
diff
changeset
|
210 #define KEYWORD_IDX (-1) // value of si_idx for keywords |
|
c1d1639b52dd
patch 8.2.4402: missing parenthesis may cause unexpected problems
Bram Moolenaar <Bram@vim.org>
parents:
27561
diff
changeset
|
211 #define ID_LIST_ALL ((short *)-1) // valid of si_cont_list for containing all |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
212 // but contained groups |
| 7 | 213 |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
214 #ifdef FEAT_CONCEAL |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
215 static int next_seqnr = 1; // value to use for si_seqnr |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
216 #endif |
|
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
217 |
| 7 | 218 /* |
| 154 | 219 * Struct to reduce the number of arguments to get_syn_options(), it's used |
| 220 * very often. | |
| 221 */ | |
| 222 typedef struct | |
| 223 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
224 int flags; // flags for contained and transparent |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
225 int keyword; // TRUE for ":syn keyword" |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
226 int *sync_idx; // syntax item for "grouphere" argument, NULL |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
227 // if not allowed |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
228 char has_cont_list; // TRUE if "cont_list" can be used |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
229 short *cont_list; // group IDs for "contains" argument |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
230 short *cont_in_list; // group IDs for "containedin" argument |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
231 short *next_list; // group IDs for "nextgroup" argument |
| 154 | 232 } syn_opt_arg_T; |
| 233 | |
| 234 /* | |
| 7 | 235 * The next possible match in the current line for any pattern is remembered, |
| 236 * to avoid having to try for a match in each column. | |
| 237 * If next_match_idx == -1, not tried (in this line) yet. | |
| 238 * If next_match_col == MAXCOL, no match found in this line. | |
| 239 * (All end positions have the column of the char after the end) | |
| 240 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
241 static int next_match_col; // column for start of next match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
242 static lpos_T next_match_m_endpos; // position for end of next match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
243 static lpos_T next_match_h_startpos; // pos. for highl. start of next match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
244 static lpos_T next_match_h_endpos; // pos. for highl. end of next match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
245 static int next_match_idx; // index of matched item |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
246 static long next_match_flags; // flags for next match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
247 static lpos_T next_match_eos_pos; // end of start pattn (start region) |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
248 static lpos_T next_match_eoe_pos; // pos. for end of end pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
249 static int next_match_end_idx; // ID of group for end pattn or zero |
| 7 | 250 static reg_extmatch_T *next_match_extmatch = NULL; |
| 251 | |
| 252 /* | |
| 253 * A state stack is an array of integers or stateitem_T, stored in a | |
|
14968
c5ec5ddbe814
patch 8.1.0495: :filter only supports some commands
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
254 * garray_T. A state stack is invalid if its itemsize entry is zero. |
| 7 | 255 */ |
| 256 #define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0) | |
| 257 #define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0) | |
| 258 | |
|
19934
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
259 #define FOR_ALL_SYNSTATES(sb, sst) \ |
|
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
260 for ((sst) = (sb)->b_sst_first; (sst) != NULL; (sst) = (sst)->sst_next) |
|
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
261 |
| 7 | 262 /* |
| 263 * The current state (within the line) of the recognition engine. | |
| 264 * When current_state.ga_itemsize is 0 the current state is invalid. | |
| 265 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
266 static win_T *syn_win; // current window for highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
267 static buf_T *syn_buf; // current buffer for highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
268 static synblock_T *syn_block; // current buffer for highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
269 static linenr_T current_lnum = 0; // lnum of current state |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
270 static colnr_T current_col = 0; // column of current state |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
271 static int current_state_stored = 0; // TRUE if stored current state |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
272 // after setting current_finished |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
273 static int current_finished = 0; // current line has been finished |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
274 static garray_T current_state // current stack of state_items |
| 7 | 275 = {0, 0, 0, 0, NULL}; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
276 static short *current_next_list = NULL; // when non-zero, nextgroup list |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
277 static int current_next_flags = 0; // flags for current_next_list |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
278 static int current_line_id = 0; // unique number for current line |
| 7 | 279 |
| 280 #define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx] | |
| 281 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
282 static void syn_sync(win_T *wp, linenr_T lnum, synstate_T *last_valid); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
283 static int syn_match_linecont(linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
284 static void syn_start_line(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
285 static void syn_update_ends(int startofline); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
286 static void syn_stack_alloc(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
287 static int syn_stack_cleanup(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
288 static void syn_stack_free_entry(synblock_T *block, synstate_T *p); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
289 static synstate_T *syn_stack_find_entry(linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
290 static synstate_T *store_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
291 static void load_current_state(synstate_T *from); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
292 static void invalidate_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
293 static int syn_stack_equal(synstate_T *sp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
294 static void validate_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
295 static int syn_finish_line(int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
296 static int syn_current_attr(int syncing, int displaying, int *can_spell, int keep_state); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
297 static int did_match_already(int idx, garray_T *gap); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
298 static stateitem_T *push_next_match(stateitem_T *cur_si); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
299 static void check_state_ends(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
300 static void update_si_attr(int idx); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
301 static void check_keepend(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
302 static void update_si_end(stateitem_T *sip, int startcol, int force); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
303 static short *copy_id_list(short *list); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
304 static int in_id_list(stateitem_T *item, short *cont_list, struct sp_syn *ssp, int contained); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
305 static int push_current_state(int idx); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
306 static void pop_current_state(void); |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
307 #ifdef FEAT_PROFILE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
308 static void syn_clear_time(syn_time_T *tt); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
309 static void syntime_clear(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
310 static void syntime_report(void); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
311 static int syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
312 # define IF_SYN_TIME(p) (p) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
313 #else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
314 # define IF_SYN_TIME(p) NULL |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
315 typedef int syn_time_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
316 #endif |
| 7 | 317 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
318 static void syn_stack_apply_changes_block(synblock_T *block, buf_T *buf); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
319 static void find_endpos(int idx, lpos_T *startpos, lpos_T *m_endpos, lpos_T *hl_endpos, long *flagsp, lpos_T *end_endpos, int *end_idx, reg_extmatch_T *start_ext); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
320 |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
321 static void limit_pos(lpos_T *pos, lpos_T *limit); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
322 static void limit_pos_zero(lpos_T *pos, lpos_T *limit); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
323 static void syn_add_end_off(lpos_T *result, regmmatch_T *regmatch, synpat_T *spp, int idx, int extra); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
324 static void syn_add_start_off(lpos_T *result, regmmatch_T *regmatch, synpat_T *spp, int idx, int extra); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
325 static char_u *syn_getcurline(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
326 static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col, syn_time_T *st); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
327 static int check_keyword_id(char_u *line, int startcol, int *endcol, long *flags, short **next_list, stateitem_T *cur_si, int *ccharp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
328 static void syn_remove_pattern(synblock_T *block, int idx); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
329 static void syn_clear_pattern(synblock_T *block, int i); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
330 static void syn_clear_cluster(synblock_T *block, int i); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
331 static void syn_clear_one(int id, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
332 static void syn_cmd_onoff(exarg_T *eap, char *name); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
333 static void syn_lines_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
334 static void syn_match_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
335 static void syn_list_one(int id, int syncing, int link_only); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
336 static void syn_list_cluster(int id); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
337 static void put_id_list(char_u *name, short *list, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
338 static void put_pattern(char *s, int c, synpat_T *spp, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
339 static int syn_list_keywords(int id, hashtab_T *ht, int did_header, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
340 static void syn_clear_keyword(int id, hashtab_T *ht); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
341 static void clear_keywtab(hashtab_T *ht); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
342 static int syn_scl_namen2id(char_u *linep, int len); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
343 static int syn_check_cluster(char_u *pp, int len); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
344 static int syn_add_cluster(char_u *name); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
345 static void init_syn_patterns(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
346 static char_u *get_syn_pattern(char_u *arg, synpat_T *ci); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
347 static int get_id_list(char_u **arg, int keylen, short **list, int skip); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
348 static void syn_combine_list(short **clstr1, short **clstr2, int list_op); |
| 7 | 349 |
| 350 /* | |
| 351 * Start the syntax recognition for a line. This function is normally called | |
| 352 * from the screen updating, once for each displayed line. | |
| 353 * The buffer is remembered in syn_buf, because get_syntax_attr() doesn't get | |
| 354 * it. Careful: curbuf and curwin are likely to point to another buffer and | |
| 355 * window. | |
| 356 */ | |
| 357 void | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
358 syntax_start(win_T *wp, linenr_T lnum) |
| 7 | 359 { |
| 360 synstate_T *p; | |
| 361 synstate_T *last_valid = NULL; | |
| 362 synstate_T *last_min_valid = NULL; | |
| 1512 | 363 synstate_T *sp, *prev = NULL; |
| 7 | 364 linenr_T parsed_lnum; |
| 365 linenr_T first_stored; | |
| 366 int dist; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
367 static varnumber_T changedtick = 0; // remember the last change ID |
| 7 | 368 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
369 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
370 current_sub_char = NUL; |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
371 #endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
372 |
| 7 | 373 /* |
| 374 * After switching buffers, invalidate current_state. | |
| 26 | 375 * Also do this when a change was made, the current state may be invalid |
| 376 * then. | |
| 7 | 377 */ |
|
8806
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
378 if (syn_block != wp->w_s |
|
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
379 || syn_buf != wp->w_buffer |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
380 || changedtick != CHANGEDTICK(syn_buf)) |
| 7 | 381 { |
| 382 invalidate_current_state(); | |
| 383 syn_buf = wp->w_buffer; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
384 syn_block = wp->w_s; |
| 7 | 385 } |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
386 changedtick = CHANGEDTICK(syn_buf); |
| 7 | 387 syn_win = wp; |
| 388 | |
| 389 /* | |
| 390 * Allocate syntax stack when needed. | |
| 391 */ | |
| 392 syn_stack_alloc(); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
393 if (syn_block->b_sst_array == NULL) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
394 return; // out of memory |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
395 syn_block->b_sst_lasttick = display_tick; |
| 7 | 396 |
| 397 /* | |
| 398 * If the state of the end of the previous line is useful, store it. | |
| 399 */ | |
| 400 if (VALID_STATE(¤t_state) | |
| 401 && current_lnum < lnum | |
| 402 && current_lnum < syn_buf->b_ml.ml_line_count) | |
| 403 { | |
| 404 (void)syn_finish_line(FALSE); | |
| 405 if (!current_state_stored) | |
| 406 { | |
| 407 ++current_lnum; | |
| 1512 | 408 (void)store_current_state(); |
| 7 | 409 } |
| 410 | |
| 411 /* | |
| 412 * If the current_lnum is now the same as "lnum", keep the current | |
| 413 * state (this happens very often!). Otherwise invalidate | |
| 414 * current_state and figure it out below. | |
| 415 */ | |
| 416 if (current_lnum != lnum) | |
| 417 invalidate_current_state(); | |
| 418 } | |
| 419 else | |
| 420 invalidate_current_state(); | |
| 421 | |
| 422 /* | |
| 423 * Try to synchronize from a saved state in b_sst_array[]. | |
| 424 * Only do this if lnum is not before and not to far beyond a saved state. | |
| 425 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
426 if (INVALID_STATE(¤t_state) && syn_block->b_sst_array != NULL) |
| 7 | 427 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
428 // Find last valid saved state before start_lnum. |
|
19934
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
429 FOR_ALL_SYNSTATES(syn_block, p) |
| 7 | 430 { |
| 431 if (p->sst_lnum > lnum) | |
| 432 break; | |
| 433 if (p->sst_lnum <= lnum && p->sst_change_lnum == 0) | |
| 434 { | |
| 435 last_valid = p; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
436 if (p->sst_lnum >= lnum - syn_block->b_syn_sync_minlines) |
| 7 | 437 last_min_valid = p; |
| 438 } | |
| 439 } | |
| 440 if (last_min_valid != NULL) | |
| 441 load_current_state(last_min_valid); | |
| 442 } | |
| 443 | |
| 444 /* | |
| 445 * If "lnum" is before or far beyond a line with a saved state, need to | |
| 446 * re-synchronize. | |
| 447 */ | |
| 448 if (INVALID_STATE(¤t_state)) | |
| 449 { | |
| 450 syn_sync(wp, lnum, last_valid); | |
| 2906 | 451 if (current_lnum == 1) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
452 // First line is always valid, no matter "minlines". |
| 2906 | 453 first_stored = 1; |
| 454 else | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
455 // Need to parse "minlines" lines before state can be considered |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
456 // valid to store. |
| 2906 | 457 first_stored = current_lnum + syn_block->b_syn_sync_minlines; |
| 7 | 458 } |
| 459 else | |
| 460 first_stored = current_lnum; | |
| 461 | |
| 462 /* | |
| 463 * Advance from the sync point or saved state until the current line. | |
| 464 * Save some entries for syncing with later on. | |
| 465 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
466 if (syn_block->b_sst_len <= Rows) |
| 819 | 467 dist = 999999; |
| 468 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
469 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 470 while (current_lnum < lnum) |
| 471 { | |
| 472 syn_start_line(); | |
| 473 (void)syn_finish_line(FALSE); | |
| 474 ++current_lnum; | |
| 475 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
476 // If we parsed at least "minlines" lines or started at a valid |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
477 // state, the current state is considered valid. |
| 7 | 478 if (current_lnum >= first_stored) |
| 479 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
480 // Check if the saved state entry is for the current line and is |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
481 // equal to the current state. If so, then validate all saved |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
482 // states that depended on a change before the parsed line. |
| 7 | 483 if (prev == NULL) |
| 1512 | 484 prev = syn_stack_find_entry(current_lnum - 1); |
| 485 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
486 sp = syn_block->b_sst_first; |
| 7 | 487 else |
| 1512 | 488 sp = prev; |
| 489 while (sp != NULL && sp->sst_lnum < current_lnum) | |
| 490 sp = sp->sst_next; | |
| 7 | 491 if (sp != NULL |
| 492 && sp->sst_lnum == current_lnum | |
| 493 && syn_stack_equal(sp)) | |
| 494 { | |
| 495 parsed_lnum = current_lnum; | |
| 496 prev = sp; | |
| 497 while (sp != NULL && sp->sst_change_lnum <= parsed_lnum) | |
| 498 { | |
| 499 if (sp->sst_lnum <= lnum) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
500 // valid state before desired line, use this one |
| 7 | 501 prev = sp; |
| 502 else if (sp->sst_change_lnum == 0) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
503 // past saved states depending on change, break here. |
| 7 | 504 break; |
| 505 sp->sst_change_lnum = 0; | |
| 506 sp = sp->sst_next; | |
| 507 } | |
| 508 load_current_state(prev); | |
| 509 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
510 // Store the state at this line when it's the first one, the line |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
511 // where we start parsing, or some distance from the previously |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
512 // saved state. But only when parsed at least 'minlines'. |
| 7 | 513 else if (prev == NULL |
| 514 || current_lnum == lnum | |
| 515 || current_lnum >= prev->sst_lnum + dist) | |
| 1512 | 516 prev = store_current_state(); |
| 7 | 517 } |
| 518 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
519 // This can take a long time: break when CTRL-C pressed. The current |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
520 // state will be wrong then. |
| 7 | 521 line_breakcheck(); |
| 522 if (got_int) | |
| 523 { | |
| 524 current_lnum = lnum; | |
| 525 break; | |
| 526 } | |
| 527 } | |
| 528 | |
| 529 syn_start_line(); | |
| 530 } | |
| 531 | |
| 532 /* | |
| 533 * We cannot simply discard growarrays full of state_items or buf_states; we | |
| 534 * have to manually release their extmatch pointers first. | |
| 535 */ | |
| 536 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
537 clear_syn_state(synstate_T *p) |
| 7 | 538 { |
| 539 int i; | |
| 540 garray_T *gap; | |
| 541 | |
| 542 if (p->sst_stacksize > SST_FIX_STATES) | |
| 543 { | |
| 544 gap = &(p->sst_union.sst_ga); | |
| 545 for (i = 0; i < gap->ga_len; i++) | |
| 546 unref_extmatch(SYN_STATE_P(gap)[i].bs_extmatch); | |
| 547 ga_clear(gap); | |
| 548 } | |
| 549 else | |
| 550 { | |
| 551 for (i = 0; i < p->sst_stacksize; i++) | |
| 552 unref_extmatch(p->sst_union.sst_stack[i].bs_extmatch); | |
| 553 } | |
| 554 } | |
| 555 | |
| 556 /* | |
| 557 * Cleanup the current_state stack. | |
| 558 */ | |
| 559 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
560 clear_current_state(void) |
| 7 | 561 { |
| 562 int i; | |
| 563 stateitem_T *sip; | |
| 564 | |
| 565 sip = (stateitem_T *)(current_state.ga_data); | |
| 566 for (i = 0; i < current_state.ga_len; i++) | |
| 567 unref_extmatch(sip[i].si_extmatch); | |
| 568 ga_clear(¤t_state); | |
| 569 } | |
| 570 | |
| 571 /* | |
| 572 * Try to find a synchronisation point for line "lnum". | |
| 573 * | |
| 574 * This sets current_lnum and the current state. One of three methods is | |
| 575 * used: | |
| 576 * 1. Search backwards for the end of a C-comment. | |
| 577 * 2. Search backwards for given sync patterns. | |
| 578 * 3. Simply start on a given number of lines above "lnum". | |
| 579 */ | |
| 580 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
581 syn_sync( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
582 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
583 linenr_T start_lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
584 synstate_T *last_valid) |
| 7 | 585 { |
| 586 buf_T *curbuf_save; | |
| 587 win_T *curwin_save; | |
| 588 pos_T cursor_save; | |
| 589 int idx; | |
| 590 linenr_T lnum; | |
| 591 linenr_T end_lnum; | |
| 592 linenr_T break_lnum; | |
| 593 int had_sync_point; | |
| 594 stateitem_T *cur_si; | |
| 595 synpat_T *spp; | |
| 596 char_u *line; | |
| 597 int found_flags = 0; | |
| 598 int found_match_idx = 0; | |
| 599 linenr_T found_current_lnum = 0; | |
| 600 int found_current_col= 0; | |
| 601 lpos_T found_m_endpos; | |
| 442 | 602 colnr_T prev_current_col; |
| 7 | 603 |
| 604 /* | |
| 605 * Clear any current state that might be hanging around. | |
| 606 */ | |
| 607 invalidate_current_state(); | |
| 608 | |
| 609 /* | |
| 610 * Start at least "minlines" back. Default starting point for parsing is | |
| 611 * there. | |
| 612 * Start further back, to avoid that scrolling backwards will result in | |
| 613 * resyncing for every line. Now it resyncs only one out of N lines, | |
| 614 * where N is minlines * 1.5, or minlines * 2 if minlines is small. | |
| 615 * Watch out for overflow when minlines is MAXLNUM. | |
| 616 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
617 if (syn_block->b_syn_sync_minlines > start_lnum) |
| 7 | 618 start_lnum = 1; |
| 619 else | |
| 620 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
621 if (syn_block->b_syn_sync_minlines == 1) |
| 7 | 622 lnum = 1; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
623 else if (syn_block->b_syn_sync_minlines < 10) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
624 lnum = syn_block->b_syn_sync_minlines * 2; |
| 7 | 625 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
626 lnum = syn_block->b_syn_sync_minlines * 3 / 2; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
627 if (syn_block->b_syn_sync_maxlines != 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
628 && lnum > syn_block->b_syn_sync_maxlines) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
629 lnum = syn_block->b_syn_sync_maxlines; |
| 7 | 630 if (lnum >= start_lnum) |
| 631 start_lnum = 1; | |
| 632 else | |
| 633 start_lnum -= lnum; | |
| 634 } | |
| 635 current_lnum = start_lnum; | |
| 636 | |
| 637 /* | |
| 638 * 1. Search backwards for the end of a C-style comment. | |
| 639 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
640 if (syn_block->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 641 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
642 // Need to make syn_buf the current buffer for a moment, to be able to |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
643 // use find_start_comment(). |
| 7 | 644 curwin_save = curwin; |
| 645 curwin = wp; | |
| 646 curbuf_save = curbuf; | |
| 647 curbuf = syn_buf; | |
| 648 | |
| 649 /* | |
| 650 * Skip lines that end in a backslash. | |
| 651 */ | |
| 652 for ( ; start_lnum > 1; --start_lnum) | |
| 653 { | |
| 654 line = ml_get(start_lnum - 1); | |
| 655 if (*line == NUL || *(line + STRLEN(line) - 1) != '\\') | |
| 656 break; | |
| 657 } | |
| 658 current_lnum = start_lnum; | |
| 659 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
660 // set cursor to start of search |
| 7 | 661 cursor_save = wp->w_cursor; |
| 662 wp->w_cursor.lnum = start_lnum; | |
| 663 wp->w_cursor.col = 0; | |
| 664 | |
| 665 /* | |
| 666 * If the line is inside a comment, need to find the syntax item that | |
| 667 * defines the comment. | |
| 668 * Restrict the search for the end of a comment to b_syn_sync_maxlines. | |
| 669 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
670 if (find_start_comment((int)syn_block->b_syn_sync_maxlines) != NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
671 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
672 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
673 if (SYN_ITEMS(syn_block)[idx].sp_syn.id |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
674 == syn_block->b_syn_sync_id |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
675 && SYN_ITEMS(syn_block)[idx].sp_type == SPTYPE_START) |
| 7 | 676 { |
| 677 validate_current_state(); | |
| 678 if (push_current_state(idx) == OK) | |
| 679 update_si_attr(current_state.ga_len - 1); | |
| 680 break; | |
| 681 } | |
| 682 } | |
| 683 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
684 // restore cursor and buffer |
| 7 | 685 wp->w_cursor = cursor_save; |
| 686 curwin = curwin_save; | |
| 687 curbuf = curbuf_save; | |
| 688 } | |
| 689 | |
| 690 /* | |
| 691 * 2. Search backwards for given sync patterns. | |
| 692 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
693 else if (syn_block->b_syn_sync_flags & SF_MATCH) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
694 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
695 if (syn_block->b_syn_sync_maxlines != 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
696 && start_lnum > syn_block->b_syn_sync_maxlines) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
697 break_lnum = start_lnum - syn_block->b_syn_sync_maxlines; |
| 7 | 698 else |
| 699 break_lnum = 0; | |
| 700 | |
| 699 | 701 found_m_endpos.lnum = 0; |
| 702 found_m_endpos.col = 0; | |
| 7 | 703 end_lnum = start_lnum; |
| 704 lnum = start_lnum; | |
| 705 while (--lnum > break_lnum) | |
| 706 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
707 // This can take a long time: break when CTRL-C pressed. |
| 7 | 708 line_breakcheck(); |
| 709 if (got_int) | |
| 710 { | |
| 711 invalidate_current_state(); | |
| 712 current_lnum = start_lnum; | |
| 713 break; | |
| 714 } | |
| 715 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
716 // Check if we have run into a valid saved state stack now. |
| 7 | 717 if (last_valid != NULL && lnum == last_valid->sst_lnum) |
| 718 { | |
| 719 load_current_state(last_valid); | |
| 720 break; | |
| 721 } | |
| 722 | |
| 723 /* | |
| 724 * Check if the previous line has the line-continuation pattern. | |
| 725 */ | |
| 726 if (lnum > 1 && syn_match_linecont(lnum - 1)) | |
| 727 continue; | |
| 728 | |
| 729 /* | |
| 730 * Start with nothing on the state stack | |
| 731 */ | |
| 732 validate_current_state(); | |
| 733 | |
| 734 for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum) | |
| 735 { | |
| 736 syn_start_line(); | |
| 737 for (;;) | |
| 738 { | |
| 739 had_sync_point = syn_finish_line(TRUE); | |
| 740 /* | |
| 741 * When a sync point has been found, remember where, and | |
| 742 * continue to look for another one, further on in the line. | |
| 743 */ | |
| 744 if (had_sync_point && current_state.ga_len) | |
| 745 { | |
| 746 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 747 if (cur_si->si_m_endpos.lnum > start_lnum) | |
| 748 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
749 // ignore match that goes to after where started |
| 7 | 750 current_lnum = end_lnum; |
| 751 break; | |
| 752 } | |
| 1371 | 753 if (cur_si->si_idx < 0) |
| 754 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
755 // Cannot happen? |
| 1371 | 756 found_flags = 0; |
| 757 found_match_idx = KEYWORD_IDX; | |
| 758 } | |
| 759 else | |
| 760 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
761 spp = &(SYN_ITEMS(syn_block)[cur_si->si_idx]); |
| 1371 | 762 found_flags = spp->sp_flags; |
| 763 found_match_idx = spp->sp_sync_idx; | |
| 764 } | |
| 7 | 765 found_current_lnum = current_lnum; |
| 766 found_current_col = current_col; | |
| 767 found_m_endpos = cur_si->si_m_endpos; | |
| 768 /* | |
| 769 * Continue after the match (be aware of a zero-length | |
| 770 * match). | |
| 771 */ | |
| 772 if (found_m_endpos.lnum > current_lnum) | |
| 773 { | |
| 774 current_lnum = found_m_endpos.lnum; | |
| 775 current_col = found_m_endpos.col; | |
| 776 if (current_lnum >= end_lnum) | |
| 777 break; | |
| 778 } | |
| 779 else if (found_m_endpos.col > current_col) | |
| 780 current_col = found_m_endpos.col; | |
| 781 else | |
| 782 ++current_col; | |
| 783 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
784 // syn_current_attr() will have skipped the check for |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
785 // an item that ends here, need to do that now. Be |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
786 // careful not to go past the NUL. |
| 442 | 787 prev_current_col = current_col; |
| 788 if (syn_getcurline()[current_col] != NUL) | |
| 789 ++current_col; | |
| 7 | 790 check_state_ends(); |
| 442 | 791 current_col = prev_current_col; |
| 7 | 792 } |
| 793 else | |
| 794 break; | |
| 795 } | |
| 796 } | |
| 797 | |
| 798 /* | |
| 799 * If a sync point was encountered, break here. | |
| 800 */ | |
| 801 if (found_flags) | |
| 802 { | |
| 803 /* | |
| 804 * Put the item that was specified by the sync point on the | |
| 805 * state stack. If there was no item specified, make the | |
| 806 * state stack empty. | |
| 807 */ | |
| 808 clear_current_state(); | |
| 809 if (found_match_idx >= 0 | |
| 810 && push_current_state(found_match_idx) == OK) | |
| 811 update_si_attr(current_state.ga_len - 1); | |
| 812 | |
| 813 /* | |
| 814 * When using "grouphere", continue from the sync point | |
| 815 * match, until the end of the line. Parsing starts at | |
| 816 * the next line. | |
| 817 * For "groupthere" the parsing starts at start_lnum. | |
| 818 */ | |
| 819 if (found_flags & HL_SYNC_HERE) | |
| 820 { | |
| 821 if (current_state.ga_len) | |
| 822 { | |
| 823 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 824 cur_si->si_h_startpos.lnum = found_current_lnum; | |
| 825 cur_si->si_h_startpos.col = found_current_col; | |
| 826 update_si_end(cur_si, (int)current_col, TRUE); | |
| 827 check_keepend(); | |
| 828 } | |
| 829 current_col = found_m_endpos.col; | |
| 830 current_lnum = found_m_endpos.lnum; | |
| 831 (void)syn_finish_line(FALSE); | |
| 832 ++current_lnum; | |
| 833 } | |
| 834 else | |
| 835 current_lnum = start_lnum; | |
| 836 | |
| 837 break; | |
| 838 } | |
| 839 | |
| 840 end_lnum = lnum; | |
| 841 invalidate_current_state(); | |
| 842 } | |
| 843 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
844 // Ran into start of the file or exceeded maximum number of lines |
| 7 | 845 if (lnum <= break_lnum) |
| 846 { | |
| 847 invalidate_current_state(); | |
| 848 current_lnum = break_lnum + 1; | |
| 849 } | |
| 850 } | |
| 851 | |
| 852 validate_current_state(); | |
| 853 } | |
| 854 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
855 static void |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
856 save_chartab(char_u *chartab) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
857 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
858 if (syn_block->b_syn_isk != empty_option) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
859 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
860 mch_memmove(chartab, syn_buf->b_chartab, (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
861 mch_memmove(syn_buf->b_chartab, syn_win->w_s->b_syn_chartab, |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
862 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
863 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
864 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
865 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
866 static void |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
867 restore_chartab(char_u *chartab) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
868 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
869 if (syn_win->w_s->b_syn_isk != empty_option) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
870 mch_memmove(syn_buf->b_chartab, chartab, (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
871 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
872 |
| 7 | 873 /* |
| 874 * Return TRUE if the line-continuation pattern matches in line "lnum". | |
| 875 */ | |
| 876 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
877 syn_match_linecont(linenr_T lnum) |
| 7 | 878 { |
| 879 regmmatch_T regmatch; | |
| 6375 | 880 int r; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
881 char_u buf_chartab[32]; // chartab array for syn iskyeyword |
| 7 | 882 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
883 if (syn_block->b_syn_linecont_prog != NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
884 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
885 // use syntax iskeyword option |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
886 save_chartab(buf_chartab); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
887 regmatch.rmm_ic = syn_block->b_syn_linecont_ic; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
888 regmatch.regprog = syn_block->b_syn_linecont_prog; |
| 6375 | 889 r = syn_regexec(®match, lnum, (colnr_T)0, |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
890 IF_SYN_TIME(&syn_block->b_syn_linecont_time)); |
| 6375 | 891 syn_block->b_syn_linecont_prog = regmatch.regprog; |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
892 restore_chartab(buf_chartab); |
| 6375 | 893 return r; |
| 7 | 894 } |
| 895 return FALSE; | |
| 896 } | |
| 897 | |
| 898 /* | |
| 899 * Prepare the current state for the start of a line. | |
| 900 */ | |
| 901 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
902 syn_start_line(void) |
| 7 | 903 { |
| 904 current_finished = FALSE; | |
| 905 current_col = 0; | |
| 906 | |
| 907 /* | |
| 908 * Need to update the end of a start/skip/end that continues from the | |
| 909 * previous line and regions that have "keepend". | |
| 910 */ | |
| 911 if (current_state.ga_len > 0) | |
| 2863 | 912 { |
| 7 | 913 syn_update_ends(TRUE); |
| 2863 | 914 check_state_ends(); |
| 915 } | |
| 7 | 916 |
| 917 next_match_idx = -1; | |
| 918 ++current_line_id; | |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
919 #ifdef FEAT_CONCEAL |
|
11579
52e3a77c097b
patch 8.0.0672: third item of synconcealed() changes too often
Christian Brabandt <cb@256bit.org>
parents:
11541
diff
changeset
|
920 next_seqnr = 1; |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
921 #endif |
| 7 | 922 } |
| 923 | |
| 924 /* | |
| 925 * Check for items in the stack that need their end updated. | |
| 926 * When "startofline" is TRUE the last item is always updated. | |
| 927 * When "startofline" is FALSE the item with "keepend" is forcefully updated. | |
| 928 */ | |
| 929 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
930 syn_update_ends(int startofline) |
| 7 | 931 { |
| 932 stateitem_T *cur_si; | |
| 933 int i; | |
| 991 | 934 int seen_keepend; |
| 7 | 935 |
| 936 if (startofline) | |
| 937 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
938 // Check for a match carried over from a previous line with a |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
939 // contained region. The match ends as soon as the region ends. |
| 7 | 940 for (i = 0; i < current_state.ga_len; ++i) |
| 941 { | |
| 942 cur_si = &CUR_STATE(i); | |
| 943 if (cur_si->si_idx >= 0 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
944 && (SYN_ITEMS(syn_block)[cur_si->si_idx]).sp_type |
| 7 | 945 == SPTYPE_MATCH |
| 946 && cur_si->si_m_endpos.lnum < current_lnum) | |
| 947 { | |
| 948 cur_si->si_flags |= HL_MATCHCONT; | |
| 949 cur_si->si_m_endpos.lnum = 0; | |
| 950 cur_si->si_m_endpos.col = 0; | |
| 951 cur_si->si_h_endpos = cur_si->si_m_endpos; | |
| 952 cur_si->si_ends = TRUE; | |
| 953 } | |
| 954 } | |
| 955 } | |
| 956 | |
| 957 /* | |
| 958 * Need to update the end of a start/skip/end that continues from the | |
| 959 * previous line. And regions that have "keepend", because they may | |
| 991 | 960 * influence contained items. If we've just removed "extend" |
| 961 * (startofline == 0) then we should update ends of normal regions | |
| 962 * contained inside "keepend" because "extend" could have extended | |
| 963 * these "keepend" regions as well as contained normal regions. | |
| 7 | 964 * Then check for items ending in column 0. |
| 965 */ | |
| 966 i = current_state.ga_len - 1; | |
| 967 if (keepend_level >= 0) | |
| 968 for ( ; i > keepend_level; --i) | |
| 969 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 970 break; | |
| 991 | 971 |
| 972 seen_keepend = FALSE; | |
| 7 | 973 for ( ; i < current_state.ga_len; ++i) |
| 974 { | |
| 975 cur_si = &CUR_STATE(i); | |
| 976 if ((cur_si->si_flags & HL_KEEPEND) | |
| 991 | 977 || (seen_keepend && !startofline) |
| 7 | 978 || (i == current_state.ga_len - 1 && startofline)) |
| 979 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
980 cur_si->si_h_startpos.col = 0; // start highl. in col 0 |
| 7 | 981 cur_si->si_h_startpos.lnum = current_lnum; |
| 982 | |
| 983 if (!(cur_si->si_flags & HL_MATCHCONT)) | |
| 984 update_si_end(cur_si, (int)current_col, !startofline); | |
| 991 | 985 |
| 986 if (!startofline && (cur_si->si_flags & HL_KEEPEND)) | |
| 987 seen_keepend = TRUE; | |
| 7 | 988 } |
| 989 } | |
| 990 check_keepend(); | |
| 991 } | |
| 992 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
993 ///////////////////////////////////////// |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
994 // Handling of the state stack cache. |
| 7 | 995 |
| 996 /* | |
| 997 * EXPLANATION OF THE SYNTAX STATE STACK CACHE | |
| 998 * | |
| 999 * To speed up syntax highlighting, the state stack for the start of some | |
| 1000 * lines is cached. These entries can be used to start parsing at that point. | |
| 1001 * | |
| 1002 * The stack is kept in b_sst_array[] for each buffer. There is a list of | |
| 1003 * valid entries. b_sst_first points to the first one, then follow sst_next. | |
| 1004 * The entries are sorted on line number. The first entry is often for line 2 | |
| 1005 * (line 1 always starts with an empty stack). | |
| 1006 * There is also a list for free entries. This construction is used to avoid | |
| 1007 * having to allocate and free memory blocks too often. | |
| 1008 * | |
| 1009 * When making changes to the buffer, this is logged in b_mod_*. When calling | |
| 1010 * update_screen() to update the display, it will call | |
| 1011 * syn_stack_apply_changes() for each displayed buffer to adjust the cached | |
| 1012 * entries. The entries which are inside the changed area are removed, | |
| 1013 * because they must be recomputed. Entries below the changed have their line | |
| 1014 * number adjusted for deleted/inserted lines, and have their sst_change_lnum | |
| 1015 * set to indicate that a check must be made if the changed lines would change | |
| 1016 * the cached entry. | |
| 1017 * | |
| 1018 * When later displaying lines, an entry is stored for each line. Displayed | |
| 1019 * lines are likely to be displayed again, in which case the state at the | |
| 1020 * start of the line is needed. | |
| 1021 * For not displayed lines, an entry is stored for every so many lines. These | |
| 1022 * entries will be used e.g., when scrolling backwards. The distance between | |
| 1023 * entries depends on the number of lines in the buffer. For small buffers | |
| 1024 * the distance is fixed at SST_DIST, for large buffers there is a fixed | |
| 1025 * number of entries SST_MAX_ENTRIES, and the distance is computed. | |
| 1026 */ | |
| 1027 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1028 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1029 syn_stack_free_block(synblock_T *block) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1030 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1031 synstate_T *p; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1032 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1033 if (block->b_sst_array != NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1034 { |
|
19934
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
1035 FOR_ALL_SYNSTATES(block, p) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1036 clear_syn_state(p); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1037 VIM_CLEAR(block->b_sst_array); |
|
14850
85ef79b16181
patch 8.1.0437: may access freed memory when syntax HL times out
Christian Brabandt <cb@256bit.org>
parents:
14700
diff
changeset
|
1038 block->b_sst_first = NULL; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1039 block->b_sst_len = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1040 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1041 } |
| 7 | 1042 /* |
| 1043 * Free b_sst_array[] for buffer "buf". | |
| 1044 * Used when syntax items changed to force resyncing everywhere. | |
| 1045 */ | |
| 1046 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1047 syn_stack_free_all(synblock_T *block) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1048 { |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1049 #ifdef FEAT_FOLDING |
| 7 | 1050 win_T *wp; |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1051 #endif |
| 7 | 1052 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1053 syn_stack_free_block(block); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1054 |
| 7 | 1055 #ifdef FEAT_FOLDING |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1056 // When using "syntax" fold method, must update all folds. |
| 7 | 1057 FOR_ALL_WINDOWS(wp) |
| 1058 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1059 if (wp->w_s == block && foldmethodIsSyntax(wp)) |
| 7 | 1060 foldUpdateAll(wp); |
| 1061 } | |
| 1062 #endif | |
| 1063 } | |
| 1064 | |
| 1065 /* | |
| 1066 * Allocate the syntax state stack for syn_buf when needed. | |
| 1067 * If the number of entries in b_sst_array[] is much too big or a bit too | |
| 1068 * small, reallocate it. | |
| 1069 * Also used to allocate b_sst_array[] for the first time. | |
| 1070 */ | |
| 1071 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1072 syn_stack_alloc(void) |
| 7 | 1073 { |
| 1074 long len; | |
| 1075 synstate_T *to, *from; | |
| 1076 synstate_T *sstp; | |
| 1077 | |
| 1078 len = syn_buf->b_ml.ml_line_count / SST_DIST + Rows * 2; | |
| 1079 if (len < SST_MIN_ENTRIES) | |
| 1080 len = SST_MIN_ENTRIES; | |
| 1081 else if (len > SST_MAX_ENTRIES) | |
| 1082 len = SST_MAX_ENTRIES; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1083 if (syn_block->b_sst_len > len * 2 || syn_block->b_sst_len < len) |
| 7 | 1084 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1085 // Allocate 50% too much, to avoid reallocating too often. |
| 7 | 1086 len = syn_buf->b_ml.ml_line_count; |
| 1087 len = (len + len / 2) / SST_DIST + Rows * 2; | |
| 1088 if (len < SST_MIN_ENTRIES) | |
| 1089 len = SST_MIN_ENTRIES; | |
| 1090 else if (len > SST_MAX_ENTRIES) | |
| 1091 len = SST_MAX_ENTRIES; | |
| 1092 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1093 if (syn_block->b_sst_array != NULL) |
| 7 | 1094 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1095 // When shrinking the array, cleanup the existing stack. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1096 // Make sure that all valid entries fit in the new array. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1097 while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len |
| 7 | 1098 && syn_stack_cleanup()) |
| 1099 ; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1100 if (len < syn_block->b_sst_len - syn_block->b_sst_freecount + 2) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1101 len = syn_block->b_sst_len - syn_block->b_sst_freecount + 2; |
| 7 | 1102 } |
| 1103 | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
1104 sstp = ALLOC_CLEAR_MULT(synstate_T, len); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1105 if (sstp == NULL) // out of memory! |
| 7 | 1106 return; |
| 1107 | |
| 1108 to = sstp - 1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1109 if (syn_block->b_sst_array != NULL) |
| 7 | 1110 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1111 // Move the states from the old array to the new one. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1112 for (from = syn_block->b_sst_first; from != NULL; |
| 7 | 1113 from = from->sst_next) |
| 1114 { | |
| 1115 ++to; | |
| 1116 *to = *from; | |
| 1117 to->sst_next = to + 1; | |
| 1118 } | |
| 1119 } | |
| 1120 if (to != sstp - 1) | |
| 1121 { | |
| 1122 to->sst_next = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1123 syn_block->b_sst_first = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1124 syn_block->b_sst_freecount = len - (int)(to - sstp) - 1; |
| 7 | 1125 } |
| 1126 else | |
| 1127 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1128 syn_block->b_sst_first = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1129 syn_block->b_sst_freecount = len; |
| 7 | 1130 } |
| 1131 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1132 // Create the list of free entries. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1133 syn_block->b_sst_firstfree = to + 1; |
| 7 | 1134 while (++to < sstp + len) |
| 1135 to->sst_next = to + 1; | |
| 1136 (sstp + len - 1)->sst_next = NULL; | |
| 1137 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1138 vim_free(syn_block->b_sst_array); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1139 syn_block->b_sst_array = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1140 syn_block->b_sst_len = len; |
| 7 | 1141 } |
| 1142 } | |
| 1143 | |
| 1144 /* | |
| 1145 * Check for changes in a buffer to affect stored syntax states. Uses the | |
| 1146 * b_mod_* fields. | |
| 1147 * Called from update_screen(), before screen is being updated, once for each | |
| 1148 * displayed buffer. | |
| 1149 */ | |
| 1150 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1151 syn_stack_apply_changes(buf_T *buf) |
| 7 | 1152 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1153 win_T *wp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1154 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1155 syn_stack_apply_changes_block(&buf->b_s, buf); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1156 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1157 FOR_ALL_WINDOWS(wp) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1158 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1159 if ((wp->w_buffer == buf) && (wp->w_s != &buf->b_s)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1160 syn_stack_apply_changes_block(wp->w_s, buf); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1161 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1162 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1163 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1164 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1165 syn_stack_apply_changes_block(synblock_T *block, buf_T *buf) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1166 { |
| 7 | 1167 synstate_T *p, *prev, *np; |
| 1168 linenr_T n; | |
| 1169 | |
| 1170 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1171 for (p = block->b_sst_first; p != NULL; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1172 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1173 if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top) |
| 7 | 1174 { |
| 1175 n = p->sst_lnum + buf->b_mod_xlines; | |
| 1176 if (n <= buf->b_mod_bot) | |
| 1177 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1178 // this state is inside the changed area, remove it |
| 7 | 1179 np = p->sst_next; |
| 1180 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1181 block->b_sst_first = np; |
| 7 | 1182 else |
| 1183 prev->sst_next = np; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1184 syn_stack_free_entry(block, p); |
| 7 | 1185 p = np; |
| 1186 continue; | |
| 1187 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1188 // This state is below the changed area. Remember the line |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1189 // that needs to be parsed before this entry can be made valid |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1190 // again. |
| 7 | 1191 if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top) |
| 1192 { | |
| 1193 if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top) | |
| 1194 p->sst_change_lnum += buf->b_mod_xlines; | |
| 1195 else | |
| 1196 p->sst_change_lnum = buf->b_mod_top; | |
| 1197 } | |
| 1198 if (p->sst_change_lnum == 0 | |
| 1199 || p->sst_change_lnum < buf->b_mod_bot) | |
| 1200 p->sst_change_lnum = buf->b_mod_bot; | |
| 1201 | |
| 1202 p->sst_lnum = n; | |
| 1203 } | |
| 1204 prev = p; | |
| 1205 p = p->sst_next; | |
| 1206 } | |
| 1207 } | |
| 1208 | |
| 1209 /* | |
| 1210 * Reduce the number of entries in the state stack for syn_buf. | |
| 1211 * Returns TRUE if at least one entry was freed. | |
| 1212 */ | |
| 1213 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1214 syn_stack_cleanup(void) |
| 7 | 1215 { |
| 1216 synstate_T *p, *prev; | |
| 1217 disptick_T tick; | |
| 1218 int above; | |
| 1219 int dist; | |
| 1220 int retval = FALSE; | |
| 1221 | |
|
14850
85ef79b16181
patch 8.1.0437: may access freed memory when syntax HL times out
Christian Brabandt <cb@256bit.org>
parents:
14700
diff
changeset
|
1222 if (syn_block->b_sst_first == NULL) |
| 7 | 1223 return retval; |
| 1224 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1225 // Compute normal distance between non-displayed entries. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1226 if (syn_block->b_sst_len <= Rows) |
| 819 | 1227 dist = 999999; |
| 1228 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1229 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 1230 |
| 1231 /* | |
| 2020 | 1232 * Go through the list to find the "tick" for the oldest entry that can |
| 7 | 1233 * be removed. Set "above" when the "tick" for the oldest entry is above |
| 1234 * "b_sst_lasttick" (the display tick wraps around). | |
| 1235 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1236 tick = syn_block->b_sst_lasttick; |
| 7 | 1237 above = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1238 prev = syn_block->b_sst_first; |
| 7 | 1239 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1240 { | |
| 1241 if (prev->sst_lnum + dist > p->sst_lnum) | |
| 1242 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1243 if (p->sst_tick > syn_block->b_sst_lasttick) |
| 7 | 1244 { |
| 1245 if (!above || p->sst_tick < tick) | |
| 1246 tick = p->sst_tick; | |
| 1247 above = TRUE; | |
| 1248 } | |
| 1249 else if (!above && p->sst_tick < tick) | |
| 1250 tick = p->sst_tick; | |
| 1251 } | |
| 1252 } | |
| 1253 | |
| 1254 /* | |
| 1255 * Go through the list to make the entries for the oldest tick at an | |
| 1256 * interval of several lines. | |
| 1257 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1258 prev = syn_block->b_sst_first; |
| 7 | 1259 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1260 { | |
| 1261 if (p->sst_tick == tick && prev->sst_lnum + dist > p->sst_lnum) | |
| 1262 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1263 // Move this entry from used list to free list |
| 7 | 1264 prev->sst_next = p->sst_next; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1265 syn_stack_free_entry(syn_block, p); |
| 7 | 1266 p = prev; |
| 1267 retval = TRUE; | |
| 1268 } | |
| 1269 } | |
| 1270 return retval; | |
| 1271 } | |
| 1272 | |
| 1273 /* | |
| 1274 * Free the allocated memory for a syn_state item. | |
| 1275 * Move the entry into the free list. | |
| 1276 */ | |
| 1277 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1278 syn_stack_free_entry(synblock_T *block, synstate_T *p) |
| 7 | 1279 { |
| 1280 clear_syn_state(p); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1281 p->sst_next = block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1282 block->b_sst_firstfree = p; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1283 ++block->b_sst_freecount; |
| 7 | 1284 } |
| 1285 | |
| 1286 /* | |
| 1287 * Find an entry in the list of state stacks at or before "lnum". | |
| 1288 * Returns NULL when there is no entry or the first entry is after "lnum". | |
| 1289 */ | |
| 1290 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1291 syn_stack_find_entry(linenr_T lnum) |
| 7 | 1292 { |
| 1293 synstate_T *p, *prev; | |
| 1294 | |
| 1295 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1296 for (p = syn_block->b_sst_first; p != NULL; prev = p, p = p->sst_next) |
| 7 | 1297 { |
| 1298 if (p->sst_lnum == lnum) | |
| 1299 return p; | |
| 1300 if (p->sst_lnum > lnum) | |
| 1301 break; | |
| 1302 } | |
| 1303 return prev; | |
| 1304 } | |
| 1305 | |
| 1306 /* | |
| 1307 * Try saving the current state in b_sst_array[]. | |
| 1308 * The current state must be valid for the start of the current_lnum line! | |
| 1309 */ | |
| 1310 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1311 store_current_state(void) |
| 7 | 1312 { |
| 1313 int i; | |
| 1314 synstate_T *p; | |
| 1315 bufstate_T *bp; | |
| 1316 stateitem_T *cur_si; | |
| 1512 | 1317 synstate_T *sp = syn_stack_find_entry(current_lnum); |
| 7 | 1318 |
| 1319 /* | |
| 1320 * If the current state contains a start or end pattern that continues | |
| 1321 * from the previous line, we can't use it. Don't store it then. | |
| 1322 */ | |
| 1323 for (i = current_state.ga_len - 1; i >= 0; --i) | |
| 1324 { | |
| 1325 cur_si = &CUR_STATE(i); | |
| 1326 if (cur_si->si_h_startpos.lnum >= current_lnum | |
| 1327 || cur_si->si_m_endpos.lnum >= current_lnum | |
| 1328 || cur_si->si_h_endpos.lnum >= current_lnum | |
| 1329 || (cur_si->si_end_idx | |
| 1330 && cur_si->si_eoe_pos.lnum >= current_lnum)) | |
| 1331 break; | |
| 1332 } | |
| 1333 if (i >= 0) | |
| 1334 { | |
| 1335 if (sp != NULL) | |
| 1336 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1337 // find "sp" in the list and remove it |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1338 if (syn_block->b_sst_first == sp) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1339 // it's the first entry |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1340 syn_block->b_sst_first = sp->sst_next; |
| 7 | 1341 else |
| 1342 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1343 // find the entry just before this one to adjust sst_next |
|
19934
3ff714d765ba
patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
1344 FOR_ALL_SYNSTATES(syn_block, p) |
| 7 | 1345 if (p->sst_next == sp) |
| 1346 break; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1347 if (p != NULL) // just in case |
| 840 | 1348 p->sst_next = sp->sst_next; |
| 7 | 1349 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1350 syn_stack_free_entry(syn_block, sp); |
| 7 | 1351 sp = NULL; |
| 1352 } | |
| 1353 } | |
| 1354 else if (sp == NULL || sp->sst_lnum != current_lnum) | |
| 1355 { | |
| 1356 /* | |
| 1357 * Add a new entry | |
| 1358 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1359 // If no free items, cleanup the array first. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1360 if (syn_block->b_sst_freecount == 0) |
| 7 | 1361 { |
| 1362 (void)syn_stack_cleanup(); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1363 // "sp" may have been moved to the freelist now |
| 7 | 1364 sp = syn_stack_find_entry(current_lnum); |
| 1365 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1366 // Still no free items? Must be a strange problem... |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1367 if (syn_block->b_sst_freecount == 0) |
| 7 | 1368 sp = NULL; |
| 1369 else | |
| 1370 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1371 // Take the first item from the free list and put it in the used |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1372 // list, after *sp |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1373 p = syn_block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1374 syn_block->b_sst_firstfree = p->sst_next; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1375 --syn_block->b_sst_freecount; |
| 7 | 1376 if (sp == NULL) |
| 1377 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1378 // Insert in front of the list |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1379 p->sst_next = syn_block->b_sst_first; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1380 syn_block->b_sst_first = p; |
| 7 | 1381 } |
| 1382 else | |
| 1383 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1384 // insert in list after *sp |
| 7 | 1385 p->sst_next = sp->sst_next; |
| 1386 sp->sst_next = p; | |
| 1387 } | |
| 1388 sp = p; | |
| 1389 sp->sst_stacksize = 0; | |
| 1390 sp->sst_lnum = current_lnum; | |
| 1391 } | |
| 1392 } | |
| 1393 if (sp != NULL) | |
| 1394 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1395 // When overwriting an existing state stack, clear it first |
| 7 | 1396 clear_syn_state(sp); |
| 1397 sp->sst_stacksize = current_state.ga_len; | |
| 1398 if (current_state.ga_len > SST_FIX_STATES) | |
| 1399 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1400 // Need to clear it, might be something remaining from when the |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1401 // length was less than SST_FIX_STATES. |
|
27028
c9474ae175f4
patch 8.2.4043: using int for second argument of ga_init2()
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
1402 ga_init2(&sp->sst_union.sst_ga, sizeof(bufstate_T), 1); |
| 7 | 1403 if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL) |
| 1404 sp->sst_stacksize = 0; | |
| 1405 else | |
| 1406 sp->sst_union.sst_ga.ga_len = current_state.ga_len; | |
| 1407 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
| 1408 } | |
| 1409 else | |
| 1410 bp = sp->sst_union.sst_stack; | |
| 1411 for (i = 0; i < sp->sst_stacksize; ++i) | |
| 1412 { | |
| 1413 bp[i].bs_idx = CUR_STATE(i).si_idx; | |
| 1414 bp[i].bs_flags = CUR_STATE(i).si_flags; | |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1415 #ifdef FEAT_CONCEAL |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1416 bp[i].bs_seqnr = CUR_STATE(i).si_seqnr; |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1417 bp[i].bs_cchar = CUR_STATE(i).si_cchar; |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1418 #endif |
| 7 | 1419 bp[i].bs_extmatch = ref_extmatch(CUR_STATE(i).si_extmatch); |
| 1420 } | |
| 1421 sp->sst_next_flags = current_next_flags; | |
| 1422 sp->sst_next_list = current_next_list; | |
| 1423 sp->sst_tick = display_tick; | |
| 1424 sp->sst_change_lnum = 0; | |
| 1425 } | |
| 1426 current_state_stored = TRUE; | |
| 1427 return sp; | |
| 1428 } | |
| 1429 | |
| 1430 /* | |
| 1431 * Copy a state stack from "from" in b_sst_array[] to current_state; | |
| 1432 */ | |
| 1433 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1434 load_current_state(synstate_T *from) |
| 7 | 1435 { |
| 1436 int i; | |
| 1437 bufstate_T *bp; | |
| 1438 | |
| 1439 clear_current_state(); | |
| 1440 validate_current_state(); | |
| 1441 keepend_level = -1; | |
| 1442 if (from->sst_stacksize | |
| 1443 && ga_grow(¤t_state, from->sst_stacksize) != FAIL) | |
| 1444 { | |
| 1445 if (from->sst_stacksize > SST_FIX_STATES) | |
| 1446 bp = SYN_STATE_P(&(from->sst_union.sst_ga)); | |
| 1447 else | |
| 1448 bp = from->sst_union.sst_stack; | |
| 1449 for (i = 0; i < from->sst_stacksize; ++i) | |
| 1450 { | |
| 1451 CUR_STATE(i).si_idx = bp[i].bs_idx; | |
| 1452 CUR_STATE(i).si_flags = bp[i].bs_flags; | |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1453 #ifdef FEAT_CONCEAL |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1454 CUR_STATE(i).si_seqnr = bp[i].bs_seqnr; |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1455 CUR_STATE(i).si_cchar = bp[i].bs_cchar; |
|
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1456 #endif |
| 7 | 1457 CUR_STATE(i).si_extmatch = ref_extmatch(bp[i].bs_extmatch); |
| 1458 if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND)) | |
| 1459 keepend_level = i; | |
| 1460 CUR_STATE(i).si_ends = FALSE; | |
| 1461 CUR_STATE(i).si_m_lnum = 0; | |
| 1462 if (CUR_STATE(i).si_idx >= 0) | |
| 1463 CUR_STATE(i).si_next_list = | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1464 (SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_next_list; |
| 7 | 1465 else |
| 1466 CUR_STATE(i).si_next_list = NULL; | |
| 1467 update_si_attr(i); | |
| 1468 } | |
| 1469 current_state.ga_len = from->sst_stacksize; | |
| 1470 } | |
| 1471 current_next_list = from->sst_next_list; | |
| 1472 current_next_flags = from->sst_next_flags; | |
| 1473 current_lnum = from->sst_lnum; | |
| 1474 } | |
| 1475 | |
| 1476 /* | |
| 1477 * Compare saved state stack "*sp" with the current state. | |
| 1478 * Return TRUE when they are equal. | |
| 1479 */ | |
| 1480 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1481 syn_stack_equal(synstate_T *sp) |
| 7 | 1482 { |
| 1483 int i, j; | |
| 1484 bufstate_T *bp; | |
| 1485 reg_extmatch_T *six, *bsx; | |
| 1486 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1487 // First a quick check if the stacks have the same size end nextlist. |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1488 if (sp->sst_stacksize != current_state.ga_len |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1489 || sp->sst_next_list != current_next_list) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1490 return FALSE; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1491 |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1492 // Need to compare all states on both stacks. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1493 if (sp->sst_stacksize > SST_FIX_STATES) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1494 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1495 else |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1496 bp = sp->sst_union.sst_stack; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1497 |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1498 for (i = current_state.ga_len; --i >= 0; ) |
| 7 | 1499 { |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1500 // If the item has another index the state is different. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1501 if (bp[i].bs_idx != CUR_STATE(i).si_idx) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1502 break; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1503 if (bp[i].bs_extmatch == CUR_STATE(i).si_extmatch) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1504 continue; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1505 // When the extmatch pointers are different, the strings in them can |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1506 // still be the same. Check if the extmatch references are equal. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1507 bsx = bp[i].bs_extmatch; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1508 six = CUR_STATE(i).si_extmatch; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1509 // If one of the extmatch pointers is NULL the states are different. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1510 if (bsx == NULL || six == NULL) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1511 break; |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1512 for (j = 0; j < NSUBEXP; ++j) |
| 7 | 1513 { |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1514 // Check each referenced match string. They must all be equal. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1515 if (bsx->matches[j] != six->matches[j]) |
| 7 | 1516 { |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1517 // If the pointer is different it can still be the same text. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1518 // Compare the strings, ignore case when the start item has the |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1519 // sp_ic flag set. |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1520 if (bsx->matches[j] == NULL || six->matches[j] == NULL) |
| 7 | 1521 break; |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1522 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1523 ? MB_STRICMP(bsx->matches[j], six->matches[j]) != 0 |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1524 : STRCMP(bsx->matches[j], six->matches[j]) != 0) |
| 7 | 1525 break; |
| 1526 } | |
| 1527 } | |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1528 if (j != NSUBEXP) |
|
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1529 break; |
| 7 | 1530 } |
|
29566
99e3763cbd34
patch 9.0.0124: code has more indent than needed
Bram Moolenaar <Bram@vim.org>
parents:
29218
diff
changeset
|
1531 return i < 0 ? TRUE : FALSE; |
| 7 | 1532 } |
| 1533 | |
| 1534 /* | |
| 1535 * We stop parsing syntax above line "lnum". If the stored state at or below | |
| 1536 * this line depended on a change before it, it now depends on the line below | |
| 1537 * the last parsed line. | |
| 1538 * The window looks like this: | |
| 1539 * line which changed | |
| 1540 * displayed line | |
| 1541 * displayed line | |
| 1542 * lnum -> line below window | |
| 1543 */ | |
| 1544 void | |
|
30831
fbeebe308514
patch 9.0.0750: crash when popup closed in callback
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
1545 syntax_end_parsing(win_T *wp, linenr_T lnum) |
| 7 | 1546 { |
| 1547 synstate_T *sp; | |
| 1548 | |
|
30831
fbeebe308514
patch 9.0.0750: crash when popup closed in callback
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
1549 if (syn_block != wp->w_s) |
|
fbeebe308514
patch 9.0.0750: crash when popup closed in callback
Bram Moolenaar <Bram@vim.org>
parents:
30310
diff
changeset
|
1550 return; // not the right window |
| 7 | 1551 sp = syn_stack_find_entry(lnum); |
| 1552 if (sp != NULL && sp->sst_lnum < lnum) | |
| 1553 sp = sp->sst_next; | |
| 1554 | |
| 1555 if (sp != NULL && sp->sst_change_lnum != 0) | |
| 1556 sp->sst_change_lnum = lnum; | |
| 1557 } | |
| 1558 | |
| 1559 /* | |
| 1560 * End of handling of the state stack. | |
| 1561 ****************************************/ | |
| 1562 | |
| 1563 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1564 invalidate_current_state(void) |
| 7 | 1565 { |
| 1566 clear_current_state(); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1567 current_state.ga_itemsize = 0; // mark current_state invalid |
| 7 | 1568 current_next_list = NULL; |
| 1569 keepend_level = -1; | |
| 1570 } | |
| 1571 | |
| 1572 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1573 validate_current_state(void) |
| 7 | 1574 { |
| 1575 current_state.ga_itemsize = sizeof(stateitem_T); | |
| 1576 current_state.ga_growsize = 3; | |
| 1577 } | |
| 1578 | |
| 1579 /* | |
| 1580 * Return TRUE if the syntax at start of lnum changed since last time. | |
| 1581 * This will only be called just after get_syntax_attr() for the previous | |
| 1582 * line, to check if the next line needs to be redrawn too. | |
| 1583 */ | |
| 1584 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1585 syntax_check_changed(linenr_T lnum) |
| 7 | 1586 { |
| 1587 int retval = TRUE; | |
| 1588 synstate_T *sp; | |
| 1589 | |
| 1590 /* | |
| 1591 * Check the state stack when: | |
| 1592 * - lnum is just below the previously syntaxed line. | |
| 1593 * - lnum is not before the lines with saved states. | |
| 1594 * - lnum is not past the lines with saved states. | |
| 1595 * - lnum is at or before the last changed line. | |
| 1596 */ | |
| 1597 if (VALID_STATE(¤t_state) && lnum == current_lnum + 1) | |
| 1598 { | |
| 1599 sp = syn_stack_find_entry(lnum); | |
| 1600 if (sp != NULL && sp->sst_lnum == lnum) | |
| 1601 { | |
| 1602 /* | |
| 1603 * finish the previous line (needed when not all of the line was | |
| 1604 * drawn) | |
| 1605 */ | |
| 1606 (void)syn_finish_line(FALSE); | |
| 1607 | |
| 1608 /* | |
| 1609 * Compare the current state with the previously saved state of | |
| 1610 * the line. | |
| 1611 */ | |
| 1612 if (syn_stack_equal(sp)) | |
| 1613 retval = FALSE; | |
| 1614 | |
| 1615 /* | |
| 1616 * Store the current state in b_sst_array[] for later use. | |
| 1617 */ | |
| 1618 ++current_lnum; | |
| 1512 | 1619 (void)store_current_state(); |
| 7 | 1620 } |
| 1621 } | |
| 1622 | |
| 1623 return retval; | |
| 1624 } | |
| 1625 | |
| 1626 /* | |
| 1627 * Finish the current line. | |
| 1628 * This doesn't return any attributes, it only gets the state at the end of | |
| 1629 * the line. It can start anywhere in the line, as long as the current state | |
| 1630 * is valid. | |
| 1631 */ | |
| 1632 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1633 syn_finish_line( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1634 int syncing) // called for syncing |
| 7 | 1635 { |
| 1636 stateitem_T *cur_si; | |
| 442 | 1637 colnr_T prev_current_col; |
| 7 | 1638 |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1639 while (!current_finished) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1640 { |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1641 (void)syn_current_attr(syncing, FALSE, NULL, FALSE); |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1642 /* |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1643 * When syncing, and found some item, need to check the item. |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1644 */ |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1645 if (syncing && current_state.ga_len) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1646 { |
| 7 | 1647 /* |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1648 * Check for match with sync item. |
| 7 | 1649 */ |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1650 cur_si = &CUR_STATE(current_state.ga_len - 1); |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1651 if (cur_si->si_idx >= 0 |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1652 && (SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1653 & (HL_SYNC_HERE|HL_SYNC_THERE))) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1654 return TRUE; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1655 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1656 // syn_current_attr() will have skipped the check for an item |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1657 // that ends here, need to do that now. Be careful not to go |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1658 // past the NUL. |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1659 prev_current_col = current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1660 if (syn_getcurline()[current_col] != NUL) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1661 ++current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1662 check_state_ends(); |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1663 current_col = prev_current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1664 } |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1665 ++current_col; |
| 7 | 1666 } |
| 1667 return FALSE; | |
| 1668 } | |
| 1669 | |
| 1670 /* | |
| 1671 * Return highlight attributes for next character. | |
| 1672 * Must first call syntax_start() once for the line. | |
| 1673 * "col" is normally 0 for the first use in a line, and increments by one each | |
| 1674 * time. It's allowed to skip characters and to stop before the end of the | |
| 1675 * line. But only a "col" after a previously used column is allowed. | |
| 221 | 1676 * When "can_spell" is not NULL set it to TRUE when spell-checking should be |
| 1677 * done. | |
| 7 | 1678 */ |
| 1679 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1680 get_syntax_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1681 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1682 int *can_spell, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1683 int keep_state) // keep state of char at "col" |
| 7 | 1684 { |
| 1685 int attr = 0; | |
| 1686 | |
| 1363 | 1687 if (can_spell != NULL) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1688 // Default: Only do spelling when there is no @Spell cluster or when |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1689 // ":syn spell toplevel" was used. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1690 *can_spell = syn_block->b_syn_spell == SYNSPL_DEFAULT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1691 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1692 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 1363 | 1693 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1694 // check for out of memory situation |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1695 if (syn_block->b_sst_array == NULL) |
| 7 | 1696 return 0; |
| 1697 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1698 // After 'synmaxcol' the attribute is always zero. |
| 431 | 1699 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc) |
| 419 | 1700 { |
| 1701 clear_current_state(); | |
| 1702 #ifdef FEAT_EVAL | |
| 1703 current_id = 0; | |
| 1704 current_trans_id = 0; | |
| 1705 #endif | |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1706 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1707 current_flags = 0; |
|
11579
52e3a77c097b
patch 8.0.0672: third item of synconcealed() changes too often
Christian Brabandt <cb@256bit.org>
parents:
11541
diff
changeset
|
1708 current_seqnr = 0; |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1709 #endif |
| 419 | 1710 return 0; |
| 1711 } | |
| 1712 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1713 // Make sure current_state is valid |
| 7 | 1714 if (INVALID_STATE(¤t_state)) |
| 1715 validate_current_state(); | |
| 1716 | |
| 1717 /* | |
| 1718 * Skip from the current column to "col", get the attributes for "col". | |
| 1719 */ | |
| 1720 while (current_col <= col) | |
| 1721 { | |
| 1504 | 1722 attr = syn_current_attr(FALSE, TRUE, can_spell, |
| 1723 current_col == col ? keep_state : FALSE); | |
| 7 | 1724 ++current_col; |
| 1725 } | |
| 1726 | |
| 1727 return attr; | |
| 1728 } | |
| 1729 | |
| 1730 /* | |
| 1731 * Get syntax attributes for current_lnum, current_col. | |
| 1732 */ | |
| 1733 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1734 syn_current_attr( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1735 int syncing, // When 1: called for syncing |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1736 int displaying, // result will be displayed |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1737 int *can_spell, // return: do spell checking |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1738 int keep_state) // keep syntax stack afterwards |
| 7 | 1739 { |
| 1740 int syn_id; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1741 lpos_T endpos; // was: char_u *endp; |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1742 lpos_T hl_startpos; // was: int hl_startcol; |
| 7 | 1743 lpos_T hl_endpos; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1744 lpos_T eos_pos; // end-of-start match (start region) |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1745 lpos_T eoe_pos; // end-of-end pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1746 int end_idx; // group ID for end pattern |
| 7 | 1747 int idx; |
| 1748 synpat_T *spp; | |
| 221 | 1749 stateitem_T *cur_si, *sip = NULL; |
| 7 | 1750 int startcol; |
| 1751 int endcol; | |
| 1752 long flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1753 int cchar; |
| 7 | 1754 short *next_list; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1755 int found_match; // found usable match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1756 static int try_next_column = FALSE; // must try in next col |
| 7 | 1757 int do_keywords; |
| 1758 regmmatch_T regmatch; | |
| 1759 lpos_T pos; | |
| 1760 int lc_col; | |
| 1761 reg_extmatch_T *cur_extmatch = NULL; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1762 char_u buf_chartab[32]; // chartab array for syn iskyeyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1763 char_u *line; // current line. NOTE: becomes invalid after |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1764 // looking for a pattern match! |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1765 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1766 // variables for zero-width matches that have a "nextgroup" argument |
| 7 | 1767 int keep_next_list; |
| 1768 int zero_width_next_list = FALSE; | |
| 1769 garray_T zero_width_next_ga; | |
| 1770 | |
| 1771 /* | |
| 1772 * No character, no attributes! Past end of line? | |
| 1773 * Do try matching with an empty line (could be the start of a region). | |
| 1774 */ | |
| 1775 line = syn_getcurline(); | |
| 1776 if (line[current_col] == NUL && current_col != 0) | |
| 1777 { | |
| 1778 /* | |
| 1779 * If we found a match after the last column, use it. | |
| 1780 */ | |
| 1781 if (next_match_idx >= 0 && next_match_col >= (int)current_col | |
| 1782 && next_match_col != MAXCOL) | |
| 1783 (void)push_next_match(NULL); | |
| 1784 | |
| 1785 current_finished = TRUE; | |
| 1786 current_state_stored = FALSE; | |
| 1787 return 0; | |
| 1788 } | |
| 1789 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1790 // if the current or next character is NUL, we will finish the line now |
| 7 | 1791 if (line[current_col] == NUL || line[current_col + 1] == NUL) |
| 1792 { | |
| 1793 current_finished = TRUE; | |
| 1794 current_state_stored = FALSE; | |
| 1795 } | |
| 1796 | |
| 1797 /* | |
| 1798 * When in the previous column there was a match but it could not be used | |
| 1799 * (empty match or already matched in this column) need to try again in | |
| 1800 * the next column. | |
| 1801 */ | |
| 1802 if (try_next_column) | |
| 1803 { | |
| 1804 next_match_idx = -1; | |
| 1805 try_next_column = FALSE; | |
| 1806 } | |
| 1807 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1808 // Only check for keywords when not syncing and there are some. |
| 7 | 1809 do_keywords = !syncing |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1810 && (syn_block->b_keywtab.ht_used > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1811 || syn_block->b_keywtab_ic.ht_used > 0); |
| 7 | 1812 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1813 // Init the list of zero-width matches with a nextlist. This is used to |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1814 // avoid matching the same item in the same position twice. |
|
27028
c9474ae175f4
patch 8.2.4043: using int for second argument of ga_init2()
Bram Moolenaar <Bram@vim.org>
parents:
26966
diff
changeset
|
1815 ga_init2(&zero_width_next_ga, sizeof(int), 10); |
| 7 | 1816 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1817 // use syntax iskeyword option |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1818 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1819 |
| 7 | 1820 /* |
| 1821 * Repeat matching keywords and patterns, to find contained items at the | |
| 1822 * same column. This stops when there are no extra matches at the current | |
| 1823 * column. | |
| 1824 */ | |
| 1825 do | |
| 1826 { | |
| 1827 found_match = FALSE; | |
| 1828 keep_next_list = FALSE; | |
| 1829 syn_id = 0; | |
| 1830 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1831 |
| 7 | 1832 /* |
| 1833 * 1. Check for a current state. | |
| 1834 * Only when there is no current state, or if the current state may | |
| 1835 * contain other things, we need to check for keywords and patterns. | |
| 1836 * Always need to check for contained items if some item has the | |
| 1837 * "containedin" argument (takes extra time!). | |
| 1838 */ | |
| 1839 if (current_state.ga_len) | |
| 1840 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 1841 else | |
| 1842 cur_si = NULL; | |
| 1843 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1844 if (syn_block->b_syn_containedin || cur_si == NULL |
| 7 | 1845 || cur_si->si_cont_list != NULL) |
| 1846 { | |
| 1847 /* | |
| 1848 * 2. Check for keywords, if on a keyword char after a non-keyword | |
| 1849 * char. Don't do this when syncing. | |
| 1850 */ | |
| 1851 if (do_keywords) | |
| 1852 { | |
| 1853 line = syn_getcurline(); | |
| 4043 | 1854 if (vim_iswordp_buf(line + current_col, syn_buf) |
| 7 | 1855 && (current_col == 0 |
| 4043 | 1856 || !vim_iswordp_buf(line + current_col - 1 |
| 7 | 1857 - (has_mbyte |
| 1858 ? (*mb_head_off)(line, line + current_col - 1) | |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
1859 : 0) , syn_buf))) |
| 7 | 1860 { |
| 1861 syn_id = check_keyword_id(line, (int)current_col, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1862 &endcol, &flags, &next_list, cur_si, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1863 &cchar); |
| 205 | 1864 if (syn_id != 0) |
| 7 | 1865 { |
| 1866 if (push_current_state(KEYWORD_IDX) == OK) | |
| 1867 { | |
| 1868 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 1869 cur_si->si_m_startcol = current_col; | |
| 1870 cur_si->si_h_startpos.lnum = current_lnum; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1871 cur_si->si_h_startpos.col = 0; // starts right away |
| 7 | 1872 cur_si->si_m_endpos.lnum = current_lnum; |
| 1873 cur_si->si_m_endpos.col = endcol; | |
| 1874 cur_si->si_h_endpos.lnum = current_lnum; | |
| 1875 cur_si->si_h_endpos.col = endcol; | |
| 1876 cur_si->si_ends = TRUE; | |
| 1877 cur_si->si_end_idx = 0; | |
| 1878 cur_si->si_flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1879 #ifdef FEAT_CONCEAL |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
1880 cur_si->si_seqnr = next_seqnr++; |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
1881 cur_si->si_cchar = cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1882 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1883 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1884 CUR_STATE(current_state.ga_len - 2).si_flags |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1885 & HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1886 #endif |
| 7 | 1887 cur_si->si_id = syn_id; |
| 1888 cur_si->si_trans_id = syn_id; | |
| 1889 if (flags & HL_TRANSP) | |
| 1890 { | |
| 1891 if (current_state.ga_len < 2) | |
| 1892 { | |
| 1893 cur_si->si_attr = 0; | |
| 1894 cur_si->si_trans_id = 0; | |
| 1895 } | |
| 1896 else | |
| 1897 { | |
| 1898 cur_si->si_attr = CUR_STATE( | |
| 1899 current_state.ga_len - 2).si_attr; | |
| 1900 cur_si->si_trans_id = CUR_STATE( | |
| 1901 current_state.ga_len - 2).si_trans_id; | |
| 1902 } | |
| 1903 } | |
| 1904 else | |
| 1905 cur_si->si_attr = syn_id2attr(syn_id); | |
| 1906 cur_si->si_cont_list = NULL; | |
| 1907 cur_si->si_next_list = next_list; | |
| 1908 check_keepend(); | |
| 1909 } | |
| 1910 else | |
| 1911 vim_free(next_list); | |
| 1912 } | |
| 1913 } | |
| 1914 } | |
| 1915 | |
| 1916 /* | |
| 205 | 1917 * 3. Check for patterns (only if no keyword found). |
| 7 | 1918 */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1919 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len) |
| 7 | 1920 { |
| 1921 /* | |
| 1922 * If we didn't check for a match yet, or we are past it, check | |
| 1923 * for any match with a pattern. | |
| 1924 */ | |
| 1925 if (next_match_idx < 0 || next_match_col < (int)current_col) | |
| 1926 { | |
| 1927 /* | |
| 1928 * Check all relevant patterns for a match at this | |
| 1929 * position. This is complicated, because matching with a | |
| 1930 * pattern takes quite a bit of time, thus we want to | |
| 1931 * avoid doing it when it's not needed. | |
| 1932 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1933 next_match_idx = 0; // no match in this line yet |
| 7 | 1934 next_match_col = MAXCOL; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1935 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; ) |
| 7 | 1936 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1937 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 1938 if ( spp->sp_syncing == syncing |
| 1939 && (displaying || !(spp->sp_flags & HL_DISPLAY)) | |
| 1940 && (spp->sp_type == SPTYPE_MATCH | |
| 1941 || spp->sp_type == SPTYPE_START) | |
| 1942 && (current_next_list != NULL | |
| 1943 ? in_id_list(NULL, current_next_list, | |
| 1944 &spp->sp_syn, 0) | |
| 1945 : (cur_si == NULL | |
| 1946 ? !(spp->sp_flags & HL_CONTAINED) | |
| 1947 : in_id_list(cur_si, | |
| 1948 cur_si->si_cont_list, &spp->sp_syn, | |
| 1949 spp->sp_flags & HL_CONTAINED)))) | |
| 1950 { | |
| 6375 | 1951 int r; |
| 1952 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1953 // If we already tried matching in this line, and |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1954 // there isn't a match before next_match_col, skip |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1955 // this item. |
| 7 | 1956 if (spp->sp_line_id == current_line_id |
| 1957 && spp->sp_startcol >= next_match_col) | |
| 1958 continue; | |
| 1959 spp->sp_line_id = current_line_id; | |
| 1960 | |
| 1961 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF]; | |
| 1962 if (lc_col < 0) | |
| 1963 lc_col = 0; | |
| 1964 | |
| 1965 regmatch.rmm_ic = spp->sp_ic; | |
| 1966 regmatch.regprog = spp->sp_prog; | |
| 6375 | 1967 r = syn_regexec(®match, |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1968 current_lnum, |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1969 (colnr_T)lc_col, |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1970 IF_SYN_TIME(&spp->sp_time)); |
| 6375 | 1971 spp->sp_prog = regmatch.regprog; |
| 1972 if (!r) | |
| 7 | 1973 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1974 // no match in this line, try another one |
| 7 | 1975 spp->sp_startcol = MAXCOL; |
| 1976 continue; | |
| 1977 } | |
| 1978 | |
| 1979 /* | |
| 1980 * Compute the first column of the match. | |
| 1981 */ | |
| 1982 syn_add_start_off(&pos, ®match, | |
| 1983 spp, SPO_MS_OFF, -1); | |
| 1984 if (pos.lnum > current_lnum) | |
| 1985 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1986 // must have used end of match in a next line, |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1987 // we can't handle that |
| 7 | 1988 spp->sp_startcol = MAXCOL; |
| 1989 continue; | |
| 1990 } | |
| 1991 startcol = pos.col; | |
| 1992 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1993 // remember the next column where this pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1994 // matches in the current line |
| 7 | 1995 spp->sp_startcol = startcol; |
| 1996 | |
| 1997 /* | |
| 1998 * If a previously found match starts at a lower | |
| 1999 * column number, don't use this one. | |
| 2000 */ | |
| 2001 if (startcol >= next_match_col) | |
| 2002 continue; | |
| 2003 | |
| 2004 /* | |
| 2005 * If we matched this pattern at this position | |
| 2006 * before, skip it. Must retry in the next | |
| 2007 * column, because it may match from there. | |
| 2008 */ | |
| 2009 if (did_match_already(idx, &zero_width_next_ga)) | |
| 2010 { | |
| 2011 try_next_column = TRUE; | |
| 2012 continue; | |
| 2013 } | |
| 2014 | |
| 2015 endpos.lnum = regmatch.endpos[0].lnum; | |
| 2016 endpos.col = regmatch.endpos[0].col; | |
| 2017 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2018 // Compute the highlight start. |
| 7 | 2019 syn_add_start_off(&hl_startpos, ®match, |
| 2020 spp, SPO_HS_OFF, -1); | |
| 2021 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2022 // Compute the region start. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2023 // Default is to use the end of the match. |
| 7 | 2024 syn_add_end_off(&eos_pos, ®match, |
| 2025 spp, SPO_RS_OFF, 0); | |
| 2026 | |
| 2027 /* | |
| 2028 * Grab the external submatches before they get | |
| 2029 * overwritten. Reference count doesn't change. | |
| 2030 */ | |
| 2031 unref_extmatch(cur_extmatch); | |
| 2032 cur_extmatch = re_extmatch_out; | |
| 2033 re_extmatch_out = NULL; | |
| 2034 | |
| 2035 flags = 0; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2036 eoe_pos.lnum = 0; // avoid warning |
| 7 | 2037 eoe_pos.col = 0; |
| 2038 end_idx = 0; | |
| 2039 hl_endpos.lnum = 0; | |
| 2040 | |
| 2041 /* | |
| 2042 * For a "oneline" the end must be found in the | |
| 2043 * same line too. Search for it after the end of | |
| 2044 * the match with the start pattern. Set the | |
| 2045 * resulting end positions at the same time. | |
| 2046 */ | |
| 2047 if (spp->sp_type == SPTYPE_START | |
| 2048 && (spp->sp_flags & HL_ONELINE)) | |
| 2049 { | |
| 2050 lpos_T startpos; | |
| 2051 | |
| 2052 startpos = endpos; | |
| 2053 find_endpos(idx, &startpos, &endpos, &hl_endpos, | |
| 2054 &flags, &eoe_pos, &end_idx, cur_extmatch); | |
| 2055 if (endpos.lnum == 0) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2056 continue; // not found |
| 7 | 2057 } |
| 2058 | |
| 2059 /* | |
| 2060 * For a "match" the size must be > 0 after the | |
| 2061 * end offset needs has been added. Except when | |
| 2062 * syncing. | |
| 2063 */ | |
| 2064 else if (spp->sp_type == SPTYPE_MATCH) | |
| 2065 { | |
| 2066 syn_add_end_off(&hl_endpos, ®match, spp, | |
| 2067 SPO_HE_OFF, 0); | |
| 2068 syn_add_end_off(&endpos, ®match, spp, | |
| 2069 SPO_ME_OFF, 0); | |
| 2070 if (endpos.lnum == current_lnum | |
| 2071 && (int)endpos.col + syncing < startcol) | |
| 2072 { | |
| 2073 /* | |
| 2074 * If an empty string is matched, may need | |
| 2075 * to try matching again at next column. | |
| 2076 */ | |
| 2077 if (regmatch.startpos[0].col | |
| 2078 == regmatch.endpos[0].col) | |
| 2079 try_next_column = TRUE; | |
| 2080 continue; | |
| 2081 } | |
| 2082 } | |
| 2083 | |
| 2084 /* | |
| 2085 * keep the best match so far in next_match_* | |
| 2086 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2087 // Highlighting must start after startpos and end |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2088 // before endpos. |
| 7 | 2089 if (hl_startpos.lnum == current_lnum |
| 2090 && (int)hl_startpos.col < startcol) | |
| 2091 hl_startpos.col = startcol; | |
| 2092 limit_pos_zero(&hl_endpos, &endpos); | |
| 2093 | |
| 2094 next_match_idx = idx; | |
| 2095 next_match_col = startcol; | |
| 2096 next_match_m_endpos = endpos; | |
| 2097 next_match_h_endpos = hl_endpos; | |
| 2098 next_match_h_startpos = hl_startpos; | |
| 2099 next_match_flags = flags; | |
| 2100 next_match_eos_pos = eos_pos; | |
| 2101 next_match_eoe_pos = eoe_pos; | |
| 2102 next_match_end_idx = end_idx; | |
| 2103 unref_extmatch(next_match_extmatch); | |
| 2104 next_match_extmatch = cur_extmatch; | |
| 2105 cur_extmatch = NULL; | |
| 2106 } | |
| 2107 } | |
| 2108 } | |
| 2109 | |
| 2110 /* | |
| 2111 * If we found a match at the current column, use it. | |
| 2112 */ | |
| 2113 if (next_match_idx >= 0 && next_match_col == (int)current_col) | |
| 2114 { | |
| 2115 synpat_T *lspp; | |
| 2116 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2117 // When a zero-width item matched which has a nextgroup, |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2118 // don't push the item but set nextgroup. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2119 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2120 if (next_match_m_endpos.lnum == current_lnum |
| 2121 && next_match_m_endpos.col == current_col | |
| 2122 && lspp->sp_next_list != NULL) | |
| 2123 { | |
| 2124 current_next_list = lspp->sp_next_list; | |
| 2125 current_next_flags = lspp->sp_flags; | |
| 2126 keep_next_list = TRUE; | |
| 2127 zero_width_next_list = TRUE; | |
| 2128 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2129 // Add the index to a list, so that we can check |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2130 // later that we don't match it again (and cause an |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2131 // endless loop). |
| 7 | 2132 if (ga_grow(&zero_width_next_ga, 1) == OK) |
| 2133 { | |
| 2134 ((int *)(zero_width_next_ga.ga_data)) | |
| 2135 [zero_width_next_ga.ga_len++] = next_match_idx; | |
| 2136 } | |
| 2137 next_match_idx = -1; | |
| 2138 } | |
| 2139 else | |
| 2140 cur_si = push_next_match(cur_si); | |
| 2141 found_match = TRUE; | |
| 2142 } | |
| 2143 } | |
| 2144 } | |
| 2145 | |
| 2146 /* | |
| 2147 * Handle searching for nextgroup match. | |
| 2148 */ | |
| 2149 if (current_next_list != NULL && !keep_next_list) | |
| 2150 { | |
| 2151 /* | |
| 2152 * If a nextgroup was not found, continue looking for one if: | |
| 2153 * - this is an empty line and the "skipempty" option was given | |
| 2154 * - we are on white space and the "skipwhite" option was given | |
| 2155 */ | |
| 2156 if (!found_match) | |
| 2157 { | |
| 2158 line = syn_getcurline(); | |
| 2159 if (((current_next_flags & HL_SKIPWHITE) | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2160 && VIM_ISWHITE(line[current_col])) |
| 7 | 2161 || ((current_next_flags & HL_SKIPEMPTY) |
| 2162 && *line == NUL)) | |
| 2163 break; | |
| 2164 } | |
| 2165 | |
| 2166 /* | |
| 2167 * If a nextgroup was found: Use it, and continue looking for | |
| 2168 * contained matches. | |
| 2169 * If a nextgroup was not found: Continue looking for a normal | |
| 2170 * match. | |
| 2171 * When did set current_next_list for a zero-width item and no | |
| 2172 * match was found don't loop (would get stuck). | |
| 2173 */ | |
| 2174 current_next_list = NULL; | |
| 2175 next_match_idx = -1; | |
| 2176 if (!zero_width_next_list) | |
| 2177 found_match = TRUE; | |
| 2178 } | |
| 2179 | |
| 2180 } while (found_match); | |
| 2181 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2182 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2183 |
| 7 | 2184 /* |
| 2185 * Use attributes from the current state, if within its highlighting. | |
| 2186 * If not, use attributes from the current-but-one state, etc. | |
| 2187 */ | |
| 2188 current_attr = 0; | |
| 2189 #ifdef FEAT_EVAL | |
| 2190 current_id = 0; | |
| 2191 current_trans_id = 0; | |
| 2192 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2193 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2194 current_flags = 0; |
|
11579
52e3a77c097b
patch 8.0.0672: third item of synconcealed() changes too often
Christian Brabandt <cb@256bit.org>
parents:
11541
diff
changeset
|
2195 current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2196 #endif |
| 7 | 2197 if (cur_si != NULL) |
| 2198 { | |
| 221 | 2199 #ifndef FEAT_EVAL |
| 2200 int current_trans_id = 0; | |
| 2201 #endif | |
| 7 | 2202 for (idx = current_state.ga_len - 1; idx >= 0; --idx) |
| 2203 { | |
| 2204 sip = &CUR_STATE(idx); | |
| 2205 if ((current_lnum > sip->si_h_startpos.lnum | |
| 2206 || (current_lnum == sip->si_h_startpos.lnum | |
| 2207 && current_col >= sip->si_h_startpos.col)) | |
| 2208 && (sip->si_h_endpos.lnum == 0 | |
| 2209 || current_lnum < sip->si_h_endpos.lnum | |
| 2210 || (current_lnum == sip->si_h_endpos.lnum | |
| 2211 && current_col < sip->si_h_endpos.col))) | |
| 2212 { | |
| 2213 current_attr = sip->si_attr; | |
| 2214 #ifdef FEAT_EVAL | |
| 2215 current_id = sip->si_id; | |
| 221 | 2216 #endif |
| 7 | 2217 current_trans_id = sip->si_trans_id; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2218 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2219 current_flags = sip->si_flags; |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
2220 current_seqnr = sip->si_seqnr; |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
2221 current_sub_char = sip->si_cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2222 #endif |
| 7 | 2223 break; |
| 2224 } | |
| 2225 } | |
| 2226 | |
| 221 | 2227 if (can_spell != NULL) |
| 2228 { | |
| 2229 struct sp_syn sps; | |
| 2230 | |
| 2231 /* | |
| 2232 * set "can_spell" to TRUE if spell checking is supposed to be | |
| 2233 * done in the current item. | |
| 2234 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2235 if (syn_block->b_spell_cluster_id == 0) |
| 227 | 2236 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2237 // There is no @Spell cluster: Do spelling for items without |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2238 // @NoSpell cluster. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2239 if (syn_block->b_nospell_cluster_id == 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2240 || current_trans_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2241 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP); |
| 227 | 2242 else |
| 2243 { | |
| 2244 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2245 sps.id = syn_block->b_nospell_cluster_id; |
| 227 | 2246 sps.cont_in_list = NULL; |
| 2247 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2248 } | |
| 2249 } | |
| 221 | 2250 else |
| 2251 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2252 // The @Spell cluster is defined: Do spelling in items with |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2253 // the @Spell cluster. But not when @NoSpell is also there. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2254 // At the toplevel only spell check when ":syn spell toplevel" |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2255 // was used. |
| 320 | 2256 if (current_trans_id == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2257 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP); |
| 320 | 2258 else |
| 2259 { | |
| 2260 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2261 sps.id = syn_block->b_spell_cluster_id; |
| 320 | 2262 sps.cont_in_list = NULL; |
| 2263 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2264 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2265 if (syn_block->b_nospell_cluster_id != 0) |
| 320 | 2266 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2267 sps.id = syn_block->b_nospell_cluster_id; |
| 320 | 2268 if (in_id_list(sip, sip->si_cont_list, &sps, 0)) |
| 2269 *can_spell = FALSE; | |
| 2270 } | |
| 2271 } | |
| 221 | 2272 } |
| 2273 } | |
| 2274 | |
| 2275 | |
| 7 | 2276 /* |
| 2277 * Check for end of current state (and the states before it) at the | |
| 2278 * next column. Don't do this for syncing, because we would miss a | |
| 2279 * single character match. | |
| 2280 * First check if the current state ends at the current column. It | |
| 2281 * may be for an empty match and a containing item might end in the | |
| 2282 * current column. | |
| 2283 */ | |
| 1504 | 2284 if (!syncing && !keep_state) |
| 7 | 2285 { |
| 2286 check_state_ends(); | |
| 442 | 2287 if (current_state.ga_len > 0 |
| 2288 && syn_getcurline()[current_col] != NUL) | |
| 7 | 2289 { |
| 2290 ++current_col; | |
| 2291 check_state_ends(); | |
| 2292 --current_col; | |
| 2293 } | |
| 2294 } | |
| 2295 } | |
| 221 | 2296 else if (can_spell != NULL) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2297 // Default: Only do spelling when there is no @Spell cluster or when |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2298 // ":syn spell toplevel" was used. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2299 *can_spell = syn_block->b_syn_spell == SYNSPL_DEFAULT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2300 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2301 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 7 | 2302 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2303 // nextgroup ends at end of line, unless "skipnl" or "skipempty" present |
| 7 | 2304 if (current_next_list != NULL |
|
13375
33f514c94943
patch 8.0.1561: crash with rust syntax highligting
Christian Brabandt <cb@256bit.org>
parents:
13339
diff
changeset
|
2305 && (line = syn_getcurline())[current_col] != NUL |
|
33f514c94943
patch 8.0.1561: crash with rust syntax highligting
Christian Brabandt <cb@256bit.org>
parents:
13339
diff
changeset
|
2306 && line[current_col + 1] == NUL |
| 7 | 2307 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) |
| 2308 current_next_list = NULL; | |
| 2309 | |
| 2310 if (zero_width_next_ga.ga_len > 0) | |
| 2311 ga_clear(&zero_width_next_ga); | |
| 2312 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2313 // No longer need external matches. But keep next_match_extmatch. |
| 7 | 2314 unref_extmatch(re_extmatch_out); |
| 2315 re_extmatch_out = NULL; | |
| 2316 unref_extmatch(cur_extmatch); | |
| 2317 | |
| 2318 return current_attr; | |
| 2319 } | |
| 2320 | |
| 2321 | |
| 2322 /* | |
| 2323 * Check if we already matched pattern "idx" at the current column. | |
| 2324 */ | |
| 2325 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2326 did_match_already(int idx, garray_T *gap) |
| 7 | 2327 { |
| 2328 int i; | |
| 2329 | |
| 2330 for (i = current_state.ga_len; --i >= 0; ) | |
| 2331 if (CUR_STATE(i).si_m_startcol == (int)current_col | |
| 2332 && CUR_STATE(i).si_m_lnum == (int)current_lnum | |
| 2333 && CUR_STATE(i).si_idx == idx) | |
| 2334 return TRUE; | |
| 2335 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2336 // Zero-width matches with a nextgroup argument are not put on the syntax |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2337 // stack, and can only be matched once anyway. |
| 7 | 2338 for (i = gap->ga_len; --i >= 0; ) |
| 2339 if (((int *)(gap->ga_data))[i] == idx) | |
| 2340 return TRUE; | |
| 2341 | |
| 2342 return FALSE; | |
| 2343 } | |
| 2344 | |
| 2345 /* | |
| 2346 * Push the next match onto the stack. | |
| 2347 */ | |
| 2348 static stateitem_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2349 push_next_match(stateitem_T *cur_si) |
| 7 | 2350 { |
| 2351 synpat_T *spp; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2352 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2353 int save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2354 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2355 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2356 spp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2357 |
| 2358 /* | |
| 2359 * Push the item in current_state stack; | |
| 2360 */ | |
| 2361 if (push_current_state(next_match_idx) == OK) | |
| 2362 { | |
| 2363 /* | |
| 2364 * If it's a start-skip-end type that crosses lines, figure out how | |
| 2365 * much it continues in this line. Otherwise just fill in the length. | |
| 2366 */ | |
| 2367 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2368 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2369 cur_si->si_m_startcol = current_col; | |
| 2370 cur_si->si_m_lnum = current_lnum; | |
| 2371 cur_si->si_flags = spp->sp_flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2372 #ifdef FEAT_CONCEAL |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
2373 cur_si->si_seqnr = next_seqnr++; |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
2374 cur_si->si_cchar = spp->sp_cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2375 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2376 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2377 CUR_STATE(current_state.ga_len - 2).si_flags & HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2378 #endif |
| 7 | 2379 cur_si->si_next_list = spp->sp_next_list; |
| 2380 cur_si->si_extmatch = ref_extmatch(next_match_extmatch); | |
| 2381 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE)) | |
| 2382 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2383 // Try to find the end pattern in the current line |
| 7 | 2384 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE); |
| 2385 check_keepend(); | |
| 2386 } | |
| 2387 else | |
| 2388 { | |
| 2389 cur_si->si_m_endpos = next_match_m_endpos; | |
| 2390 cur_si->si_h_endpos = next_match_h_endpos; | |
| 2391 cur_si->si_ends = TRUE; | |
| 2392 cur_si->si_flags |= next_match_flags; | |
| 2393 cur_si->si_eoe_pos = next_match_eoe_pos; | |
| 2394 cur_si->si_end_idx = next_match_end_idx; | |
| 2395 } | |
| 2396 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND)) | |
| 2397 keepend_level = current_state.ga_len - 1; | |
| 2398 check_keepend(); | |
| 2399 update_si_attr(current_state.ga_len - 1); | |
| 2400 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2401 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2402 save_flags = cur_si->si_flags & (HL_CONCEAL | HL_CONCEALENDS); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2403 #endif |
| 7 | 2404 /* |
| 2405 * If the start pattern has another highlight group, push another item | |
| 2406 * on the stack for the start pattern. | |
| 2407 */ | |
| 2408 if ( spp->sp_type == SPTYPE_START | |
| 2409 && spp->sp_syn_match_id != 0 | |
| 2410 && push_current_state(next_match_idx) == OK) | |
| 2411 { | |
| 2412 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2413 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2414 cur_si->si_m_startcol = current_col; | |
| 2415 cur_si->si_m_lnum = current_lnum; | |
| 2416 cur_si->si_m_endpos = next_match_eos_pos; | |
| 2417 cur_si->si_h_endpos = next_match_eos_pos; | |
| 2418 cur_si->si_ends = TRUE; | |
| 2419 cur_si->si_end_idx = 0; | |
| 2420 cur_si->si_flags = HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2421 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2422 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2423 cur_si->si_flags |= save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2424 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2425 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2426 #endif |
| 7 | 2427 cur_si->si_next_list = NULL; |
| 2428 check_keepend(); | |
| 2429 update_si_attr(current_state.ga_len - 1); | |
| 2430 } | |
| 2431 } | |
| 2432 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2433 next_match_idx = -1; // try other match next time |
| 7 | 2434 |
| 2435 return cur_si; | |
| 2436 } | |
| 2437 | |
| 2438 /* | |
| 2439 * Check for end of current state (and the states before it). | |
| 2440 */ | |
| 2441 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2442 check_state_ends(void) |
| 7 | 2443 { |
| 2444 stateitem_T *cur_si; | |
| 2863 | 2445 int had_extend; |
| 7 | 2446 |
| 2447 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2448 for (;;) | |
| 2449 { | |
| 2450 if (cur_si->si_ends | |
| 2451 && (cur_si->si_m_endpos.lnum < current_lnum | |
| 2452 || (cur_si->si_m_endpos.lnum == current_lnum | |
| 2453 && cur_si->si_m_endpos.col <= current_col))) | |
| 2454 { | |
| 2455 /* | |
| 2456 * If there is an end pattern group ID, highlight the end pattern | |
| 2457 * now. No need to pop the current item from the stack. | |
| 2458 * Only do this if the end pattern continues beyond the current | |
| 2459 * position. | |
| 2460 */ | |
| 2461 if (cur_si->si_end_idx | |
| 2462 && (cur_si->si_eoe_pos.lnum > current_lnum | |
| 2463 || (cur_si->si_eoe_pos.lnum == current_lnum | |
| 2464 && cur_si->si_eoe_pos.col > current_col))) | |
| 2465 { | |
| 2466 cur_si->si_idx = cur_si->si_end_idx; | |
| 2467 cur_si->si_end_idx = 0; | |
| 2468 cur_si->si_m_endpos = cur_si->si_eoe_pos; | |
| 2469 cur_si->si_h_endpos = cur_si->si_eoe_pos; | |
| 2470 cur_si->si_flags |= HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2471 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2472 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2473 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2474 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2475 #endif |
| 7 | 2476 update_si_attr(current_state.ga_len - 1); |
| 36 | 2477 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2478 // nextgroup= should not match in the end pattern |
| 2831 | 2479 current_next_list = NULL; |
| 2480 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2481 // what matches next may be different now, clear it |
| 36 | 2482 next_match_idx = 0; |
| 2483 next_match_col = MAXCOL; | |
| 7 | 2484 break; |
| 2485 } | |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2486 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2487 // handle next_list, unless at end of line and no "skipnl" or |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2488 // "skipempty" |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2489 current_next_list = cur_si->si_next_list; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2490 current_next_flags = cur_si->si_flags; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2491 if (!(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2492 && syn_getcurline()[current_col] == NUL) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2493 current_next_list = NULL; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2494 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2495 // When the ended item has "extend", another item with |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2496 // "keepend" now needs to check for its end. |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2497 had_extend = (cur_si->si_flags & HL_EXTEND); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2498 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2499 pop_current_state(); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2500 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2501 if (current_state.ga_len == 0) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2502 break; |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2503 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2504 if (had_extend && keepend_level >= 0) |
| 7 | 2505 { |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2506 syn_update_ends(FALSE); |
| 7 | 2507 if (current_state.ga_len == 0) |
| 2508 break; | |
|
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2509 } |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2510 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2511 cur_si = &CUR_STATE(current_state.ga_len - 1); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2512 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2513 /* |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2514 * Only for a region the search for the end continues after |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2515 * the end of the contained item. If the contained match |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2516 * included the end-of-line, break here, the region continues. |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2517 * Don't do this when: |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2518 * - "keepend" is used for the contained item |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2519 * - not at the end of the line (could be end="x$"me=e-1). |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2520 * - "excludenl" is used (HL_HAS_EOL won't be set) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2521 */ |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2522 if (cur_si->si_idx >= 0 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2523 && SYN_ITEMS(syn_block)[cur_si->si_idx].sp_type |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2524 == SPTYPE_START |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2525 && !(cur_si->si_flags & (HL_MATCH | HL_KEEPEND))) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2526 { |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2527 update_si_end(cur_si, (int)current_col, TRUE); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2528 check_keepend(); |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2529 if ((current_next_flags & HL_HAS_EOL) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2530 && keepend_level < 0 |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2531 && syn_getcurline()[current_col] == NUL) |
|
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2532 break; |
| 7 | 2533 } |
| 2534 } | |
| 2535 else | |
| 2536 break; | |
| 2537 } | |
| 2538 } | |
| 2539 | |
| 2540 /* | |
| 2541 * Update an entry in the current_state stack for a match or region. This | |
| 2542 * fills in si_attr, si_next_list and si_cont_list. | |
| 2543 */ | |
| 2544 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2545 update_si_attr(int idx) |
| 7 | 2546 { |
| 2547 stateitem_T *sip = &CUR_STATE(idx); | |
| 2548 synpat_T *spp; | |
| 2549 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2550 // This should not happen... |
| 1371 | 2551 if (sip->si_idx < 0) |
| 2552 return; | |
| 2553 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2554 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]); |
| 7 | 2555 if (sip->si_flags & HL_MATCH) |
| 2556 sip->si_id = spp->sp_syn_match_id; | |
| 2557 else | |
| 2558 sip->si_id = spp->sp_syn.id; | |
| 2559 sip->si_attr = syn_id2attr(sip->si_id); | |
| 2560 sip->si_trans_id = sip->si_id; | |
| 2561 if (sip->si_flags & HL_MATCH) | |
| 2562 sip->si_cont_list = NULL; | |
| 2563 else | |
| 2564 sip->si_cont_list = spp->sp_cont_list; | |
| 2565 | |
| 2566 /* | |
| 2567 * For transparent items, take attr from outer item. | |
| 2568 * Also take cont_list, if there is none. | |
| 2569 * Don't do this for the matchgroup of a start or end pattern. | |
| 2570 */ | |
| 2571 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH)) | |
| 2572 { | |
| 2573 if (idx == 0) | |
| 2574 { | |
| 2575 sip->si_attr = 0; | |
| 2576 sip->si_trans_id = 0; | |
| 2577 if (sip->si_cont_list == NULL) | |
| 2578 sip->si_cont_list = ID_LIST_ALL; | |
| 2579 } | |
| 2580 else | |
| 2581 { | |
| 2582 sip->si_attr = CUR_STATE(idx - 1).si_attr; | |
| 2583 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id; | |
| 2584 if (sip->si_cont_list == NULL) | |
| 2585 { | |
| 2586 sip->si_flags |= HL_TRANS_CONT; | |
| 2587 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list; | |
| 2588 } | |
| 2589 } | |
| 2590 } | |
| 2591 } | |
| 2592 | |
| 2593 /* | |
| 2594 * Check the current stack for patterns with "keepend" flag. | |
| 2595 * Propagate the match-end to contained items, until a "skipend" item is found. | |
| 2596 */ | |
| 2597 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2598 check_keepend(void) |
| 7 | 2599 { |
| 2600 int i; | |
| 2601 lpos_T maxpos; | |
| 991 | 2602 lpos_T maxpos_h; |
| 7 | 2603 stateitem_T *sip; |
| 2604 | |
| 2605 /* | |
| 2606 * This check can consume a lot of time; only do it from the level where | |
| 2607 * there really is a keepend. | |
| 2608 */ | |
| 2609 if (keepend_level < 0) | |
| 2610 return; | |
| 2611 | |
| 2612 /* | |
| 2613 * Find the last index of an "extend" item. "keepend" items before that | |
| 2614 * won't do anything. If there is no "extend" item "i" will be | |
| 2615 * "keepend_level" and all "keepend" items will work normally. | |
| 2616 */ | |
| 2617 for (i = current_state.ga_len - 1; i > keepend_level; --i) | |
| 2618 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 2619 break; | |
| 2620 | |
| 2621 maxpos.lnum = 0; | |
| 1702 | 2622 maxpos.col = 0; |
| 991 | 2623 maxpos_h.lnum = 0; |
| 1702 | 2624 maxpos_h.col = 0; |
| 7 | 2625 for ( ; i < current_state.ga_len; ++i) |
| 2626 { | |
| 2627 sip = &CUR_STATE(i); | |
| 2628 if (maxpos.lnum != 0) | |
| 2629 { | |
| 2630 limit_pos_zero(&sip->si_m_endpos, &maxpos); | |
| 991 | 2631 limit_pos_zero(&sip->si_h_endpos, &maxpos_h); |
| 7 | 2632 limit_pos_zero(&sip->si_eoe_pos, &maxpos); |
| 2633 sip->si_ends = TRUE; | |
| 2634 } | |
| 991 | 2635 if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) |
| 2636 { | |
| 2637 if (maxpos.lnum == 0 | |
| 7 | 2638 || maxpos.lnum > sip->si_m_endpos.lnum |
| 2639 || (maxpos.lnum == sip->si_m_endpos.lnum | |
| 991 | 2640 && maxpos.col > sip->si_m_endpos.col)) |
| 2641 maxpos = sip->si_m_endpos; | |
| 2642 if (maxpos_h.lnum == 0 | |
| 2643 || maxpos_h.lnum > sip->si_h_endpos.lnum | |
| 2644 || (maxpos_h.lnum == sip->si_h_endpos.lnum | |
| 2645 && maxpos_h.col > sip->si_h_endpos.col)) | |
| 2646 maxpos_h = sip->si_h_endpos; | |
| 2647 } | |
| 7 | 2648 } |
| 2649 } | |
| 2650 | |
| 2651 /* | |
| 2652 * Update an entry in the current_state stack for a start-skip-end pattern. | |
| 2653 * This finds the end of the current item, if it's in the current line. | |
| 2654 * | |
| 2655 * Return the flags for the matched END. | |
| 2656 */ | |
| 2657 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2658 update_si_end( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2659 stateitem_T *sip, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2660 int startcol, // where to start searching for the end |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2661 int force) // when TRUE overrule a previous end |
| 7 | 2662 { |
| 2663 lpos_T startpos; | |
| 2664 lpos_T endpos; | |
| 2665 lpos_T hl_endpos; | |
| 2666 lpos_T end_endpos; | |
| 2667 int end_idx; | |
| 2668 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2669 // return quickly for a keyword |
| 1371 | 2670 if (sip->si_idx < 0) |
| 2671 return; | |
| 2672 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2673 // Don't update when it's already done. Can be a match of an end pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2674 // that started in a previous line. Watch out: can also be a "keepend" |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2675 // from a containing item. |
| 7 | 2676 if (!force && sip->si_m_endpos.lnum >= current_lnum) |
| 2677 return; | |
| 2678 | |
| 2679 /* | |
| 2680 * We need to find the end of the region. It may continue in the next | |
| 2681 * line. | |
| 2682 */ | |
| 2683 end_idx = 0; | |
| 2684 startpos.lnum = current_lnum; | |
| 2685 startpos.col = startcol; | |
| 2686 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos, | |
| 2687 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch); | |
| 2688 | |
| 2689 if (endpos.lnum == 0) | |
| 2690 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2691 // No end pattern matched. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2692 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) |
| 7 | 2693 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2694 // a "oneline" never continues in the next line |
| 7 | 2695 sip->si_ends = TRUE; |
| 2696 sip->si_m_endpos.lnum = current_lnum; | |
| 2697 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline()); | |
| 2698 } | |
| 2699 else | |
| 2700 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2701 // continues in the next line |
| 7 | 2702 sip->si_ends = FALSE; |
| 2703 sip->si_m_endpos.lnum = 0; | |
| 2704 } | |
| 2705 sip->si_h_endpos = sip->si_m_endpos; | |
| 2706 } | |
| 2707 else | |
| 2708 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2709 // match within this line |
| 7 | 2710 sip->si_m_endpos = endpos; |
| 2711 sip->si_h_endpos = hl_endpos; | |
| 2712 sip->si_eoe_pos = end_endpos; | |
| 2713 sip->si_ends = TRUE; | |
| 2714 sip->si_end_idx = end_idx; | |
| 2715 } | |
| 2716 } | |
| 2717 | |
| 2718 /* | |
| 2719 * Add a new state to the current state stack. | |
| 2720 * It is cleared and the index set to "idx". | |
| 2721 * Return FAIL if it's not possible (out of memory). | |
| 2722 */ | |
| 2723 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2724 push_current_state(int idx) |
| 7 | 2725 { |
| 2726 if (ga_grow(¤t_state, 1) == FAIL) | |
| 2727 return FAIL; | |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
2728 CLEAR_POINTER(&CUR_STATE(current_state.ga_len)); |
| 7 | 2729 CUR_STATE(current_state.ga_len).si_idx = idx; |
| 2730 ++current_state.ga_len; | |
| 2731 return OK; | |
| 2732 } | |
| 2733 | |
| 2734 /* | |
| 2735 * Remove a state from the current_state stack. | |
| 2736 */ | |
| 2737 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2738 pop_current_state(void) |
| 7 | 2739 { |
| 2740 if (current_state.ga_len) | |
| 2741 { | |
| 2742 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch); | |
| 2743 --current_state.ga_len; | |
| 2744 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2745 // after the end of a pattern, try matching a keyword or pattern |
| 7 | 2746 next_match_idx = -1; |
| 2747 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2748 // if first state with "keepend" is popped, reset keepend_level |
| 7 | 2749 if (keepend_level >= current_state.ga_len) |
| 2750 keepend_level = -1; | |
| 2751 } | |
| 2752 | |
| 2753 /* | |
| 2754 * Find the end of a start/skip/end syntax region after "startpos". | |
| 2755 * Only checks one line. | |
| 2756 * Also handles a match item that continued from a previous line. | |
| 2757 * If not found, the syntax item continues in the next line. m_endpos->lnum | |
| 2758 * will be 0. | |
| 2759 * If found, the end of the region and the end of the highlighting is | |
| 2760 * computed. | |
| 2761 */ | |
| 2762 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2763 find_endpos( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2764 int idx, // index of the pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2765 lpos_T *startpos, // where to start looking for an END match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2766 lpos_T *m_endpos, // return: end of match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2767 lpos_T *hl_endpos, // return: end of highlighting |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2768 long *flagsp, // return: flags of matching END |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2769 lpos_T *end_endpos, // return: end of end pattern match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2770 int *end_idx, // return: group ID for end pat. match, or 0 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2771 reg_extmatch_T *start_ext) // submatches from the start pattern |
| 7 | 2772 { |
| 2773 colnr_T matchcol; | |
| 2774 synpat_T *spp, *spp_skip; | |
| 2775 int start_idx; | |
| 2776 int best_idx; | |
| 2777 regmmatch_T regmatch; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2778 regmmatch_T best_regmatch; // startpos/endpos of best match |
| 7 | 2779 lpos_T pos; |
| 2780 char_u *line; | |
| 2781 int had_match = FALSE; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2782 char_u buf_chartab[32]; // chartab array for syn option iskyeyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2783 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2784 // just in case we are invoked for a keyword |
| 1371 | 2785 if (idx < 0) |
| 2786 return; | |
| 2787 | |
| 7 | 2788 /* |
| 2789 * Check for being called with a START pattern. | |
| 2790 * Can happen with a match that continues to the next line, because it | |
| 2791 * contained a region. | |
| 2792 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2793 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2794 if (spp->sp_type != SPTYPE_START) |
| 2795 { | |
| 2796 *hl_endpos = *startpos; | |
| 2797 return; | |
| 2798 } | |
| 2799 | |
| 2800 /* | |
| 2801 * Find the SKIP or first END pattern after the last START pattern. | |
| 2802 */ | |
| 2803 for (;;) | |
| 2804 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2805 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2806 if (spp->sp_type != SPTYPE_START) |
| 2807 break; | |
| 2808 ++idx; | |
| 2809 } | |
| 2810 | |
| 2811 /* | |
| 2812 * Lookup the SKIP pattern (if present) | |
| 2813 */ | |
| 2814 if (spp->sp_type == SPTYPE_SKIP) | |
| 2815 { | |
| 2816 spp_skip = spp; | |
| 2817 ++idx; | |
| 2818 } | |
| 2819 else | |
| 2820 spp_skip = NULL; | |
| 2821 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2822 // Setup external matches for syn_regexec(). |
| 7 | 2823 unref_extmatch(re_extmatch_in); |
| 2824 re_extmatch_in = ref_extmatch(start_ext); | |
| 2825 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2826 matchcol = startpos->col; // start looking for a match at sstart |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2827 start_idx = idx; // remember the first END pattern. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2828 best_regmatch.startpos[0].col = 0; // avoid compiler warning |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2829 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2830 // use syntax iskeyword option |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2831 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2832 |
| 7 | 2833 for (;;) |
| 2834 { | |
| 2835 /* | |
| 2836 * Find end pattern that matches first after "matchcol". | |
| 2837 */ | |
| 2838 best_idx = -1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2839 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx) |
| 7 | 2840 { |
| 2841 int lc_col = matchcol; | |
| 6375 | 2842 int r; |
| 7 | 2843 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2844 spp = &(SYN_ITEMS(syn_block)[idx]); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2845 if (spp->sp_type != SPTYPE_END) // past last END pattern |
| 7 | 2846 break; |
| 2847 lc_col -= spp->sp_offsets[SPO_LC_OFF]; | |
| 2848 if (lc_col < 0) | |
| 2849 lc_col = 0; | |
| 2850 | |
| 2851 regmatch.rmm_ic = spp->sp_ic; | |
| 2852 regmatch.regprog = spp->sp_prog; | |
| 6375 | 2853 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 2854 IF_SYN_TIME(&spp->sp_time)); | |
| 2855 spp->sp_prog = regmatch.regprog; | |
| 2856 if (r) | |
| 7 | 2857 { |
| 2858 if (best_idx == -1 || regmatch.startpos[0].col | |
| 2859 < best_regmatch.startpos[0].col) | |
| 2860 { | |
| 2861 best_idx = idx; | |
| 2862 best_regmatch.startpos[0] = regmatch.startpos[0]; | |
| 2863 best_regmatch.endpos[0] = regmatch.endpos[0]; | |
| 2864 } | |
| 2865 } | |
| 2866 } | |
| 2867 | |
| 2868 /* | |
| 2869 * If all end patterns have been tried, and there is no match, the | |
| 2870 * item continues until end-of-line. | |
| 2871 */ | |
| 2872 if (best_idx == -1) | |
| 2873 break; | |
| 2874 | |
| 2875 /* | |
| 2876 * If the skip pattern matches before the end pattern, | |
| 2877 * continue searching after the skip pattern. | |
| 2878 */ | |
| 2879 if (spp_skip != NULL) | |
| 2880 { | |
| 2881 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF]; | |
| 6375 | 2882 int r; |
| 7 | 2883 |
| 2884 if (lc_col < 0) | |
| 2885 lc_col = 0; | |
| 2886 regmatch.rmm_ic = spp_skip->sp_ic; | |
| 2887 regmatch.regprog = spp_skip->sp_prog; | |
| 6375 | 2888 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 2889 IF_SYN_TIME(&spp_skip->sp_time)); | |
| 2890 spp_skip->sp_prog = regmatch.regprog; | |
| 2891 if (r && regmatch.startpos[0].col | |
| 7 | 2892 <= best_regmatch.startpos[0].col) |
| 2893 { | |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2894 int line_len; |
|
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2895 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2896 // Add offset to skip pattern match |
| 7 | 2897 syn_add_end_off(&pos, ®match, spp_skip, SPO_ME_OFF, 1); |
| 2898 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2899 // If the skip pattern goes on to the next line, there is no |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2900 // match with an end pattern in this line. |
| 7 | 2901 if (pos.lnum > startpos->lnum) |
| 2902 break; | |
| 2903 | |
| 2904 line = ml_get_buf(syn_buf, startpos->lnum, FALSE); | |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2905 line_len = (int)STRLEN(line); |
| 7 | 2906 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2907 // take care of an empty match or negative offset |
| 7 | 2908 if (pos.col <= matchcol) |
| 2909 ++matchcol; | |
| 2910 else if (pos.col <= regmatch.endpos[0].col) | |
| 2911 matchcol = pos.col; | |
| 2912 else | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2913 // Be careful not to jump over the NUL at the end-of-line |
| 7 | 2914 for (matchcol = regmatch.endpos[0].col; |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2915 matchcol < line_len && matchcol < pos.col; |
| 7 | 2916 ++matchcol) |
| 2917 ; | |
| 2918 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2919 // if the skip pattern includes end-of-line, break here |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2920 if (matchcol >= line_len) |
| 7 | 2921 break; |
| 2922 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2923 continue; // start with first end pattern again |
| 7 | 2924 } |
| 2925 } | |
| 2926 | |
| 2927 /* | |
| 2928 * Match from start pattern to end pattern. | |
| 2929 * Correct for match and highlight offset of end pattern. | |
| 2930 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2931 spp = &(SYN_ITEMS(syn_block)[best_idx]); |
| 7 | 2932 syn_add_end_off(m_endpos, &best_regmatch, spp, SPO_ME_OFF, 1); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2933 // can't end before the start |
| 7 | 2934 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col) |
| 2935 m_endpos->col = startpos->col; | |
| 2936 | |
| 2937 syn_add_end_off(end_endpos, &best_regmatch, spp, SPO_HE_OFF, 1); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2938 // can't end before the start |
| 7 | 2939 if (end_endpos->lnum == startpos->lnum |
| 2940 && end_endpos->col < startpos->col) | |
| 2941 end_endpos->col = startpos->col; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2942 // can't end after the match |
| 7 | 2943 limit_pos(end_endpos, m_endpos); |
| 2944 | |
| 2945 /* | |
| 2946 * If the end group is highlighted differently, adjust the pointers. | |
| 2947 */ | |
| 2948 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0) | |
| 2949 { | |
| 2950 *end_idx = best_idx; | |
| 2951 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT))) | |
| 2952 { | |
| 2953 hl_endpos->lnum = best_regmatch.endpos[0].lnum; | |
| 2954 hl_endpos->col = best_regmatch.endpos[0].col; | |
| 2955 } | |
| 2956 else | |
| 2957 { | |
| 2958 hl_endpos->lnum = best_regmatch.startpos[0].lnum; | |
| 2959 hl_endpos->col = best_regmatch.startpos[0].col; | |
| 2960 } | |
| 2961 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF]; | |
| 2962 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2963 // can't end before the start |
| 7 | 2964 if (hl_endpos->lnum == startpos->lnum |
| 2965 && hl_endpos->col < startpos->col) | |
| 2966 hl_endpos->col = startpos->col; | |
| 2967 limit_pos(hl_endpos, m_endpos); | |
| 2968 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2969 // now the match ends where the highlighting ends, it is turned |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2970 // into the matchgroup for the end |
| 7 | 2971 *m_endpos = *hl_endpos; |
| 2972 } | |
| 2973 else | |
| 2974 { | |
| 2975 *end_idx = 0; | |
| 2976 *hl_endpos = *end_endpos; | |
| 2977 } | |
| 2978 | |
| 2979 *flagsp = spp->sp_flags; | |
| 2980 | |
| 2981 had_match = TRUE; | |
| 2982 break; | |
| 2983 } | |
| 2984 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2985 // no match for an END pattern in this line |
| 7 | 2986 if (!had_match) |
| 2987 m_endpos->lnum = 0; | |
| 2988 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2989 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2990 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2991 // Remove external matches. |
| 7 | 2992 unref_extmatch(re_extmatch_in); |
| 2993 re_extmatch_in = NULL; | |
| 2994 } | |
| 2995 | |
| 2996 /* | |
| 2997 * Limit "pos" not to be after "limit". | |
| 2998 */ | |
| 2999 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3000 limit_pos(lpos_T *pos, lpos_T *limit) |
| 7 | 3001 { |
| 3002 if (pos->lnum > limit->lnum) | |
| 3003 *pos = *limit; | |
| 3004 else if (pos->lnum == limit->lnum && pos->col > limit->col) | |
| 3005 pos->col = limit->col; | |
| 3006 } | |
| 3007 | |
| 3008 /* | |
| 3009 * Limit "pos" not to be after "limit", unless pos->lnum is zero. | |
| 3010 */ | |
| 3011 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3012 limit_pos_zero( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3013 lpos_T *pos, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3014 lpos_T *limit) |
| 7 | 3015 { |
| 3016 if (pos->lnum == 0) | |
| 3017 *pos = *limit; | |
| 3018 else | |
| 3019 limit_pos(pos, limit); | |
| 3020 } | |
| 3021 | |
| 3022 /* | |
| 3023 * Add offset to matched text for end of match or highlight. | |
| 3024 */ | |
| 3025 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3026 syn_add_end_off( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3027 lpos_T *result, // returned position |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3028 regmmatch_T *regmatch, // start/end of match |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3029 synpat_T *spp, // matched pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3030 int idx, // index of offset |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3031 int extra) // extra chars for offset to start |
| 7 | 3032 { |
| 3033 int col; | |
| 1624 | 3034 int off; |
| 3035 char_u *base; | |
| 3036 char_u *p; | |
| 7 | 3037 |
| 3038 if (spp->sp_off_flags & (1 << idx)) | |
| 3039 { | |
| 3040 result->lnum = regmatch->startpos[0].lnum; | |
| 1624 | 3041 col = regmatch->startpos[0].col; |
| 3042 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3043 } |
| 3044 else | |
| 3045 { | |
| 3046 result->lnum = regmatch->endpos[0].lnum; | |
| 3047 col = regmatch->endpos[0].col; | |
| 1624 | 3048 off = spp->sp_offsets[idx]; |
| 3049 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3050 // Don't go past the end of the line. Matters for "rs=e+2" when there |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3051 // is a matchgroup. Watch out for match with last NL in the buffer. |
| 1624 | 3052 if (result->lnum > syn_buf->b_ml.ml_line_count) |
| 3053 col = 0; | |
| 3054 else if (off != 0) | |
| 3055 { | |
| 3056 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3057 p = base + col; | |
| 3058 if (off > 0) | |
| 3059 { | |
| 3060 while (off-- > 0 && *p != NUL) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11119
diff
changeset
|
3061 MB_PTR_ADV(p); |
| 1624 | 3062 } |
| 3063 else if (off < 0) | |
| 3064 { | |
| 3065 while (off++ < 0 && base < p) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11119
diff
changeset
|
3066 MB_PTR_BACK(base, p); |
| 1624 | 3067 } |
| 3068 col = (int)(p - base); | |
| 3069 } | |
| 3070 result->col = col; | |
| 7 | 3071 } |
| 3072 | |
| 3073 /* | |
| 3074 * Add offset to matched text for start of match or highlight. | |
| 3075 * Avoid resulting column to become negative. | |
| 3076 */ | |
| 3077 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3078 syn_add_start_off( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3079 lpos_T *result, // returned position |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3080 regmmatch_T *regmatch, // start/end of match |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3081 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3082 int idx, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3083 int extra) // extra chars for offset to end |
| 7 | 3084 { |
| 3085 int col; | |
| 1624 | 3086 int off; |
| 3087 char_u *base; | |
| 3088 char_u *p; | |
| 7 | 3089 |
| 3090 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT))) | |
| 3091 { | |
| 3092 result->lnum = regmatch->endpos[0].lnum; | |
| 1624 | 3093 col = regmatch->endpos[0].col; |
| 3094 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3095 } |
| 3096 else | |
| 3097 { | |
| 3098 result->lnum = regmatch->startpos[0].lnum; | |
| 3099 col = regmatch->startpos[0].col; | |
| 1624 | 3100 off = spp->sp_offsets[idx]; |
| 3101 } | |
|
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3102 if (result->lnum > syn_buf->b_ml.ml_line_count) |
|
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3103 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3104 // a "\n" at the end of the pattern may take us below the last line |
|
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3105 result->lnum = syn_buf->b_ml.ml_line_count; |
|
2100
7d121c69f540
updated for version 7.2.383
Bram Moolenaar <bram@zimbu.org>
parents:
2092
diff
changeset
|
3106 col = (int)STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE)); |
|
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3107 } |
| 1624 | 3108 if (off != 0) |
| 3109 { | |
| 3110 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3111 p = base + col; | |
| 3112 if (off > 0) | |
| 3113 { | |
| 3114 while (off-- && *p != NUL) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11119
diff
changeset
|
3115 MB_PTR_ADV(p); |
| 1624 | 3116 } |
| 3117 else if (off < 0) | |
| 3118 { | |
| 3119 while (off++ && base < p) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11119
diff
changeset
|
3120 MB_PTR_BACK(base, p); |
| 1624 | 3121 } |
| 3122 col = (int)(p - base); | |
| 3123 } | |
| 3124 result->col = col; | |
| 7 | 3125 } |
| 3126 | |
| 3127 /* | |
| 3128 * Get current line in syntax buffer. | |
| 3129 */ | |
| 3130 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3131 syn_getcurline(void) |
| 7 | 3132 { |
| 3133 return ml_get_buf(syn_buf, current_lnum, FALSE); | |
| 3134 } | |
| 3135 | |
| 3136 /* | |
| 410 | 3137 * Call vim_regexec() to find a match with "rmp" in "syn_buf". |
| 7 | 3138 * Returns TRUE when there is a match. |
| 3139 */ | |
| 3140 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3141 syn_regexec( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3142 regmmatch_T *rmp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3143 linenr_T lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3144 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3145 syn_time_T *st UNUSED) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3146 { |
|
29218
48b36959a4fc
patch 8.2.5128: syntax disabled when using synID() in searchpair() skip expr
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
3147 int r; |
|
48b36959a4fc
patch 8.2.5128: syntax disabled when using synID() in searchpair() skip expr
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
3148 int timed_out = FALSE; |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3149 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3150 proftime_T pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3151 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3152 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3153 profile_start(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3154 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3155 |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3156 if (rmp->regprog == NULL) |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3157 // This can happen if a previous call to vim_regexec_multi() tried to |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3158 // use the NFA engine, which resulted in NFA_TOO_EXPENSIVE, and |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3159 // compiling the pattern with the other engine fails. |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3160 return FALSE; |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3161 |
| 410 | 3162 rmp->rmm_maxcol = syn_buf->b_p_smc; |
|
29071
b90bca860b5a
patch 8.2.5057: using gettimeofday() for timeout is very inefficient
Bram Moolenaar <Bram@vim.org>
parents:
28475
diff
changeset
|
3163 r = vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col, &timed_out); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3164 |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3165 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3166 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3167 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3168 profile_end(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3169 profile_add(&st->total, &pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3170 if (profile_cmp(&pt, &st->slowest) < 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3171 st->slowest = pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3172 ++st->count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3173 if (r > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3174 ++st->match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3175 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3176 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3177 #ifdef FEAT_RELTIME |
|
29218
48b36959a4fc
patch 8.2.5128: syntax disabled when using synID() in searchpair() skip expr
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
3178 if (timed_out && redrawtime_limit_set && !syn_win->w_s->b_syn_slow) |
|
14366
1c79c92a642e
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
3179 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3180 syn_win->w_s->b_syn_slow = TRUE; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3181 msg(_("'redrawtime' exceeded, syntax highlighting disabled")); |
|
14366
1c79c92a642e
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
3182 } |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3183 #endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3184 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3185 if (r > 0) |
| 7 | 3186 { |
| 3187 rmp->startpos[0].lnum += lnum; | |
| 3188 rmp->endpos[0].lnum += lnum; | |
| 3189 return TRUE; | |
| 3190 } | |
| 3191 return FALSE; | |
| 3192 } | |
| 3193 | |
| 3194 /* | |
| 3195 * Check one position in a line for a matching keyword. | |
| 3196 * The caller must check if a keyword can start at startcol. | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3197 * Return its ID if found, 0 otherwise. |
| 7 | 3198 */ |
| 3199 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3200 check_keyword_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3201 char_u *line, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3202 int startcol, // position in line to check for keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3203 int *endcolp, // return: character after found keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3204 long *flagsp, // return: flags of matching keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3205 short **next_listp, // return: next_list of matching keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3206 stateitem_T *cur_si, // item at the top of the stack |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3207 int *ccharp UNUSED) // conceal substitution char |
| 7 | 3208 { |
| 134 | 3209 keyentry_T *kp; |
| 3210 char_u *kwp; | |
| 7 | 3211 int round; |
| 134 | 3212 int kwlen; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3213 char_u keyword[MAXKEYWLEN + 1]; // assume max. keyword len is 80 |
| 134 | 3214 hashtab_T *ht; |
| 3215 hashitem_T *hi; | |
| 7 | 3216 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3217 // Find first character after the keyword. First character was already |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3218 // checked. |
| 134 | 3219 kwp = line + startcol; |
| 3220 kwlen = 0; | |
| 7 | 3221 do |
| 3222 { | |
| 3223 if (has_mbyte) | |
| 474 | 3224 kwlen += (*mb_ptr2len)(kwp + kwlen); |
| 7 | 3225 else |
| 134 | 3226 ++kwlen; |
| 3227 } | |
| 4043 | 3228 while (vim_iswordp_buf(kwp + kwlen, syn_buf)); |
| 134 | 3229 |
| 3230 if (kwlen > MAXKEYWLEN) | |
| 7 | 3231 return 0; |
| 3232 | |
| 3233 /* | |
| 3234 * Must make a copy of the keyword, so we can add a NUL and make it | |
| 3235 * lowercase. | |
| 3236 */ | |
| 419 | 3237 vim_strncpy(keyword, kwp, kwlen); |
| 7 | 3238 |
| 3239 /* | |
| 3240 * Try twice: | |
| 3241 * 1. matching case | |
| 3242 * 2. ignoring case | |
| 3243 */ | |
| 3244 for (round = 1; round <= 2; ++round) | |
| 3245 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3246 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic; |
| 134 | 3247 if (ht->ht_used == 0) |
| 7 | 3248 continue; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3249 if (round == 2) // ignore case |
| 134 | 3250 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1); |
| 7 | 3251 |
| 3252 /* | |
| 134 | 3253 * Find keywords that match. There can be several with different |
| 3254 * attributes. | |
| 7 | 3255 * When current_next_list is non-zero accept only that group, otherwise: |
| 3256 * Accept a not-contained keyword at toplevel. | |
| 3257 * Accept a keyword at other levels only if it is in the contains list. | |
| 3258 */ | |
| 134 | 3259 hi = hash_find(ht, keyword); |
| 3260 if (!HASHITEM_EMPTY(hi)) | |
| 3261 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next) | |
| 7 | 3262 { |
| 134 | 3263 if (current_next_list != 0 |
| 3264 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0) | |
| 3265 : (cur_si == NULL | |
| 3266 ? !(kp->flags & HL_CONTAINED) | |
| 3267 : in_id_list(cur_si, cur_si->si_cont_list, | |
| 3268 &kp->k_syn, kp->flags & HL_CONTAINED))) | |
| 3269 { | |
| 3270 *endcolp = startcol + kwlen; | |
| 3271 *flagsp = kp->flags; | |
| 3272 *next_listp = kp->next_list; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3273 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3274 *ccharp = kp->k_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3275 #endif |
| 134 | 3276 return kp->k_syn.id; |
| 3277 } | |
| 7 | 3278 } |
| 3279 } | |
| 3280 return 0; | |
| 3281 } | |
| 3282 | |
| 3283 /* | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3284 * Handle ":syntax conceal" command. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3285 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3286 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3287 syn_cmd_conceal(exarg_T *eap UNUSED, int syncing UNUSED) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3288 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3289 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3290 char_u *arg = eap->arg; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3291 char_u *next; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3292 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3293 eap->nextcmd = find_nextcmd(arg); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3294 if (eap->skip) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3295 return; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3296 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3297 next = skiptowhite(arg); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3298 if (*arg == NUL) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3299 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3300 if (curwin->w_s->b_syn_conceal) |
|
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3301 msg("syntax conceal on"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3302 else |
|
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3303 msg("syntax conceal off"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3304 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3305 else if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3306 curwin->w_s->b_syn_conceal = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3307 else if (STRNICMP(arg, "off", 3) == 0 && next - arg == 3) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3308 curwin->w_s->b_syn_conceal = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3309 else |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3310 semsg(_(e_illegal_argument_str_2), arg); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3311 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3312 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3313 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3314 /* |
| 7 | 3315 * Handle ":syntax case" command. |
| 3316 */ | |
| 3317 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3318 syn_cmd_case(exarg_T *eap, int syncing UNUSED) |
| 7 | 3319 { |
| 3320 char_u *arg = eap->arg; | |
| 3321 char_u *next; | |
| 3322 | |
| 3323 eap->nextcmd = find_nextcmd(arg); | |
| 3324 if (eap->skip) | |
| 3325 return; | |
| 3326 | |
| 3327 next = skiptowhite(arg); | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3328 if (*arg == NUL) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3329 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3330 if (curwin->w_s->b_syn_ic) |
|
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3331 msg("syntax case ignore"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3332 else |
|
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3333 msg("syntax case match"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3334 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3335 else if (STRNICMP(arg, "match", 5) == 0 && next - arg == 5) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3336 curwin->w_s->b_syn_ic = FALSE; |
| 7 | 3337 else if (STRNICMP(arg, "ignore", 6) == 0 && next - arg == 6) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3338 curwin->w_s->b_syn_ic = TRUE; |
| 7 | 3339 else |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3340 semsg(_(e_illegal_argument_str_2), arg); |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3341 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3342 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3343 /* |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3344 * Handle ":syntax foldlevel" command. |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3345 */ |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3346 static void |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3347 syn_cmd_foldlevel(exarg_T *eap, int syncing UNUSED) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3348 { |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3349 char_u *arg = eap->arg; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3350 char_u *arg_end; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3351 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3352 eap->nextcmd = find_nextcmd(arg); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3353 if (eap->skip) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3354 return; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3355 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3356 if (*arg == NUL) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3357 { |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3358 switch (curwin->w_s->b_syn_foldlevel) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3359 { |
|
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3360 case SYNFLD_START: msg("syntax foldlevel start"); break; |
|
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3361 case SYNFLD_MINIMUM: msg("syntax foldlevel minimum"); break; |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3362 default: break; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3363 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3364 return; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3365 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3366 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3367 arg_end = skiptowhite(arg); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3368 if (STRNICMP(arg, "start", 5) == 0 && arg_end - arg == 5) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3369 curwin->w_s->b_syn_foldlevel = SYNFLD_START; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3370 else if (STRNICMP(arg, "minimum", 7) == 0 && arg_end - arg == 7) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3371 curwin->w_s->b_syn_foldlevel = SYNFLD_MINIMUM; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3372 else |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3373 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3374 semsg(_(e_illegal_argument_str_2), arg); |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3375 return; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3376 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3377 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3378 arg = skipwhite(arg_end); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3379 if (*arg != NUL) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3380 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3381 semsg(_(e_illegal_argument_str_2), arg); |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3382 } |
| 7 | 3383 } |
| 3384 | |
| 3385 /* | |
| 419 | 3386 * Handle ":syntax spell" command. |
| 3387 */ | |
| 3388 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3389 syn_cmd_spell(exarg_T *eap, int syncing UNUSED) |
| 419 | 3390 { |
| 3391 char_u *arg = eap->arg; | |
| 3392 char_u *next; | |
| 3393 | |
| 3394 eap->nextcmd = find_nextcmd(arg); | |
| 3395 if (eap->skip) | |
| 3396 return; | |
| 3397 | |
| 3398 next = skiptowhite(arg); | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3399 if (*arg == NUL) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3400 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3401 if (curwin->w_s->b_syn_spell == SYNSPL_TOP) |
|
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3402 msg("syntax spell toplevel"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3403 else if (curwin->w_s->b_syn_spell == SYNSPL_NOTOP) |
|
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3404 msg("syntax spell notoplevel"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3405 else |
|
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3406 msg("syntax spell default"); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3407 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3408 else if (STRNICMP(arg, "toplevel", 8) == 0 && next - arg == 8) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3409 curwin->w_s->b_syn_spell = SYNSPL_TOP; |
| 419 | 3410 else if (STRNICMP(arg, "notoplevel", 10) == 0 && next - arg == 10) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3411 curwin->w_s->b_syn_spell = SYNSPL_NOTOP; |
| 1064 | 3412 else if (STRNICMP(arg, "default", 7) == 0 && next - arg == 7) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3413 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT; |
| 419 | 3414 else |
| 6880 | 3415 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3416 semsg(_(e_illegal_argument_str_2), arg); |
| 6880 | 3417 return; |
| 3418 } | |
| 3419 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3420 // assume spell checking changed, force a redraw |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
3421 redraw_win_later(curwin, UPD_NOT_VALID); |
| 419 | 3422 } |
| 3423 | |
| 3424 /* | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3425 * Handle ":syntax iskeyword" command. |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3426 */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3427 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3428 syn_cmd_iskeyword(exarg_T *eap, int syncing UNUSED) |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3429 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3430 char_u *arg = eap->arg; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3431 char_u save_chartab[32]; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3432 char_u *save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3433 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3434 if (eap->skip) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3435 return; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3436 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3437 arg = skipwhite(arg); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3438 if (*arg == NUL) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3439 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3440 msg_puts("\n"); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3441 if (curwin->w_s->b_syn_isk != empty_option) |
|
14366
1c79c92a642e
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
3442 { |
|
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3443 msg_puts("syntax iskeyword "); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3444 msg_outtrans(curwin->w_s->b_syn_isk); |
|
14366
1c79c92a642e
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
3445 } |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3446 else |
|
14366
1c79c92a642e
patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
3447 msg_outtrans((char_u *)_("syntax iskeyword not set")); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3448 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3449 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3450 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3451 if (STRNICMP(arg, "clear", 5) == 0) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3452 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3453 mch_memmove(curwin->w_s->b_syn_chartab, curbuf->b_chartab, |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3454 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3455 clear_string_option(&curwin->w_s->b_syn_isk); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3456 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3457 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3458 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3459 mch_memmove(save_chartab, curbuf->b_chartab, (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3460 save_isk = curbuf->b_p_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3461 curbuf->b_p_isk = vim_strsave(arg); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3462 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3463 buf_init_chartab(curbuf, FALSE); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3464 mch_memmove(curwin->w_s->b_syn_chartab, curbuf->b_chartab, |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3465 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3466 mch_memmove(curbuf->b_chartab, save_chartab, (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3467 clear_string_option(&curwin->w_s->b_syn_isk); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3468 curwin->w_s->b_syn_isk = curbuf->b_p_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3469 curbuf->b_p_isk = save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3470 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3471 } |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
3472 redraw_win_later(curwin, UPD_NOT_VALID); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3473 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3474 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3475 /* |
| 7 | 3476 * Clear all syntax info for one buffer. |
| 3477 */ | |
| 3478 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3479 syntax_clear(synblock_T *block) |
| 7 | 3480 { |
| 3481 int i; | |
| 3482 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3483 block->b_syn_error = FALSE; // clear previous error |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3484 #ifdef FEAT_RELTIME |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3485 block->b_syn_slow = FALSE; // clear previous timeout |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3486 #endif |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3487 block->b_syn_ic = FALSE; // Use case, by default |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3488 block->b_syn_foldlevel = SYNFLD_START; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3489 block->b_syn_spell = SYNSPL_DEFAULT; // default spell checking |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3490 block->b_syn_containedin = FALSE; |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3491 #ifdef FEAT_CONCEAL |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3492 block->b_syn_conceal = FALSE; |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3493 #endif |
| 7 | 3494 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3495 // free the keywords |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3496 clear_keywtab(&block->b_keywtab); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3497 clear_keywtab(&block->b_keywtab_ic); |
| 7 | 3498 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3499 // free the syntax patterns |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3500 for (i = block->b_syn_patterns.ga_len; --i >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3501 syn_clear_pattern(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3502 ga_clear(&block->b_syn_patterns); |
| 7 | 3503 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3504 // free the syntax clusters |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3505 for (i = block->b_syn_clusters.ga_len; --i >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3506 syn_clear_cluster(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3507 ga_clear(&block->b_syn_clusters); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3508 block->b_spell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3509 block->b_nospell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3510 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3511 block->b_syn_sync_flags = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3512 block->b_syn_sync_minlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3513 block->b_syn_sync_maxlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3514 block->b_syn_sync_linebreaks = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3515 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3516 vim_regfree(block->b_syn_linecont_prog); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3517 block->b_syn_linecont_prog = NULL; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3518 VIM_CLEAR(block->b_syn_linecont_pat); |
| 7 | 3519 #ifdef FEAT_FOLDING |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3520 block->b_syn_folditems = 0; |
| 7 | 3521 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3522 clear_string_option(&block->b_syn_isk); |
| 7 | 3523 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3524 // free the stored states |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3525 syn_stack_free_all(block); |
| 7 | 3526 invalidate_current_state(); |
| 2743 | 3527 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3528 // Reset the counter for ":syn include" |
| 2743 | 3529 running_syn_inc_tag = 0; |
| 7 | 3530 } |
| 3531 | |
| 3532 /* | |
|
2253
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3533 * Get rid of ownsyntax for window "wp". |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3534 */ |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3535 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3536 reset_synblock(win_T *wp) |
|
2253
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3537 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3538 if (wp->w_s != &wp->w_buffer->b_s) |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3539 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3540 syntax_clear(wp->w_s); |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3541 vim_free(wp->w_s); |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3542 wp->w_s = &wp->w_buffer->b_s; |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3543 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3544 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3545 |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3546 /* |
| 7 | 3547 * Clear syncing info for one buffer. |
| 3548 */ | |
| 3549 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3550 syntax_sync_clear(void) |
| 7 | 3551 { |
| 3552 int i; | |
| 3553 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3554 // free the syntax patterns |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3555 for (i = curwin->w_s->b_syn_patterns.ga_len; --i >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3556 if (SYN_ITEMS(curwin->w_s)[i].sp_syncing) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3557 syn_remove_pattern(curwin->w_s, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3558 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3559 curwin->w_s->b_syn_sync_flags = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3560 curwin->w_s->b_syn_sync_minlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3561 curwin->w_s->b_syn_sync_maxlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3562 curwin->w_s->b_syn_sync_linebreaks = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3563 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3564 vim_regfree(curwin->w_s->b_syn_linecont_prog); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3565 curwin->w_s->b_syn_linecont_prog = NULL; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3566 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3567 clear_string_option(&curwin->w_s->b_syn_isk); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3568 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3569 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
| 7 | 3570 } |
| 3571 | |
| 3572 /* | |
| 3573 * Remove one pattern from the buffer's pattern list. | |
| 3574 */ | |
| 3575 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3576 syn_remove_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3577 synblock_T *block, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3578 int idx) |
| 7 | 3579 { |
| 3580 synpat_T *spp; | |
| 3581 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3582 spp = &(SYN_ITEMS(block)[idx]); |
| 7 | 3583 #ifdef FEAT_FOLDING |
| 3584 if (spp->sp_flags & HL_FOLD) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3585 --block->b_syn_folditems; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3586 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3587 syn_clear_pattern(block, idx); |
| 7 | 3588 mch_memmove(spp, spp + 1, |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3589 sizeof(synpat_T) * (block->b_syn_patterns.ga_len - idx - 1)); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3590 --block->b_syn_patterns.ga_len; |
| 7 | 3591 } |
| 3592 | |
| 3593 /* | |
| 3594 * Clear and free one syntax pattern. When clearing all, must be called from | |
| 3595 * last to first! | |
| 3596 */ | |
| 3597 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3598 syn_clear_pattern(synblock_T *block, int i) |
| 7 | 3599 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3600 vim_free(SYN_ITEMS(block)[i].sp_pattern); |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3601 vim_regfree(SYN_ITEMS(block)[i].sp_prog); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3602 // Only free sp_cont_list and sp_next_list of first start pattern |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3603 if (i == 0 || SYN_ITEMS(block)[i - 1].sp_type != SPTYPE_START) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3604 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3605 vim_free(SYN_ITEMS(block)[i].sp_cont_list); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3606 vim_free(SYN_ITEMS(block)[i].sp_next_list); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3607 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list); |
| 7 | 3608 } |
| 3609 } | |
| 3610 | |
| 3611 /* | |
| 3612 * Clear and free one syntax cluster. | |
| 3613 */ | |
| 3614 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3615 syn_clear_cluster(synblock_T *block, int i) |
| 7 | 3616 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3617 vim_free(SYN_CLSTR(block)[i].scl_name); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3618 vim_free(SYN_CLSTR(block)[i].scl_name_u); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3619 vim_free(SYN_CLSTR(block)[i].scl_list); |
| 7 | 3620 } |
| 3621 | |
| 3622 /* | |
| 3623 * Handle ":syntax clear" command. | |
| 3624 */ | |
| 3625 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3626 syn_cmd_clear(exarg_T *eap, int syncing) |
| 7 | 3627 { |
| 3628 char_u *arg = eap->arg; | |
| 3629 char_u *arg_end; | |
| 3630 int id; | |
| 3631 | |
| 3632 eap->nextcmd = find_nextcmd(arg); | |
| 3633 if (eap->skip) | |
| 3634 return; | |
| 3635 | |
| 3636 /* | |
| 3637 * We have to disable this within ":syn include @group filename", | |
| 3638 * because otherwise @group would get deleted. | |
| 3639 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn | |
| 3640 * clear". | |
| 3641 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3642 if (curwin->w_s->b_syn_topgrp != 0) |
| 7 | 3643 return; |
| 3644 | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3645 if (ends_excmd2(eap->cmd, arg)) |
| 7 | 3646 { |
| 3647 /* | |
| 3648 * No argument: Clear all syntax items. | |
| 3649 */ | |
| 3650 if (syncing) | |
| 3651 syntax_sync_clear(); | |
| 3652 else | |
| 3653 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3654 syntax_clear(curwin->w_s); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3655 if (curwin->w_s == &curwin->w_buffer->b_s) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3656 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
3657 do_unlet((char_u *)"w:current_syntax", TRUE); |
| 7 | 3658 } |
| 3659 } | |
| 3660 else | |
| 3661 { | |
| 3662 /* | |
| 3663 * Clear the group IDs that are in the argument. | |
| 3664 */ | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3665 while (!ends_excmd2(eap->cmd, arg)) |
| 7 | 3666 { |
| 3667 arg_end = skiptowhite(arg); | |
| 3668 if (*arg == '@') | |
| 3669 { | |
| 3670 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 3671 if (id == 0) | |
| 3672 { | |
|
31602
53c3df37a2b0
patch 9.0.1133: error message names do not match the items
Bram Moolenaar <Bram@vim.org>
parents:
31231
diff
changeset
|
3673 semsg(_(e_no_such_syntax_cluster_str_1), arg); |
| 7 | 3674 break; |
| 3675 } | |
| 3676 else | |
| 3677 { | |
| 3678 /* | |
| 3679 * We can't physically delete a cluster without changing | |
| 3680 * the IDs of other clusters, so we do the next best thing | |
| 3681 * and make it empty. | |
| 3682 */ | |
| 3683 short scl_id = id - SYNID_CLUSTER; | |
| 3684 | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3685 VIM_CLEAR(SYN_CLSTR(curwin->w_s)[scl_id].scl_list); |
| 7 | 3686 } |
| 3687 } | |
| 3688 else | |
| 3689 { | |
| 3690 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 3691 if (id == 0) | |
| 3692 { | |
|
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
3693 semsg(_(e_no_such_highlight_group_name_str), arg); |
| 7 | 3694 break; |
| 3695 } | |
| 3696 else | |
| 3697 syn_clear_one(id, syncing); | |
| 3698 } | |
| 3699 arg = skipwhite(arg_end); | |
| 3700 } | |
| 3701 } | |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
3702 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3703 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
| 7 | 3704 } |
| 3705 | |
| 3706 /* | |
| 3707 * Clear one syntax group for the current buffer. | |
| 3708 */ | |
| 3709 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3710 syn_clear_one(int id, int syncing) |
| 7 | 3711 { |
| 3712 synpat_T *spp; | |
| 3713 int idx; | |
| 3714 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3715 // Clear keywords only when not ":syn sync clear group-name" |
| 7 | 3716 if (!syncing) |
| 3717 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3718 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3719 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic); |
| 7 | 3720 } |
| 3721 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3722 // clear the patterns for "id" |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3723 for (idx = curwin->w_s->b_syn_patterns.ga_len; --idx >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3724 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3725 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 3726 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 3727 continue; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3728 syn_remove_pattern(curwin->w_s, idx); |
| 7 | 3729 } |
| 3730 } | |
| 3731 | |
| 3732 /* | |
| 3733 * Handle ":syntax on" command. | |
| 3734 */ | |
| 3735 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3736 syn_cmd_on(exarg_T *eap, int syncing UNUSED) |
| 7 | 3737 { |
| 3738 syn_cmd_onoff(eap, "syntax"); | |
| 3739 } | |
| 3740 | |
| 3741 /* | |
| 3742 * Handle ":syntax enable" command. | |
| 3743 */ | |
| 3744 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3745 syn_cmd_enable(exarg_T *eap, int syncing UNUSED) |
| 7 | 3746 { |
|
26199
eaa97adb0732
patch 8.2.3631: "syntax enable" does not work properly in Vim9 context
Bram Moolenaar <Bram@vim.org>
parents:
25521
diff
changeset
|
3747 set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"enable"); |
| 7 | 3748 syn_cmd_onoff(eap, "syntax"); |
| 148 | 3749 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3750 } |
| 3751 | |
| 3752 /* | |
| 3753 * Handle ":syntax reset" command. | |
|
8815
50d9fb580ffe
commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816
Christian Brabandt <cb@256bit.org>
parents:
8806
diff
changeset
|
3754 * It actually resets highlighting, not syntax. |
| 7 | 3755 */ |
| 3756 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3757 syn_cmd_reset(exarg_T *eap, int syncing UNUSED) |
| 7 | 3758 { |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3759 set_nextcmd(eap, eap->arg); |
| 7 | 3760 if (!eap->skip) |
| 3761 { | |
|
26199
eaa97adb0732
patch 8.2.3631: "syntax enable" does not work properly in Vim9 context
Bram Moolenaar <Bram@vim.org>
parents:
25521
diff
changeset
|
3762 set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"reset"); |
| 7 | 3763 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); |
| 148 | 3764 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3765 } |
| 3766 } | |
| 3767 | |
| 3768 /* | |
| 3769 * Handle ":syntax manual" command. | |
| 3770 */ | |
| 3771 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3772 syn_cmd_manual(exarg_T *eap, int syncing UNUSED) |
| 7 | 3773 { |
| 3774 syn_cmd_onoff(eap, "manual"); | |
| 3775 } | |
| 3776 | |
| 3777 /* | |
| 3778 * Handle ":syntax off" command. | |
| 3779 */ | |
| 3780 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3781 syn_cmd_off(exarg_T *eap, int syncing UNUSED) |
| 7 | 3782 { |
| 3783 syn_cmd_onoff(eap, "nosyntax"); | |
| 3784 } | |
| 3785 | |
| 3786 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3787 syn_cmd_onoff(exarg_T *eap, char *name) |
| 7 | 3788 { |
| 3789 char_u buf[100]; | |
| 3790 | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3791 set_nextcmd(eap, eap->arg); |
| 7 | 3792 if (!eap->skip) |
| 3793 { | |
| 3794 STRCPY(buf, "so "); | |
| 274 | 3795 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); |
| 7 | 3796 do_cmdline_cmd(buf); |
| 3797 } | |
| 3798 } | |
| 3799 | |
| 3800 /* | |
| 3801 * Handle ":syntax [list]" command: list current syntax words. | |
| 3802 */ | |
| 3803 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3804 syn_cmd_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3805 exarg_T *eap, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3806 int syncing) // when TRUE: list syncing items |
| 7 | 3807 { |
| 3808 char_u *arg = eap->arg; | |
| 3809 int id; | |
| 3810 char_u *arg_end; | |
| 3811 | |
| 3812 eap->nextcmd = find_nextcmd(arg); | |
| 3813 if (eap->skip) | |
| 3814 return; | |
| 3815 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3816 if (!syntax_present(curwin)) |
| 7 | 3817 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3818 msg(_(msg_no_items)); |
| 7 | 3819 return; |
| 3820 } | |
| 3821 | |
| 3822 if (syncing) | |
| 3823 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3824 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 3825 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3826 msg_puts(_("syncing on C-style comments")); |
| 7 | 3827 syn_lines_msg(); |
| 3828 syn_match_msg(); | |
| 3829 return; | |
| 3830 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3831 else if (!(curwin->w_s->b_syn_sync_flags & SF_MATCH)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3832 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3833 if (curwin->w_s->b_syn_sync_minlines == 0) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3834 msg_puts(_("no syncing")); |
| 7 | 3835 else |
| 3836 { | |
|
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3837 if (curwin->w_s->b_syn_sync_minlines == MAXLNUM) |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3838 msg_puts(_("syncing starts at the first line")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3839 else |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3840 { |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3841 msg_puts(_("syncing starts ")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3842 msg_outnum(curwin->w_s->b_syn_sync_minlines); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3843 msg_puts(_(" lines before top line")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3844 } |
| 7 | 3845 syn_match_msg(); |
| 3846 } | |
| 3847 return; | |
| 3848 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3849 msg_puts_title(_("\n--- Syntax sync items ---")); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3850 if (curwin->w_s->b_syn_sync_minlines > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3851 || curwin->w_s->b_syn_sync_maxlines > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3852 || curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 3853 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3854 msg_puts(_("\nsyncing on items")); |
| 7 | 3855 syn_lines_msg(); |
| 3856 syn_match_msg(); | |
| 3857 } | |
| 3858 } | |
| 3859 else | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3860 msg_puts_title(_("\n--- Syntax items ---")); |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3861 if (ends_excmd2(eap->cmd, arg)) |
| 7 | 3862 { |
| 3863 /* | |
| 3864 * No argument: List all group IDs and all syntax clusters. | |
| 3865 */ | |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
3866 for (id = 1; id <= highlight_num_groups() && !got_int; ++id) |
| 7 | 3867 syn_list_one(id, syncing, FALSE); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3868 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id) |
| 7 | 3869 syn_list_cluster(id); |
| 3870 } | |
| 3871 else | |
| 3872 { | |
| 3873 /* | |
| 3874 * List the group IDs and syntax clusters that are in the argument. | |
| 3875 */ | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3876 while (!ends_excmd2(eap->cmd, arg) && !got_int) |
| 7 | 3877 { |
| 3878 arg_end = skiptowhite(arg); | |
| 3879 if (*arg == '@') | |
| 3880 { | |
| 3881 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 3882 if (id == 0) | |
|
31602
53c3df37a2b0
patch 9.0.1133: error message names do not match the items
Bram Moolenaar <Bram@vim.org>
parents:
31231
diff
changeset
|
3883 semsg(_(e_no_such_syntax_cluster_str_2), arg); |
| 7 | 3884 else |
| 3885 syn_list_cluster(id - SYNID_CLUSTER); | |
| 3886 } | |
| 3887 else | |
| 3888 { | |
| 3889 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 3890 if (id == 0) | |
|
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
3891 semsg(_(e_no_such_highlight_group_name_str), arg); |
| 7 | 3892 else |
| 3893 syn_list_one(id, syncing, TRUE); | |
| 3894 } | |
| 3895 arg = skipwhite(arg_end); | |
| 3896 } | |
| 3897 } | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3898 set_nextcmd(eap, arg); |
| 7 | 3899 } |
| 3900 | |
| 3901 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3902 syn_lines_msg(void) |
| 7 | 3903 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3904 if (curwin->w_s->b_syn_sync_maxlines > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3905 || curwin->w_s->b_syn_sync_minlines > 0) |
| 7 | 3906 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3907 msg_puts("; "); |
|
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3908 if (curwin->w_s->b_syn_sync_minlines == MAXLNUM) |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3909 msg_puts(_("from the first line")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3910 else |
| 7 | 3911 { |
|
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3912 if (curwin->w_s->b_syn_sync_minlines > 0) |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3913 { |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3914 msg_puts(_("minimal ")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3915 msg_outnum(curwin->w_s->b_syn_sync_minlines); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3916 if (curwin->w_s->b_syn_sync_maxlines) |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3917 msg_puts(", "); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3918 } |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3919 if (curwin->w_s->b_syn_sync_maxlines > 0) |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3920 { |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3921 msg_puts(_("maximal ")); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3922 msg_outnum(curwin->w_s->b_syn_sync_maxlines); |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3923 } |
|
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3924 msg_puts(_(" lines before top line")); |
| 7 | 3925 } |
| 3926 } | |
| 3927 } | |
| 3928 | |
| 3929 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3930 syn_match_msg(void) |
| 7 | 3931 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3932 if (curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 3933 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3934 msg_puts(_("; match ")); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3935 msg_outnum(curwin->w_s->b_syn_sync_linebreaks); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3936 msg_puts(_(" line breaks")); |
| 7 | 3937 } |
| 3938 } | |
| 3939 | |
| 3940 static int last_matchgroup; | |
| 3941 | |
| 3942 struct name_list | |
| 3943 { | |
| 3944 int flag; | |
| 3945 char *name; | |
| 3946 }; | |
| 3947 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
3948 static void syn_list_flags(struct name_list *nl, int flags, int attr); |
| 7 | 3949 |
| 3950 /* | |
| 3951 * List one syntax item, for ":syntax" or "syntax list syntax_name". | |
| 3952 */ | |
| 3953 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3954 syn_list_one( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3955 int id, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3956 int syncing, // when TRUE: list syncing items |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3957 int link_only) // when TRUE; list link-only too |
| 7 | 3958 { |
| 3959 int attr; | |
| 3960 int idx; | |
| 3961 int did_header = FALSE; | |
| 3962 synpat_T *spp; | |
| 3963 static struct name_list namelist1[] = | |
| 3964 { | |
| 3965 {HL_DISPLAY, "display"}, | |
| 3966 {HL_CONTAINED, "contained"}, | |
| 3967 {HL_ONELINE, "oneline"}, | |
| 3968 {HL_KEEPEND, "keepend"}, | |
| 3969 {HL_EXTEND, "extend"}, | |
| 3970 {HL_EXCLUDENL, "excludenl"}, | |
| 3971 {HL_TRANSP, "transparent"}, | |
| 3972 {HL_FOLD, "fold"}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3973 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3974 {HL_CONCEAL, "conceal"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3975 {HL_CONCEALENDS, "concealends"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3976 #endif |
| 7 | 3977 {0, NULL} |
| 3978 }; | |
| 3979 static struct name_list namelist2[] = | |
| 3980 { | |
| 3981 {HL_SKIPWHITE, "skipwhite"}, | |
| 3982 {HL_SKIPNL, "skipnl"}, | |
| 3983 {HL_SKIPEMPTY, "skipempty"}, | |
| 3984 {0, NULL} | |
| 3985 }; | |
| 3986 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3987 attr = HL_ATTR(HLF_D); // highlight like directories |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3988 |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3989 // list the keywords for "id" |
| 7 | 3990 if (!syncing) |
| 3991 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3992 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab, FALSE, attr); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3993 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic, |
| 7 | 3994 did_header, attr); |
| 3995 } | |
| 3996 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3997 // list the patterns for "id" |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3998 for (idx = 0; idx < curwin->w_s->b_syn_patterns.ga_len && !got_int; ++idx) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3999 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4000 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 4001 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 4002 continue; | |
| 4003 | |
| 4004 (void)syn_list_header(did_header, 999, id); | |
| 4005 did_header = TRUE; | |
| 4006 last_matchgroup = 0; | |
| 4007 if (spp->sp_type == SPTYPE_MATCH) | |
| 4008 { | |
| 4009 put_pattern("match", ' ', spp, attr); | |
| 4010 msg_putchar(' '); | |
| 4011 } | |
| 4012 else if (spp->sp_type == SPTYPE_START) | |
| 4013 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4014 while (SYN_ITEMS(curwin->w_s)[idx].sp_type == SPTYPE_START) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4015 put_pattern("start", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4016 if (SYN_ITEMS(curwin->w_s)[idx].sp_type == SPTYPE_SKIP) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4017 put_pattern("skip", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4018 while (idx < curwin->w_s->b_syn_patterns.ga_len |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4019 && SYN_ITEMS(curwin->w_s)[idx].sp_type == SPTYPE_END) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4020 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
| 7 | 4021 --idx; |
| 4022 msg_putchar(' '); | |
| 4023 } | |
| 4024 syn_list_flags(namelist1, spp->sp_flags, attr); | |
| 4025 | |
| 4026 if (spp->sp_cont_list != NULL) | |
| 4027 put_id_list((char_u *)"contains", spp->sp_cont_list, attr); | |
| 4028 | |
| 4029 if (spp->sp_syn.cont_in_list != NULL) | |
| 4030 put_id_list((char_u *)"containedin", | |
| 4031 spp->sp_syn.cont_in_list, attr); | |
| 4032 | |
| 4033 if (spp->sp_next_list != NULL) | |
| 4034 { | |
| 4035 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr); | |
| 4036 syn_list_flags(namelist2, spp->sp_flags, attr); | |
| 4037 } | |
| 4038 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE)) | |
| 4039 { | |
| 4040 if (spp->sp_flags & HL_SYNC_HERE) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4041 msg_puts_attr("grouphere", attr); |
| 7 | 4042 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4043 msg_puts_attr("groupthere", attr); |
| 7 | 4044 msg_putchar(' '); |
| 4045 if (spp->sp_sync_idx >= 0) | |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4046 msg_outtrans(highlight_group_name(SYN_ITEMS(curwin->w_s) |
|
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4047 [spp->sp_sync_idx].sp_syn.id - 1)); |
| 7 | 4048 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4049 msg_puts("NONE"); |
| 7 | 4050 msg_putchar(' '); |
| 4051 } | |
| 4052 } | |
| 4053 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4054 // list the link, if there is one |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4055 if (highlight_link_id(id - 1) && (did_header || link_only) && !got_int) |
| 7 | 4056 { |
| 4057 (void)syn_list_header(did_header, 999, id); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4058 msg_puts_attr("links to", attr); |
| 7 | 4059 msg_putchar(' '); |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4060 msg_outtrans(highlight_group_name(highlight_link_id(id - 1) - 1)); |
| 7 | 4061 } |
| 4062 } | |
| 4063 | |
| 4064 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4065 syn_list_flags(struct name_list *nlist, int flags, int attr) |
| 7 | 4066 { |
| 4067 int i; | |
| 4068 | |
| 3263 | 4069 for (i = 0; nlist[i].flag != 0; ++i) |
| 4070 if (flags & nlist[i].flag) | |
| 4071 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4072 msg_puts_attr(nlist[i].name, attr); |
| 7 | 4073 msg_putchar(' '); |
| 4074 } | |
| 4075 } | |
| 4076 | |
| 4077 /* | |
| 4078 * List one syntax cluster, for ":syntax" or "syntax list syntax_name". | |
| 4079 */ | |
| 4080 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4081 syn_list_cluster(int id) |
| 7 | 4082 { |
| 4083 int endcol = 15; | |
| 4084 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4085 // slight hack: roughly duplicate the guts of syn_list_header() |
| 7 | 4086 msg_putchar('\n'); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4087 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name); |
| 7 | 4088 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4089 if (msg_col >= endcol) // output at least one space |
| 7 | 4090 endcol = msg_col + 1; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4091 if (Columns <= endcol) // avoid hang for tiny window |
| 7 | 4092 endcol = Columns - 1; |
| 4093 | |
| 4094 msg_advance(endcol); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4095 if (SYN_CLSTR(curwin->w_s)[id].scl_list != NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4096 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4097 put_id_list((char_u *)"cluster", SYN_CLSTR(curwin->w_s)[id].scl_list, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4098 HL_ATTR(HLF_D)); |
| 7 | 4099 } |
| 4100 else | |
| 4101 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4102 msg_puts_attr("cluster", HL_ATTR(HLF_D)); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4103 msg_puts("=NONE"); |
| 7 | 4104 } |
| 4105 } | |
| 4106 | |
| 4107 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4108 put_id_list(char_u *name, short *list, int attr) |
| 7 | 4109 { |
| 4110 short *p; | |
| 4111 | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4112 msg_puts_attr((char *)name, attr); |
| 7 | 4113 msg_putchar('='); |
| 4114 for (p = list; *p; ++p) | |
| 4115 { | |
| 4116 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP) | |
| 4117 { | |
| 4118 if (p[1]) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4119 msg_puts("ALLBUT"); |
| 7 | 4120 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4121 msg_puts("ALL"); |
| 7 | 4122 } |
| 4123 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED) | |
| 4124 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4125 msg_puts("TOP"); |
| 7 | 4126 } |
| 4127 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER) | |
| 4128 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4129 msg_puts("CONTAINED"); |
| 7 | 4130 } |
| 4131 else if (*p >= SYNID_CLUSTER) | |
| 4132 { | |
| 4133 short scl_id = *p - SYNID_CLUSTER; | |
| 4134 | |
| 4135 msg_putchar('@'); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4136 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name); |
| 7 | 4137 } |
| 4138 else | |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4139 msg_outtrans(highlight_group_name(*p - 1)); |
| 7 | 4140 if (p[1]) |
| 4141 msg_putchar(','); | |
| 4142 } | |
| 4143 msg_putchar(' '); | |
| 4144 } | |
| 4145 | |
| 4146 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4147 put_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4148 char *s, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4149 int c, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4150 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4151 int attr) |
| 7 | 4152 { |
| 4153 long n; | |
| 4154 int mask; | |
| 4155 int first; | |
| 4156 static char *sepchars = "/+=-#@\"|'^&"; | |
| 4157 int i; | |
| 4158 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4159 // May have to write "matchgroup=group" |
| 7 | 4160 if (last_matchgroup != spp->sp_syn_match_id) |
| 4161 { | |
| 4162 last_matchgroup = spp->sp_syn_match_id; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4163 msg_puts_attr("matchgroup", attr); |
| 7 | 4164 msg_putchar('='); |
| 4165 if (last_matchgroup == 0) | |
| 4166 msg_outtrans((char_u *)"NONE"); | |
| 4167 else | |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4168 msg_outtrans(highlight_group_name(last_matchgroup - 1)); |
| 7 | 4169 msg_putchar(' '); |
| 4170 } | |
| 4171 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4172 // output the name of the pattern and an '=' or ' ' |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4173 msg_puts_attr(s, attr); |
| 7 | 4174 msg_putchar(c); |
| 4175 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4176 // output the pattern, in between a char that is not in the pattern |
| 7 | 4177 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; ) |
| 4178 if (sepchars[++i] == NUL) | |
| 4179 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4180 i = 0; // no good char found, just use the first one |
| 7 | 4181 break; |
| 4182 } | |
| 4183 msg_putchar(sepchars[i]); | |
| 4184 msg_outtrans(spp->sp_pattern); | |
| 4185 msg_putchar(sepchars[i]); | |
| 4186 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4187 // output any pattern options |
| 7 | 4188 first = TRUE; |
| 4189 for (i = 0; i < SPO_COUNT; ++i) | |
| 4190 { | |
| 4191 mask = (1 << i); | |
| 4192 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT))) | |
| 4193 { | |
| 4194 if (!first) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4195 msg_putchar(','); // separate with commas |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4196 msg_puts(spo_name_tab[i]); |
| 7 | 4197 n = spp->sp_offsets[i]; |
| 4198 if (i != SPO_LC_OFF) | |
| 4199 { | |
| 4200 if (spp->sp_off_flags & mask) | |
| 4201 msg_putchar('s'); | |
| 4202 else | |
| 4203 msg_putchar('e'); | |
| 4204 if (n > 0) | |
| 4205 msg_putchar('+'); | |
| 4206 } | |
| 4207 if (n || i == SPO_LC_OFF) | |
| 4208 msg_outnum(n); | |
| 4209 first = FALSE; | |
| 4210 } | |
| 4211 } | |
| 4212 msg_putchar(' '); | |
| 4213 } | |
| 4214 | |
| 4215 /* | |
| 4216 * List or clear the keywords for one syntax group. | |
| 4217 * Return TRUE if the header has been printed. | |
| 4218 */ | |
| 4219 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4220 syn_list_keywords( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4221 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4222 hashtab_T *ht, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4223 int did_header, // header has already been printed |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4224 int attr) |
| 7 | 4225 { |
| 4226 int outlen; | |
| 134 | 4227 hashitem_T *hi; |
| 4228 keyentry_T *kp; | |
| 4229 int todo; | |
| 7 | 4230 int prev_contained = 0; |
| 4231 short *prev_next_list = NULL; | |
| 4232 short *prev_cont_in_list = NULL; | |
| 4233 int prev_skipnl = 0; | |
| 4234 int prev_skipwhite = 0; | |
| 4235 int prev_skipempty = 0; | |
| 4236 | |
| 4237 /* | |
| 4238 * Unfortunately, this list of keywords is not sorted on alphabet but on | |
| 4239 * hash value... | |
| 4240 */ | |
| 835 | 4241 todo = (int)ht->ht_used; |
| 134 | 4242 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi) |
| 4243 { | |
| 4244 if (!HASHITEM_EMPTY(hi)) | |
| 4245 { | |
| 4246 --todo; | |
| 4247 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next) | |
| 7 | 4248 { |
| 134 | 4249 if (kp->k_syn.id == id) |
| 7 | 4250 { |
| 134 | 4251 if (prev_contained != (kp->flags & HL_CONTAINED) |
| 4252 || prev_skipnl != (kp->flags & HL_SKIPNL) | |
| 4253 || prev_skipwhite != (kp->flags & HL_SKIPWHITE) | |
| 4254 || prev_skipempty != (kp->flags & HL_SKIPEMPTY) | |
| 4255 || prev_cont_in_list != kp->k_syn.cont_in_list | |
| 4256 || prev_next_list != kp->next_list) | |
| 4257 outlen = 9999; | |
| 4258 else | |
| 4259 outlen = (int)STRLEN(kp->keyword); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4260 // output "contained" and "nextgroup" on each line |
| 134 | 4261 if (syn_list_header(did_header, outlen, id)) |
| 4262 { | |
| 4263 prev_contained = 0; | |
| 4264 prev_next_list = NULL; | |
| 4265 prev_cont_in_list = NULL; | |
| 4266 prev_skipnl = 0; | |
| 4267 prev_skipwhite = 0; | |
| 4268 prev_skipempty = 0; | |
| 4269 } | |
| 4270 did_header = TRUE; | |
| 4271 if (prev_contained != (kp->flags & HL_CONTAINED)) | |
| 4272 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4273 msg_puts_attr("contained", attr); |
| 134 | 4274 msg_putchar(' '); |
| 4275 prev_contained = (kp->flags & HL_CONTAINED); | |
| 4276 } | |
| 4277 if (kp->k_syn.cont_in_list != prev_cont_in_list) | |
| 4278 { | |
| 4279 put_id_list((char_u *)"containedin", | |
| 4280 kp->k_syn.cont_in_list, attr); | |
| 4281 msg_putchar(' '); | |
| 4282 prev_cont_in_list = kp->k_syn.cont_in_list; | |
| 4283 } | |
| 4284 if (kp->next_list != prev_next_list) | |
| 4285 { | |
| 4286 put_id_list((char_u *)"nextgroup", kp->next_list, attr); | |
| 4287 msg_putchar(' '); | |
| 4288 prev_next_list = kp->next_list; | |
| 4289 if (kp->flags & HL_SKIPNL) | |
| 4290 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4291 msg_puts_attr("skipnl", attr); |
| 134 | 4292 msg_putchar(' '); |
| 4293 prev_skipnl = (kp->flags & HL_SKIPNL); | |
| 4294 } | |
| 4295 if (kp->flags & HL_SKIPWHITE) | |
| 4296 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4297 msg_puts_attr("skipwhite", attr); |
| 134 | 4298 msg_putchar(' '); |
| 4299 prev_skipwhite = (kp->flags & HL_SKIPWHITE); | |
| 4300 } | |
| 4301 if (kp->flags & HL_SKIPEMPTY) | |
| 4302 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4303 msg_puts_attr("skipempty", attr); |
| 134 | 4304 msg_putchar(' '); |
| 4305 prev_skipempty = (kp->flags & HL_SKIPEMPTY); | |
| 4306 } | |
| 4307 } | |
| 4308 msg_outtrans(kp->keyword); | |
| 7 | 4309 } |
| 4310 } | |
| 4311 } | |
| 4312 } | |
| 4313 | |
| 4314 return did_header; | |
| 4315 } | |
| 4316 | |
| 4317 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4318 syn_clear_keyword(int id, hashtab_T *ht) |
| 134 | 4319 { |
| 4320 hashitem_T *hi; | |
| 4321 keyentry_T *kp; | |
| 4322 keyentry_T *kp_prev; | |
| 4323 keyentry_T *kp_next; | |
| 4324 int todo; | |
| 4325 | |
| 4326 hash_lock(ht); | |
| 835 | 4327 todo = (int)ht->ht_used; |
| 134 | 4328 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4329 { | |
| 4330 if (!HASHITEM_EMPTY(hi)) | |
| 4331 { | |
| 4332 --todo; | |
| 4333 kp_prev = NULL; | |
| 4334 for (kp = HI2KE(hi); kp != NULL; ) | |
| 7 | 4335 { |
| 134 | 4336 if (kp->k_syn.id == id) |
| 4337 { | |
| 4338 kp_next = kp->ke_next; | |
| 4339 if (kp_prev == NULL) | |
| 4340 { | |
| 4341 if (kp_next == NULL) | |
|
31231
684e6dfa2fba
patch 9.0.0949: crash when unletting a variable while listing variables
Bram Moolenaar <Bram@vim.org>
parents:
30831
diff
changeset
|
4342 hash_remove(ht, hi, "syntax clear keyword"); |
| 134 | 4343 else |
| 4344 hi->hi_key = KE2HIKEY(kp_next); | |
| 4345 } | |
| 4346 else | |
| 4347 kp_prev->ke_next = kp_next; | |
| 4348 vim_free(kp->next_list); | |
| 4349 vim_free(kp->k_syn.cont_in_list); | |
| 4350 vim_free(kp); | |
| 4351 kp = kp_next; | |
| 4352 } | |
| 7 | 4353 else |
| 134 | 4354 { |
| 4355 kp_prev = kp; | |
| 4356 kp = kp->ke_next; | |
| 4357 } | |
| 7 | 4358 } |
| 134 | 4359 } |
| 4360 } | |
| 4361 hash_unlock(ht); | |
| 4362 } | |
| 4363 | |
| 4364 /* | |
| 4365 * Clear a whole keyword table. | |
| 7 | 4366 */ |
| 4367 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4368 clear_keywtab(hashtab_T *ht) |
| 134 | 4369 { |
| 4370 hashitem_T *hi; | |
| 4371 int todo; | |
| 4372 keyentry_T *kp; | |
| 4373 keyentry_T *kp_next; | |
| 4374 | |
| 835 | 4375 todo = (int)ht->ht_used; |
| 134 | 4376 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4377 { | |
| 4378 if (!HASHITEM_EMPTY(hi)) | |
| 4379 { | |
| 4380 --todo; | |
| 4381 for (kp = HI2KE(hi); kp != NULL; kp = kp_next) | |
| 7 | 4382 { |
| 134 | 4383 kp_next = kp->ke_next; |
| 4384 vim_free(kp->next_list); | |
| 4385 vim_free(kp->k_syn.cont_in_list); | |
| 4386 vim_free(kp); | |
| 7 | 4387 } |
| 134 | 4388 } |
| 4389 } | |
| 4390 hash_clear(ht); | |
| 4391 hash_init(ht); | |
| 7 | 4392 } |
| 4393 | |
| 4394 /* | |
| 4395 * Add a keyword to the list of keywords. | |
| 4396 */ | |
| 4397 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4398 add_keyword( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4399 char_u *name, // name of keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4400 int id, // group ID for this keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4401 int flags, // flags for this keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4402 short *cont_in_list, // containedin for this keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4403 short *next_list, // nextgroup for this keyword |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4404 int conceal_char) |
| 7 | 4405 { |
| 134 | 4406 keyentry_T *kp; |
| 4407 hashtab_T *ht; | |
| 4408 hashitem_T *hi; | |
| 154 | 4409 char_u *name_ic; |
| 134 | 4410 long_u hash; |
| 154 | 4411 char_u name_folded[MAXKEYWLEN + 1]; |
| 7 | 4412 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4413 if (curwin->w_s->b_syn_ic) |
| 154 | 4414 name_ic = str_foldcase(name, (int)STRLEN(name), |
| 4415 name_folded, MAXKEYWLEN + 1); | |
| 4416 else | |
| 4417 name_ic = name; | |
|
17659
121bdff812b4
patch 8.1.1827: allocating more memory than needed for extended structs
Bram Moolenaar <Bram@vim.org>
parents:
17401
diff
changeset
|
4418 kp = alloc(offsetof(keyentry_T, keyword) + STRLEN(name_ic) + 1); |
| 134 | 4419 if (kp == NULL) |
| 4420 return; | |
| 4421 STRCPY(kp->keyword, name_ic); | |
| 4422 kp->k_syn.id = id; | |
| 4423 kp->k_syn.inc_tag = current_syn_inc_tag; | |
| 4424 kp->flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4425 kp->k_char = conceal_char; |
| 134 | 4426 kp->k_syn.cont_in_list = copy_id_list(cont_in_list); |
| 4427 if (cont_in_list != NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4428 curwin->w_s->b_syn_containedin = TRUE; |
| 134 | 4429 kp->next_list = copy_id_list(next_list); |
| 4430 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4431 if (curwin->w_s->b_syn_ic) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4432 ht = &curwin->w_s->b_keywtab_ic; |
| 7 | 4433 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4434 ht = &curwin->w_s->b_keywtab; |
| 134 | 4435 |
| 4436 hash = hash_hash(kp->keyword); | |
| 4437 hi = hash_lookup(ht, kp->keyword, hash); | |
| 4438 if (HASHITEM_EMPTY(hi)) | |
| 4439 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4440 // new keyword, add to hashtable |
| 134 | 4441 kp->ke_next = NULL; |
| 4442 hash_add_item(ht, hi, kp->keyword, hash); | |
| 4443 } | |
| 4444 else | |
| 4445 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4446 // keyword already exists, prepend to list |
| 134 | 4447 kp->ke_next = HI2KE(hi); |
| 4448 hi->hi_key = KE2HIKEY(kp); | |
| 4449 } | |
| 7 | 4450 } |
| 4451 | |
| 4452 /* | |
| 4453 * Get the start and end of the group name argument. | |
| 4454 * Return a pointer to the first argument. | |
| 4455 * Return NULL if the end of the command was found instead of further args. | |
| 4456 */ | |
| 4457 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4458 get_group_name( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4459 char_u *arg, // start of the argument |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4460 char_u **name_end) // pointer to end of the name |
| 7 | 4461 { |
| 4462 char_u *rest; | |
| 4463 | |
| 4464 *name_end = skiptowhite(arg); | |
| 4465 rest = skipwhite(*name_end); | |
| 4466 | |
| 4467 /* | |
| 4468 * Check if there are enough arguments. The first argument may be a | |
| 4469 * pattern, where '|' is allowed, so only check for NUL. | |
| 4470 */ | |
| 4471 if (ends_excmd(*arg) || *rest == NUL) | |
| 4472 return NULL; | |
| 4473 return rest; | |
| 4474 } | |
| 4475 | |
| 4476 /* | |
| 4477 * Check for syntax command option arguments. | |
| 4478 * This can be called at any place in the list of arguments, and just picks | |
| 4479 * out the arguments that are known. Can be called several times in a row to | |
| 4480 * collect all options in between other arguments. | |
| 4481 * Return a pointer to the next argument (which isn't an option). | |
| 4482 * Return NULL for any error; | |
| 4483 */ | |
| 4484 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4485 get_syn_options( |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4486 char_u *start, // next argument to be checked |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4487 syn_opt_arg_T *opt, // various things |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4488 int *conceal_char UNUSED, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4489 int skip) // TRUE if skipping over command |
| 154 | 4490 { |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4491 char_u *arg = start; |
| 7 | 4492 char_u *gname_start, *gname; |
| 4493 int syn_id; | |
| 4494 int len; | |
| 154 | 4495 char *p; |
| 7 | 4496 int i; |
| 4497 int fidx; | |
| 4498 static struct flag | |
| 4499 { | |
| 4500 char *name; | |
| 154 | 4501 int argtype; |
| 4502 int flags; | |
| 4503 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED}, | |
| 4504 {"oOnNeElLiInNeE", 0, HL_ONELINE}, | |
| 4505 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND}, | |
| 4506 {"eExXtTeEnNdD", 0, HL_EXTEND}, | |
| 4507 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL}, | |
| 4508 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP}, | |
| 4509 {"sSkKiIpPnNlL", 0, HL_SKIPNL}, | |
| 4510 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE}, | |
| 4511 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY}, | |
| 4512 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE}, | |
| 4513 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE}, | |
| 4514 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY}, | |
| 4515 {"fFoOlLdD", 0, HL_FOLD}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4516 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4517 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4518 {"cCcChHaArR", 11, 0}, |
| 154 | 4519 {"cCoOnNtTaAiInNsS", 1, 0}, |
| 4520 {"cCoOnNtTaAiInNeEdDiInN", 2, 0}, | |
| 4521 {"nNeExXtTgGrRoOuUpP", 3, 0}, | |
| 7 | 4522 }; |
| 154 | 4523 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN"; |
| 7 | 4524 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4525 if (arg == NULL) // already detected error |
| 7 | 4526 return NULL; |
| 4527 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4528 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4529 if (curwin->w_s->b_syn_conceal) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4530 opt->flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4531 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4532 |
| 7 | 4533 for (;;) |
| 4534 { | |
| 154 | 4535 /* |
| 4536 * This is used very often when a large number of keywords is defined. | |
| 4537 * Need to skip quickly when no option name is found. | |
| 4538 * Also avoid tolower(), it's slow. | |
| 4539 */ | |
| 4540 if (strchr(first_letters, *arg) == NULL) | |
| 4541 break; | |
| 7 | 4542 |
|
24768
7334bf933510
patch 8.2.2922: computing array length is done in various ways
Bram Moolenaar <Bram@vim.org>
parents:
24442
diff
changeset
|
4543 for (fidx = ARRAY_LENGTH(flagtab); --fidx >= 0; ) |
| 7 | 4544 { |
| 154 | 4545 p = flagtab[fidx].name; |
| 4546 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len) | |
| 4547 if (arg[len] != p[i] && arg[len] != p[i + 1]) | |
| 4548 break; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4549 if (p[i] == NUL && (VIM_ISWHITE(arg[len]) |
| 154 | 4550 || (flagtab[fidx].argtype > 0 |
| 4551 ? arg[len] == '=' | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4552 : ends_excmd2(start, arg + len)))) |
| 7 | 4553 { |
| 154 | 4554 if (opt->keyword |
| 4555 && (flagtab[fidx].flags == HL_DISPLAY | |
| 4556 || flagtab[fidx].flags == HL_FOLD | |
| 4557 || flagtab[fidx].flags == HL_EXTEND)) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4558 // treat "display", "fold" and "extend" as a keyword |
| 7 | 4559 fidx = -1; |
| 4560 break; | |
| 4561 } | |
| 4562 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4563 if (fidx < 0) // no match found |
| 154 | 4564 break; |
| 4565 | |
| 4566 if (flagtab[fidx].argtype == 1) | |
| 4567 { | |
| 4568 if (!opt->has_cont_list) | |
| 7 | 4569 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4570 emsg(_(e_contains_argument_not_accepted_here)); |
| 7 | 4571 return NULL; |
| 4572 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4573 if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL) |
| 7 | 4574 return NULL; |
| 4575 } | |
| 154 | 4576 else if (flagtab[fidx].argtype == 2) |
| 4577 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4578 if (get_id_list(&arg, 11, &opt->cont_in_list, skip) == FAIL) |
| 7 | 4579 return NULL; |
| 4580 } | |
| 154 | 4581 else if (flagtab[fidx].argtype == 3) |
| 4582 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4583 if (get_id_list(&arg, 9, &opt->next_list, skip) == FAIL) |
| 7 | 4584 return NULL; |
| 4585 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4586 else if (flagtab[fidx].argtype == 11 && arg[5] == '=') |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4587 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4588 // cchar=? |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4589 if (has_mbyte) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4590 { |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4591 #ifdef FEAT_CONCEAL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4592 *conceal_char = mb_ptr2char(arg + 6); |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4593 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4594 arg += mb_ptr2len(arg + 6) - 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4595 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4596 else |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4597 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4598 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4599 *conceal_char = arg[6]; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4600 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4601 ; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4602 #endif |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4603 } |
| 2686 | 4604 #ifdef FEAT_CONCEAL |
| 4605 if (!vim_isprintc_strict(*conceal_char)) | |
| 4606 { | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
4607 emsg(_(e_invalid_cchar_value)); |
| 2686 | 4608 return NULL; |
| 4609 } | |
| 4610 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4611 arg = skipwhite(arg + 7); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4612 } |
| 7 | 4613 else |
| 154 | 4614 { |
| 4615 opt->flags |= flagtab[fidx].flags; | |
| 4616 arg = skipwhite(arg + len); | |
| 4617 | |
| 4618 if (flagtab[fidx].flags == HL_SYNC_HERE | |
| 4619 || flagtab[fidx].flags == HL_SYNC_THERE) | |
| 4620 { | |
| 4621 if (opt->sync_idx == NULL) | |
| 4622 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4623 emsg(_(e_groupthere_not_accepted_here)); |
| 154 | 4624 return NULL; |
| 4625 } | |
| 4626 gname_start = arg; | |
| 4627 arg = skiptowhite(arg); | |
| 4628 if (gname_start == arg) | |
| 4629 return NULL; | |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
4630 gname = vim_strnsave(gname_start, arg - gname_start); |
| 154 | 4631 if (gname == NULL) |
| 4632 return NULL; | |
| 4633 if (STRCMP(gname, "NONE") == 0) | |
| 4634 *opt->sync_idx = NONE_IDX; | |
| 4635 else | |
| 4636 { | |
| 4637 syn_id = syn_name2id(gname); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4638 for (i = curwin->w_s->b_syn_patterns.ga_len; --i >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4639 if (SYN_ITEMS(curwin->w_s)[i].sp_syn.id == syn_id |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
4640 && SYN_ITEMS(curwin->w_s)[i].sp_type |
|
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
4641 == SPTYPE_START) |
| 154 | 4642 { |
| 4643 *opt->sync_idx = i; | |
| 4644 break; | |
| 4645 } | |
| 4646 if (i < 0) | |
| 4647 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4648 semsg(_(e_didnt_find_region_item_for_str), gname); |
| 154 | 4649 vim_free(gname); |
| 4650 return NULL; | |
| 4651 } | |
| 4652 } | |
| 4653 | |
| 4654 vim_free(gname); | |
| 4655 arg = skipwhite(arg); | |
| 4656 } | |
| 4657 #ifdef FEAT_FOLDING | |
| 4658 else if (flagtab[fidx].flags == HL_FOLD | |
| 4659 && foldmethodIsSyntax(curwin)) | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4660 // Need to update folds later. |
| 154 | 4661 foldUpdateAll(curwin); |
| 4662 #endif | |
| 4663 } | |
| 4664 } | |
| 7 | 4665 |
| 4666 return arg; | |
| 4667 } | |
| 4668 | |
| 4669 /* | |
| 4670 * Adjustments to syntax item when declared in a ":syn include"'d file. | |
| 4671 * Set the contained flag, and if the item is not already contained, add it | |
| 4672 * to the specified top-level group, if any. | |
| 4673 */ | |
| 4674 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4675 syn_incl_toplevel(int id, int *flagsp) |
| 7 | 4676 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4677 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0) |
| 7 | 4678 return; |
| 4679 *flagsp |= HL_CONTAINED; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4680 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) |
| 7 | 4681 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4682 // We have to alloc this, because syn_combine_list() will free it. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
4683 short *grp_list = ALLOC_MULT(short, 2); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4684 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER; |
| 7 | 4685 |
| 4686 if (grp_list != NULL) | |
| 4687 { | |
| 4688 grp_list[0] = id; | |
| 4689 grp_list[1] = 0; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
4690 syn_combine_list(&SYN_CLSTR(curwin->w_s)[tlg_id].scl_list, |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
4691 &grp_list, CLUSTER_ADD); |
| 7 | 4692 } |
| 4693 } | |
| 4694 } | |
| 4695 | |
| 4696 /* | |
| 4697 * Handle ":syntax include [@{group-name}] filename" command. | |
| 4698 */ | |
| 4699 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4700 syn_cmd_include(exarg_T *eap, int syncing UNUSED) |
| 7 | 4701 { |
| 4702 char_u *arg = eap->arg; | |
| 4703 int sgl_id = 1; | |
| 4704 char_u *group_name_end; | |
| 4705 char_u *rest; | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
4706 char *errormsg = NULL; |
| 7 | 4707 int prev_toplvl_grp; |
| 4708 int prev_syn_inc_tag; | |
| 4709 int source = FALSE; | |
| 4710 | |
| 4711 eap->nextcmd = find_nextcmd(arg); | |
| 4712 if (eap->skip) | |
| 4713 return; | |
| 4714 | |
| 4715 if (arg[0] == '@') | |
| 4716 { | |
| 4717 ++arg; | |
| 4718 rest = get_group_name(arg, &group_name_end); | |
| 4719 if (rest == NULL) | |
| 4720 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4721 emsg(_(e_filename_required)); |
| 7 | 4722 return; |
| 4723 } | |
| 4724 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); | |
| 2743 | 4725 if (sgl_id == 0) |
| 4726 return; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4727 // separate_nextcmd() and expand_filename() depend on this |
| 7 | 4728 eap->arg = rest; |
| 4729 } | |
| 4730 | |
| 4731 /* | |
| 4732 * Everything that's left, up to the next command, should be the | |
| 4733 * filename to include. | |
| 4734 */ | |
|
17336
81705f4d9e03
patch 8.1.1667: flags for Ex commands may clash with other symbols
Bram Moolenaar <Bram@vim.org>
parents:
17227
diff
changeset
|
4735 eap->argt |= (EX_XFILE | EX_NOSPC); |
|
28179
49631bf057d3
patch 8.2.4615: mapping with escaped bar does not work in :def function
Bram Moolenaar <Bram@vim.org>
parents:
27752
diff
changeset
|
4736 separate_nextcmd(eap, FALSE); |
| 7 | 4737 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg)) |
| 4738 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4739 // For an absolute path, "$VIM/..." or "<sfile>.." we ":source" the |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4740 // file. Need to expand the file name first. In other cases |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4741 // ":runtime!" is used. |
| 7 | 4742 source = TRUE; |
| 4743 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL) | |
| 4744 { | |
| 4745 if (errormsg != NULL) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
4746 emsg(errormsg); |
| 7 | 4747 return; |
| 4748 } | |
| 4749 } | |
| 4750 | |
| 4751 /* | |
| 4752 * Save and restore the existing top-level grouplist id and ":syn | |
| 4753 * include" tag around the actual inclusion. | |
| 4754 */ | |
| 2743 | 4755 if (running_syn_inc_tag >= MAX_SYN_INC_TAG) |
| 4756 { | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
4757 emsg(_(e_too_many_syntax_includes)); |
| 2743 | 4758 return; |
| 4759 } | |
| 7 | 4760 prev_syn_inc_tag = current_syn_inc_tag; |
| 4761 current_syn_inc_tag = ++running_syn_inc_tag; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4762 prev_toplvl_grp = curwin->w_s->b_syn_topgrp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4763 curwin->w_s->b_syn_topgrp = sgl_id; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
18814
diff
changeset
|
4764 if (source ? do_source(eap->arg, FALSE, DOSO_NONE, NULL) == FAIL |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
8514
diff
changeset
|
4765 : source_runtime(eap->arg, DIP_ALL) == FAIL) |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26865
diff
changeset
|
4766 semsg(_(e_cant_open_file_str), eap->arg); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4767 curwin->w_s->b_syn_topgrp = prev_toplvl_grp; |
| 7 | 4768 current_syn_inc_tag = prev_syn_inc_tag; |
| 4769 } | |
| 4770 | |
| 4771 /* | |
| 4772 * Handle ":syntax keyword {group-name} [{option}] keyword .." command. | |
| 4773 */ | |
| 4774 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4775 syn_cmd_keyword(exarg_T *eap, int syncing UNUSED) |
| 7 | 4776 { |
| 4777 char_u *arg = eap->arg; | |
| 4778 char_u *group_name_end; | |
| 4779 int syn_id; | |
| 4780 char_u *rest; | |
| 2743 | 4781 char_u *keyword_copy = NULL; |
| 7 | 4782 char_u *p; |
| 154 | 4783 char_u *kw; |
| 4784 syn_opt_arg_T syn_opt_arg; | |
| 4785 int cnt; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4786 int conceal_char = NUL; |
| 7 | 4787 |
| 4788 rest = get_group_name(arg, &group_name_end); | |
| 4789 | |
| 4790 if (rest != NULL) | |
| 4791 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4792 if (eap->skip) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4793 syn_id = -1; |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4794 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4795 syn_id = syn_check_group(arg, (int)(group_name_end - arg)); |
| 2743 | 4796 if (syn_id != 0) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4797 // allocate a buffer, for removing backslashes in the keyword |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16611
diff
changeset
|
4798 keyword_copy = alloc(STRLEN(rest) + 1); |
| 7 | 4799 if (keyword_copy != NULL) |
| 4800 { | |
| 154 | 4801 syn_opt_arg.flags = 0; |
| 4802 syn_opt_arg.keyword = TRUE; | |
| 4803 syn_opt_arg.sync_idx = NULL; | |
| 4804 syn_opt_arg.has_cont_list = FALSE; | |
| 4805 syn_opt_arg.cont_in_list = NULL; | |
| 4806 syn_opt_arg.next_list = NULL; | |
| 4807 | |
| 7 | 4808 /* |
| 4809 * The options given apply to ALL keywords, so all options must be | |
| 4810 * found before keywords can be created. | |
| 154 | 4811 * 1: collect the options and copy the keywords to keyword_copy. |
| 7 | 4812 */ |
| 154 | 4813 cnt = 0; |
| 4814 p = keyword_copy; | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4815 for ( ; rest != NULL && !ends_excmd2(eap->arg, rest); |
|
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4816 rest = skipwhite(rest)) |
| 7 | 4817 { |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4818 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4819 eap->skip); |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4820 if (rest == NULL || ends_excmd2(eap->arg, rest)) |
| 154 | 4821 break; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4822 // Copy the keyword, removing backslashes, and add a NUL. |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4823 while (*rest != NUL && !VIM_ISWHITE(*rest)) |
| 154 | 4824 { |
| 4825 if (*rest == '\\' && rest[1] != NUL) | |
| 4826 ++rest; | |
| 4827 *p++ = *rest++; | |
| 4828 } | |
| 4829 *p++ = NUL; | |
| 4830 ++cnt; | |
| 4831 } | |
| 4832 | |
| 4833 if (!eap->skip) | |
| 4834 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4835 // Adjust flags for use of ":syn include". |
| 154 | 4836 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 4837 | |
| 7 | 4838 /* |
| 154 | 4839 * 2: Add an entry for each keyword. |
| 7 | 4840 */ |
| 154 | 4841 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1) |
| 7 | 4842 { |
| 154 | 4843 for (p = vim_strchr(kw, '['); ; ) |
| 7 | 4844 { |
| 154 | 4845 if (p != NULL) |
| 4846 *p = NUL; | |
| 4847 add_keyword(kw, syn_id, syn_opt_arg.flags, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4848 syn_opt_arg.cont_in_list, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4849 syn_opt_arg.next_list, conceal_char); |
| 168 | 4850 if (p == NULL) |
| 4851 break; | |
| 4852 if (p[1] == NUL) | |
| 4853 { | |
|
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26913
diff
changeset
|
4854 semsg(_(e_error_missing_rsb_str), kw); |
| 7017 | 4855 goto error; |
| 168 | 4856 } |
| 4857 if (p[1] == ']') | |
| 4858 { | |
| 7017 | 4859 if (p[2] != NUL) |
| 4860 { | |
|
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
4861 semsg(_(e_trailing_char_after_rsb_str_str), |
|
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
4862 kw, &p[2]); |
| 7017 | 4863 goto error; |
| 4864 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4865 kw = p + 1; // skip over the "]" |
| 168 | 4866 break; |
| 4867 } | |
| 154 | 4868 if (has_mbyte) |
| 7 | 4869 { |
| 474 | 4870 int l = (*mb_ptr2len)(p + 1); |
| 154 | 4871 |
| 4872 mch_memmove(p, p + 1, l); | |
| 4873 p += l; | |
| 4874 } | |
| 4875 else | |
| 4876 { | |
| 4877 p[0] = p[1]; | |
| 4878 ++p; | |
| 7 | 4879 } |
| 4880 } | |
| 4881 } | |
| 4882 } | |
| 7017 | 4883 error: |
| 7 | 4884 vim_free(keyword_copy); |
| 168 | 4885 vim_free(syn_opt_arg.cont_in_list); |
| 4886 vim_free(syn_opt_arg.next_list); | |
| 7 | 4887 } |
| 4888 } | |
| 4889 | |
| 4890 if (rest != NULL) | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
4891 set_nextcmd(eap, rest); |
| 7 | 4892 else |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
4893 semsg(_(e_invalid_argument_str), arg); |
| 7 | 4894 |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
4895 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4896 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
| 7 | 4897 } |
| 4898 | |
| 4899 /* | |
| 4900 * Handle ":syntax match {name} [{options}] {pattern} [{options}]". | |
| 4901 * | |
| 4902 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .." | |
| 4903 */ | |
| 4904 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4905 syn_cmd_match( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4906 exarg_T *eap, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4907 int syncing) // TRUE for ":syntax sync match .. " |
| 7 | 4908 { |
| 4909 char_u *arg = eap->arg; | |
| 4910 char_u *group_name_end; | |
| 4911 char_u *rest; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4912 synpat_T item; // the item found in the line |
| 7 | 4913 int syn_id; |
| 4914 int idx; | |
| 154 | 4915 syn_opt_arg_T syn_opt_arg; |
| 7 | 4916 int sync_idx = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4917 int conceal_char = NUL; |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4918 int orig_called_emsg = called_emsg; |
| 7 | 4919 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4920 // Isolate the group name, check for validity |
| 7 | 4921 rest = get_group_name(arg, &group_name_end); |
| 4922 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4923 // Get options before the pattern |
| 154 | 4924 syn_opt_arg.flags = 0; |
| 4925 syn_opt_arg.keyword = FALSE; | |
| 4926 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL; | |
| 4927 syn_opt_arg.has_cont_list = TRUE; | |
| 4928 syn_opt_arg.cont_list = NULL; | |
| 4929 syn_opt_arg.cont_in_list = NULL; | |
| 4930 syn_opt_arg.next_list = NULL; | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4931 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 4932 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4933 // get the pattern. |
| 7 | 4934 init_syn_patterns(); |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
4935 CLEAR_FIELD(item); |
| 7 | 4936 rest = get_syn_pattern(rest, &item); |
| 154 | 4937 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 4938 syn_opt_arg.flags |= HL_HAS_EOL; | |
| 7 | 4939 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4940 // Get options after the pattern |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4941 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 4942 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4943 if (rest != NULL) // all arguments are valid |
| 7 | 4944 { |
| 4945 /* | |
| 4946 * Check for trailing command and illegal trailing arguments. | |
| 4947 */ | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
4948 set_nextcmd(eap, rest); |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4949 if (!ends_excmd2(eap->cmd, rest) || eap->skip) |
| 7 | 4950 rest = NULL; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4951 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL |
| 7 | 4952 && (syn_id = syn_check_group(arg, |
| 4953 (int)(group_name_end - arg))) != 0) | |
| 4954 { | |
| 154 | 4955 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 4956 /* |
| 4957 * Store the pattern in the syn_items list | |
| 4958 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4959 idx = curwin->w_s->b_syn_patterns.ga_len; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4960 SYN_ITEMS(curwin->w_s)[idx] = item; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4961 SYN_ITEMS(curwin->w_s)[idx].sp_syncing = syncing; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4962 SYN_ITEMS(curwin->w_s)[idx].sp_type = SPTYPE_MATCH; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4963 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4964 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = current_syn_inc_tag; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4965 SYN_ITEMS(curwin->w_s)[idx].sp_flags = syn_opt_arg.flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4966 SYN_ITEMS(curwin->w_s)[idx].sp_sync_idx = sync_idx; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4967 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list = syn_opt_arg.cont_list; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4968 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 4969 syn_opt_arg.cont_in_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4970 #ifdef FEAT_CONCEAL |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
4971 SYN_ITEMS(curwin->w_s)[idx].sp_cchar = conceal_char; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4972 #endif |
| 154 | 4973 if (syn_opt_arg.cont_in_list != NULL) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4974 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4975 SYN_ITEMS(curwin->w_s)[idx].sp_next_list = syn_opt_arg.next_list; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4976 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 4977 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4978 // remember that we found a match for syncing on |
| 154 | 4979 if (syn_opt_arg.flags & (HL_SYNC_HERE|HL_SYNC_THERE)) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4980 curwin->w_s->b_syn_sync_flags |= SF_MATCH; |
| 7 | 4981 #ifdef FEAT_FOLDING |
| 154 | 4982 if (syn_opt_arg.flags & HL_FOLD) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4983 ++curwin->w_s->b_syn_folditems; |
| 7 | 4984 #endif |
| 4985 | |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
4986 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4987 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4988 return; // don't free the progs and patterns now |
| 7 | 4989 } |
| 4990 } | |
| 4991 | |
| 4992 /* | |
| 4993 * Something failed, free the allocated memory. | |
| 4994 */ | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
4995 vim_regfree(item.sp_prog); |
| 7 | 4996 vim_free(item.sp_pattern); |
| 154 | 4997 vim_free(syn_opt_arg.cont_list); |
| 4998 vim_free(syn_opt_arg.cont_in_list); | |
| 4999 vim_free(syn_opt_arg.next_list); | |
| 7 | 5000 |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5001 if (rest == NULL && called_emsg == orig_called_emsg) |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
5002 semsg(_(e_invalid_argument_str), arg); |
| 7 | 5003 } |
| 5004 | |
| 5005 /* | |
| 5006 * Handle ":syntax region {group-name} [matchgroup={group-name}] | |
| 5007 * start {start} .. [skip {skip}] end {end} .. [{options}]". | |
| 5008 */ | |
| 5009 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5010 syn_cmd_region( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5011 exarg_T *eap, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5012 int syncing) // TRUE for ":syntax sync region .." |
| 7 | 5013 { |
| 5014 char_u *arg = eap->arg; | |
| 5015 char_u *group_name_end; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5016 char_u *rest; // next arg, NULL on error |
| 7 | 5017 char_u *key_end; |
| 5018 char_u *key = NULL; | |
| 5019 char_u *p; | |
| 5020 int item; | |
| 5021 #define ITEM_START 0 | |
| 5022 #define ITEM_SKIP 1 | |
| 5023 #define ITEM_END 2 | |
| 5024 #define ITEM_MATCHGROUP 3 | |
| 5025 struct pat_ptr | |
| 5026 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5027 synpat_T *pp_synp; // pointer to syn_pattern |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5028 int pp_matchgroup_id; // matchgroup ID |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5029 struct pat_ptr *pp_next; // pointer to next pat_ptr |
| 7 | 5030 } *(pat_ptrs[3]); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5031 // patterns found in the line |
| 7 | 5032 struct pat_ptr *ppp; |
| 5033 struct pat_ptr *ppp_next; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5034 int pat_count = 0; // nr of syn_patterns found |
| 7 | 5035 int syn_id; |
| 5036 int matchgroup_id = 0; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5037 int not_enough = FALSE; // not enough arguments |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5038 int illegal = FALSE; // illegal arguments |
| 7 | 5039 int success = FALSE; |
| 5040 int idx; | |
| 154 | 5041 syn_opt_arg_T syn_opt_arg; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5042 int conceal_char = NUL; |
| 7 | 5043 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5044 // Isolate the group name, check for validity |
| 7 | 5045 rest = get_group_name(arg, &group_name_end); |
| 5046 | |
| 5047 pat_ptrs[0] = NULL; | |
| 5048 pat_ptrs[1] = NULL; | |
| 5049 pat_ptrs[2] = NULL; | |
| 5050 | |
| 5051 init_syn_patterns(); | |
| 5052 | |
| 154 | 5053 syn_opt_arg.flags = 0; |
| 5054 syn_opt_arg.keyword = FALSE; | |
| 5055 syn_opt_arg.sync_idx = NULL; | |
| 5056 syn_opt_arg.has_cont_list = TRUE; | |
| 5057 syn_opt_arg.cont_list = NULL; | |
| 5058 syn_opt_arg.cont_in_list = NULL; | |
| 5059 syn_opt_arg.next_list = NULL; | |
| 5060 | |
| 7 | 5061 /* |
| 5062 * get the options, patterns and matchgroup. | |
| 5063 */ | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5064 while (rest != NULL && !ends_excmd2(eap->cmd, rest)) |
| 7 | 5065 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5066 // Check for option arguments |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5067 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5068 if (rest == NULL || ends_excmd2(eap->cmd, rest)) |
| 7 | 5069 break; |
| 5070 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5071 // must be a pattern or matchgroup then |
| 7 | 5072 key_end = rest; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5073 while (*key_end && !VIM_ISWHITE(*key_end) && *key_end != '=') |
| 7 | 5074 ++key_end; |
| 5075 vim_free(key); | |
|
20751
d9a2e5dcfd9f
patch 8.2.0928: many type casts are used for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20623
diff
changeset
|
5076 key = vim_strnsave_up(rest, key_end - rest); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5077 if (key == NULL) // out of memory |
| 7 | 5078 { |
| 5079 rest = NULL; | |
| 5080 break; | |
| 5081 } | |
| 5082 if (STRCMP(key, "MATCHGROUP") == 0) | |
| 5083 item = ITEM_MATCHGROUP; | |
| 5084 else if (STRCMP(key, "START") == 0) | |
| 5085 item = ITEM_START; | |
| 5086 else if (STRCMP(key, "END") == 0) | |
| 5087 item = ITEM_END; | |
| 5088 else if (STRCMP(key, "SKIP") == 0) | |
| 5089 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5090 if (pat_ptrs[ITEM_SKIP] != NULL) // one skip pattern allowed |
| 7 | 5091 { |
| 5092 illegal = TRUE; | |
| 5093 break; | |
| 5094 } | |
| 5095 item = ITEM_SKIP; | |
| 5096 } | |
| 5097 else | |
| 5098 break; | |
| 5099 rest = skipwhite(key_end); | |
| 5100 if (*rest != '=') | |
| 5101 { | |
| 5102 rest = NULL; | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5103 semsg(_(e_missing_equal_str), arg); |
| 7 | 5104 break; |
| 5105 } | |
| 5106 rest = skipwhite(rest + 1); | |
| 5107 if (*rest == NUL) | |
| 5108 { | |
| 5109 not_enough = TRUE; | |
| 5110 break; | |
| 5111 } | |
| 5112 | |
| 5113 if (item == ITEM_MATCHGROUP) | |
| 5114 { | |
| 5115 p = skiptowhite(rest); | |
| 5116 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip) | |
| 5117 matchgroup_id = 0; | |
| 5118 else | |
| 5119 { | |
| 5120 matchgroup_id = syn_check_group(rest, (int)(p - rest)); | |
| 5121 if (matchgroup_id == 0) | |
| 5122 { | |
| 5123 illegal = TRUE; | |
| 5124 break; | |
| 5125 } | |
| 5126 } | |
| 5127 rest = skipwhite(p); | |
| 5128 } | |
| 5129 else | |
| 5130 { | |
| 5131 /* | |
| 5132 * Allocate room for a syn_pattern, and link it in the list of | |
| 5133 * syn_patterns for this item, at the start (because the list is | |
| 5134 * used from end to start). | |
| 5135 */ | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
5136 ppp = ALLOC_ONE(struct pat_ptr); |
| 7 | 5137 if (ppp == NULL) |
| 5138 { | |
| 5139 rest = NULL; | |
| 5140 break; | |
| 5141 } | |
| 5142 ppp->pp_next = pat_ptrs[item]; | |
| 5143 pat_ptrs[item] = ppp; | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
5144 ppp->pp_synp = ALLOC_CLEAR_ONE(synpat_T); |
| 7 | 5145 if (ppp->pp_synp == NULL) |
| 5146 { | |
| 5147 rest = NULL; | |
| 5148 break; | |
| 5149 } | |
| 5150 | |
| 5151 /* | |
| 5152 * Get the syntax pattern and the following offset(s). | |
| 5153 */ | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5154 // Enable the appropriate \z specials. |
| 7 | 5155 if (item == ITEM_START) |
| 5156 reg_do_extmatch = REX_SET; | |
| 5157 else if (item == ITEM_SKIP || item == ITEM_END) | |
| 5158 reg_do_extmatch = REX_USE; | |
| 5159 rest = get_syn_pattern(rest, ppp->pp_synp); | |
| 5160 reg_do_extmatch = 0; | |
| 5161 if (item == ITEM_END && vim_regcomp_had_eol() | |
| 154 | 5162 && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 7 | 5163 ppp->pp_synp->sp_flags |= HL_HAS_EOL; |
| 5164 ppp->pp_matchgroup_id = matchgroup_id; | |
| 5165 ++pat_count; | |
| 5166 } | |
| 5167 } | |
| 5168 vim_free(key); | |
| 5169 if (illegal || not_enough) | |
| 5170 rest = NULL; | |
| 5171 | |
| 5172 /* | |
| 5173 * Must have a "start" and "end" pattern. | |
| 5174 */ | |
| 5175 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL || | |
| 5176 pat_ptrs[ITEM_END] == NULL)) | |
| 5177 { | |
| 5178 not_enough = TRUE; | |
| 5179 rest = NULL; | |
| 5180 } | |
| 5181 | |
| 5182 if (rest != NULL) | |
| 5183 { | |
| 5184 /* | |
| 5185 * Check for trailing garbage or command. | |
| 5186 * If OK, add the item. | |
| 5187 */ | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
5188 set_nextcmd(eap, rest); |
| 7 | 5189 if (!ends_excmd(*rest) || eap->skip) |
| 5190 rest = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5191 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL |
| 7 | 5192 && (syn_id = syn_check_group(arg, |
| 5193 (int)(group_name_end - arg))) != 0) | |
| 5194 { | |
| 154 | 5195 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 5196 /* |
| 5197 * Store the start/skip/end in the syn_items list | |
| 5198 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5199 idx = curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5200 for (item = ITEM_START; item <= ITEM_END; ++item) |
| 5201 { | |
| 5202 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next) | |
| 5203 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5204 SYN_ITEMS(curwin->w_s)[idx] = *(ppp->pp_synp); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5205 SYN_ITEMS(curwin->w_s)[idx].sp_syncing = syncing; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5206 SYN_ITEMS(curwin->w_s)[idx].sp_type = |
| 7 | 5207 (item == ITEM_START) ? SPTYPE_START : |
| 5208 (item == ITEM_SKIP) ? SPTYPE_SKIP : SPTYPE_END; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5209 SYN_ITEMS(curwin->w_s)[idx].sp_flags |= syn_opt_arg.flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5210 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id; |
| 2743 | 5211 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = |
| 5212 current_syn_inc_tag; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5213 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id = |
| 7 | 5214 ppp->pp_matchgroup_id; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5215 #ifdef FEAT_CONCEAL |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
5216 SYN_ITEMS(curwin->w_s)[idx].sp_cchar = conceal_char; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5217 #endif |
| 7 | 5218 if (item == ITEM_START) |
| 5219 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5220 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list = |
| 154 | 5221 syn_opt_arg.cont_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5222 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 5223 syn_opt_arg.cont_in_list; |
| 5224 if (syn_opt_arg.cont_in_list != NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5225 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5226 SYN_ITEMS(curwin->w_s)[idx].sp_next_list = |
| 154 | 5227 syn_opt_arg.next_list; |
| 7 | 5228 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5229 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5230 ++idx; |
| 5231 #ifdef FEAT_FOLDING | |
| 154 | 5232 if (syn_opt_arg.flags & HL_FOLD) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5233 ++curwin->w_s->b_syn_folditems; |
| 7 | 5234 #endif |
| 5235 } | |
| 5236 } | |
| 5237 | |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
5238 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5239 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5240 success = TRUE; // don't free the progs and patterns now |
| 7 | 5241 } |
| 5242 } | |
| 5243 | |
| 5244 /* | |
| 5245 * Free the allocated memory. | |
| 5246 */ | |
| 5247 for (item = ITEM_START; item <= ITEM_END; ++item) | |
| 5248 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next) | |
| 5249 { | |
|
17907
4cf69f8d1ec6
patch 8.1.1950: using NULL pointer after an out-of-memory
Bram Moolenaar <Bram@vim.org>
parents:
17781
diff
changeset
|
5250 if (!success && ppp->pp_synp != NULL) |
| 7 | 5251 { |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5252 vim_regfree(ppp->pp_synp->sp_prog); |
| 7 | 5253 vim_free(ppp->pp_synp->sp_pattern); |
| 5254 } | |
| 5255 vim_free(ppp->pp_synp); | |
| 5256 ppp_next = ppp->pp_next; | |
| 5257 vim_free(ppp); | |
| 5258 } | |
| 5259 | |
| 5260 if (!success) | |
| 5261 { | |
| 154 | 5262 vim_free(syn_opt_arg.cont_list); |
| 5263 vim_free(syn_opt_arg.cont_in_list); | |
| 5264 vim_free(syn_opt_arg.next_list); | |
| 7 | 5265 if (not_enough) |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5266 semsg(_(e_not_enough_arguments_syntax_region_str), arg); |
| 7 | 5267 else if (illegal || rest == NULL) |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
5268 semsg(_(e_invalid_argument_str), arg); |
| 7 | 5269 } |
| 5270 } | |
| 5271 | |
| 5272 /* | |
| 5273 * A simple syntax group ID comparison function suitable for use in qsort() | |
| 5274 */ | |
| 5275 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5276 syn_compare_stub(const void *v1, const void *v2) |
| 7 | 5277 { |
| 5278 const short *s1 = v1; | |
| 5279 const short *s2 = v2; | |
| 5280 | |
| 5281 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0); | |
| 5282 } | |
| 5283 | |
| 5284 /* | |
| 5285 * Combines lists of syntax clusters. | |
| 5286 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed. | |
| 5287 */ | |
| 5288 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5289 syn_combine_list(short **clstr1, short **clstr2, int list_op) |
| 7 | 5290 { |
| 5291 int count1 = 0; | |
| 5292 int count2 = 0; | |
| 5293 short *g1; | |
| 5294 short *g2; | |
| 5295 short *clstr = NULL; | |
| 5296 int count; | |
| 5297 int round; | |
| 5298 | |
| 5299 /* | |
| 5300 * Handle degenerate cases. | |
| 5301 */ | |
| 5302 if (*clstr2 == NULL) | |
| 5303 return; | |
| 5304 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE) | |
| 5305 { | |
| 5306 if (list_op == CLUSTER_REPLACE) | |
| 5307 vim_free(*clstr1); | |
| 5308 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD) | |
| 5309 *clstr1 = *clstr2; | |
| 5310 else | |
| 5311 vim_free(*clstr2); | |
| 5312 return; | |
| 5313 } | |
| 5314 | |
| 5315 for (g1 = *clstr1; *g1; g1++) | |
| 5316 ++count1; | |
| 5317 for (g2 = *clstr2; *g2; g2++) | |
| 5318 ++count2; | |
| 5319 | |
| 5320 /* | |
| 5321 * For speed purposes, sort both lists. | |
| 5322 */ | |
| 5323 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub); | |
| 5324 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub); | |
| 5325 | |
| 5326 /* | |
| 5327 * We proceed in two passes; in round 1, we count the elements to place | |
| 5328 * in the new list, and in round 2, we allocate and populate the new | |
| 5329 * list. For speed, we use a mergesort-like method, adding the smaller | |
| 5330 * of the current elements in each list to the new list. | |
| 5331 */ | |
| 5332 for (round = 1; round <= 2; round++) | |
| 5333 { | |
| 5334 g1 = *clstr1; | |
| 5335 g2 = *clstr2; | |
| 5336 count = 0; | |
| 5337 | |
| 5338 /* | |
| 5339 * First, loop through the lists until one of them is empty. | |
| 5340 */ | |
| 5341 while (*g1 && *g2) | |
| 5342 { | |
| 5343 /* | |
| 5344 * We always want to add from the first list. | |
| 5345 */ | |
| 5346 if (*g1 < *g2) | |
| 5347 { | |
| 5348 if (round == 2) | |
| 5349 clstr[count] = *g1; | |
| 5350 count++; | |
| 5351 g1++; | |
| 5352 continue; | |
| 5353 } | |
| 5354 /* | |
| 5355 * We only want to add from the second list if we're adding the | |
| 5356 * lists. | |
| 5357 */ | |
| 5358 if (list_op == CLUSTER_ADD) | |
| 5359 { | |
| 5360 if (round == 2) | |
| 5361 clstr[count] = *g2; | |
| 5362 count++; | |
| 5363 } | |
| 5364 if (*g1 == *g2) | |
| 5365 g1++; | |
| 5366 g2++; | |
| 5367 } | |
| 5368 | |
| 5369 /* | |
| 5370 * Now add the leftovers from whichever list didn't get finished | |
| 5371 * first. As before, we only want to add from the second list if | |
| 5372 * we're adding the lists. | |
| 5373 */ | |
| 5374 for (; *g1; g1++, count++) | |
| 5375 if (round == 2) | |
| 5376 clstr[count] = *g1; | |
| 5377 if (list_op == CLUSTER_ADD) | |
| 5378 for (; *g2; g2++, count++) | |
| 5379 if (round == 2) | |
| 5380 clstr[count] = *g2; | |
| 5381 | |
| 5382 if (round == 1) | |
| 5383 { | |
| 5384 /* | |
| 5385 * If the group ended up empty, we don't need to allocate any | |
| 5386 * space for it. | |
| 5387 */ | |
| 5388 if (count == 0) | |
| 5389 { | |
| 5390 clstr = NULL; | |
| 5391 break; | |
| 5392 } | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
5393 clstr = ALLOC_MULT(short, count + 1); |
| 7 | 5394 if (clstr == NULL) |
| 5395 break; | |
| 5396 clstr[count] = 0; | |
| 5397 } | |
| 5398 } | |
| 5399 | |
| 5400 /* | |
| 5401 * Finally, put the new list in place. | |
| 5402 */ | |
| 5403 vim_free(*clstr1); | |
| 5404 vim_free(*clstr2); | |
| 5405 *clstr1 = clstr; | |
| 5406 } | |
| 5407 | |
| 5408 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5409 * Lookup a syntax cluster name and return its ID. |
| 7 | 5410 * If it is not found, 0 is returned. |
| 5411 */ | |
| 5412 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5413 syn_scl_name2id(char_u *name) |
| 7 | 5414 { |
| 5415 int i; | |
| 5416 char_u *name_u; | |
| 5417 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5418 // Avoid using stricmp() too much, it's slow on some systems |
| 7 | 5419 name_u = vim_strsave_up(name); |
| 5420 if (name_u == NULL) | |
| 5421 return 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5422 for (i = curwin->w_s->b_syn_clusters.ga_len; --i >= 0; ) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5423 if (SYN_CLSTR(curwin->w_s)[i].scl_name_u != NULL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5424 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0) |
| 7 | 5425 break; |
| 5426 vim_free(name_u); | |
| 5427 return (i < 0 ? 0 : i + SYNID_CLUSTER); | |
| 5428 } | |
| 5429 | |
| 5430 /* | |
| 5431 * Like syn_scl_name2id(), but take a pointer + length argument. | |
| 5432 */ | |
| 5433 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5434 syn_scl_namen2id(char_u *linep, int len) |
| 7 | 5435 { |
| 5436 char_u *name; | |
| 5437 int id = 0; | |
| 5438 | |
| 5439 name = vim_strnsave(linep, len); | |
| 5440 if (name != NULL) | |
| 5441 { | |
| 5442 id = syn_scl_name2id(name); | |
| 5443 vim_free(name); | |
| 5444 } | |
| 5445 return id; | |
| 5446 } | |
| 5447 | |
| 5448 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5449 * Find syntax cluster name in the table and return its ID. |
| 7 | 5450 * The argument is a pointer to the name and the length of the name. |
| 5451 * If it doesn't exist yet, a new entry is created. | |
| 5452 * Return 0 for failure. | |
| 5453 */ | |
| 5454 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5455 syn_check_cluster(char_u *pp, int len) |
| 7 | 5456 { |
| 5457 int id; | |
| 5458 char_u *name; | |
| 5459 | |
| 5460 name = vim_strnsave(pp, len); | |
| 5461 if (name == NULL) | |
| 5462 return 0; | |
| 5463 | |
| 5464 id = syn_scl_name2id(name); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5465 if (id == 0) // doesn't exist yet |
| 7 | 5466 id = syn_add_cluster(name); |
| 5467 else | |
| 5468 vim_free(name); | |
| 5469 return id; | |
| 5470 } | |
| 5471 | |
| 5472 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5473 * Add new syntax cluster and return its ID. |
| 7 | 5474 * "name" must be an allocated string, it will be consumed. |
| 5475 * Return 0 for failure. | |
| 5476 */ | |
| 5477 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5478 syn_add_cluster(char_u *name) |
| 221 | 5479 { |
| 5480 int len; | |
| 7 | 5481 |
| 5482 /* | |
| 5483 * First call for this growarray: init growing array. | |
| 5484 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5485 if (curwin->w_s->b_syn_clusters.ga_data == NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5486 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5487 curwin->w_s->b_syn_clusters.ga_itemsize = sizeof(syn_cluster_T); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5488 curwin->w_s->b_syn_clusters.ga_growsize = 10; |
| 7 | 5489 } |
| 5490 | |
| 2743 | 5491 len = curwin->w_s->b_syn_clusters.ga_len; |
| 5492 if (len >= MAX_CLUSTER_ID) | |
| 5493 { | |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
5494 emsg(_(e_too_many_syntax_clusters)); |
| 2743 | 5495 vim_free(name); |
| 5496 return 0; | |
| 5497 } | |
| 5498 | |
| 7 | 5499 /* |
| 5500 * Make room for at least one other cluster entry. | |
| 5501 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5502 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL) |
| 7 | 5503 { |
| 5504 vim_free(name); | |
| 5505 return 0; | |
| 5506 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5507 |
|
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
5508 CLEAR_POINTER(&(SYN_CLSTR(curwin->w_s)[len])); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5509 SYN_CLSTR(curwin->w_s)[len].scl_name = name; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5510 SYN_CLSTR(curwin->w_s)[len].scl_name_u = vim_strsave_up(name); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5511 SYN_CLSTR(curwin->w_s)[len].scl_list = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5512 ++curwin->w_s->b_syn_clusters.ga_len; |
| 7 | 5513 |
| 221 | 5514 if (STRICMP(name, "Spell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5515 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER; |
| 227 | 5516 if (STRICMP(name, "NoSpell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5517 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER; |
| 221 | 5518 |
| 7 | 5519 return len + SYNID_CLUSTER; |
| 5520 } | |
| 5521 | |
| 5522 /* | |
| 5523 * Handle ":syntax cluster {cluster-name} [contains={groupname},..] | |
| 5524 * [add={groupname},..] [remove={groupname},..]". | |
| 5525 */ | |
| 5526 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5527 syn_cmd_cluster(exarg_T *eap, int syncing UNUSED) |
| 7 | 5528 { |
| 5529 char_u *arg = eap->arg; | |
| 5530 char_u *group_name_end; | |
| 5531 char_u *rest; | |
| 5532 int scl_id; | |
| 5533 short *clstr_list; | |
| 5534 int got_clstr = FALSE; | |
| 5535 int opt_len; | |
| 5536 int list_op; | |
| 5537 | |
| 5538 eap->nextcmd = find_nextcmd(arg); | |
| 5539 if (eap->skip) | |
| 5540 return; | |
| 5541 | |
| 5542 rest = get_group_name(arg, &group_name_end); | |
| 5543 | |
| 5544 if (rest != NULL) | |
| 5545 { | |
| 2743 | 5546 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); |
| 5547 if (scl_id == 0) | |
| 5548 return; | |
| 5549 scl_id -= SYNID_CLUSTER; | |
| 7 | 5550 |
| 5551 for (;;) | |
| 5552 { | |
| 5553 if (STRNICMP(rest, "add", 3) == 0 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5554 && (VIM_ISWHITE(rest[3]) || rest[3] == '=')) |
| 7 | 5555 { |
| 5556 opt_len = 3; | |
| 5557 list_op = CLUSTER_ADD; | |
| 5558 } | |
| 5559 else if (STRNICMP(rest, "remove", 6) == 0 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5560 && (VIM_ISWHITE(rest[6]) || rest[6] == '=')) |
| 7 | 5561 { |
| 5562 opt_len = 6; | |
| 5563 list_op = CLUSTER_SUBTRACT; | |
| 5564 } | |
| 5565 else if (STRNICMP(rest, "contains", 8) == 0 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5566 && (VIM_ISWHITE(rest[8]) || rest[8] == '=')) |
| 7 | 5567 { |
| 5568 opt_len = 8; | |
| 5569 list_op = CLUSTER_REPLACE; | |
| 5570 } | |
| 5571 else | |
| 5572 break; | |
| 5573 | |
| 5574 clstr_list = NULL; | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5575 if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) |
| 7 | 5576 { |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
5577 semsg(_(e_invalid_argument_str), rest); |
| 7 | 5578 break; |
| 5579 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5580 if (scl_id >= 0) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5581 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list, |
| 7 | 5582 &clstr_list, list_op); |
|
10648
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
5583 else |
|
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
5584 vim_free(clstr_list); |
| 7 | 5585 got_clstr = TRUE; |
| 5586 } | |
| 5587 | |
| 5588 if (got_clstr) | |
| 5589 { | |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
5590 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5591 syn_stack_free_all(curwin->w_s); // Need to recompute all. |
| 7 | 5592 } |
| 5593 } | |
| 5594 | |
| 5595 if (!got_clstr) | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5596 emsg(_(e_no_cluster_specified)); |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5597 if (rest == NULL || !ends_excmd2(eap->cmd, rest)) |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
5598 semsg(_(e_invalid_argument_str), arg); |
| 7 | 5599 } |
| 5600 | |
| 5601 /* | |
| 5602 * On first call for current buffer: Init growing array. | |
| 5603 */ | |
| 5604 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5605 init_syn_patterns(void) |
| 7 | 5606 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5607 curwin->w_s->b_syn_patterns.ga_itemsize = sizeof(synpat_T); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5608 curwin->w_s->b_syn_patterns.ga_growsize = 10; |
| 7 | 5609 } |
| 5610 | |
| 5611 /* | |
| 5612 * Get one pattern for a ":syntax match" or ":syntax region" command. | |
| 5613 * Stores the pattern and program in a synpat_T. | |
| 5614 * Returns a pointer to the next argument, or NULL in case of an error. | |
| 5615 */ | |
| 5616 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5617 get_syn_pattern(char_u *arg, synpat_T *ci) |
| 7 | 5618 { |
| 5619 char_u *end; | |
| 5620 int *p; | |
| 5621 int idx; | |
| 5622 char_u *cpo_save; | |
| 5623 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5624 // need at least three chars |
| 6993 | 5625 if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL) |
| 7 | 5626 return NULL; |
| 5627 | |
|
19892
5feb426d2ea1
patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents:
19181
diff
changeset
|
5628 end = skip_regexp(arg + 1, *arg, TRUE); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5629 if (*end != *arg) // end delimiter not found |
| 7 | 5630 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5631 semsg(_(e_pattern_delimiter_not_found_str), arg); |
| 7 | 5632 return NULL; |
| 5633 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5634 // store the pattern and compiled regexp program |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
5635 if ((ci->sp_pattern = vim_strnsave(arg + 1, end - arg - 1)) == NULL) |
| 7 | 5636 return NULL; |
| 5637 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5638 // Make 'cpoptions' empty, to avoid the 'l' flag |
| 7 | 5639 cpo_save = p_cpo; |
|
23493
f8382c4e6551
patch 8.2.2289: Vim9: 'cpo' can become empty
Bram Moolenaar <Bram@vim.org>
parents:
23043
diff
changeset
|
5640 p_cpo = empty_option; |
| 7 | 5641 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC); |
| 5642 p_cpo = cpo_save; | |
| 5643 | |
| 5644 if (ci->sp_prog == NULL) | |
| 5645 return NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5646 ci->sp_ic = curwin->w_s->b_syn_ic; |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
5647 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5648 syn_clear_time(&ci->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5649 #endif |
| 7 | 5650 |
| 5651 /* | |
| 5652 * Check for a match, highlight or region offset. | |
| 5653 */ | |
| 5654 ++end; | |
| 5655 do | |
| 5656 { | |
| 5657 for (idx = SPO_COUNT; --idx >= 0; ) | |
| 5658 if (STRNCMP(end, spo_name_tab[idx], 3) == 0) | |
| 5659 break; | |
| 5660 if (idx >= 0) | |
| 5661 { | |
| 5662 p = &(ci->sp_offsets[idx]); | |
| 5663 if (idx != SPO_LC_OFF) | |
| 5664 switch (end[3]) | |
| 5665 { | |
| 5666 case 's': break; | |
| 5667 case 'b': break; | |
| 5668 case 'e': idx += SPO_COUNT; break; | |
| 5669 default: idx = -1; break; | |
| 5670 } | |
| 5671 if (idx >= 0) | |
| 5672 { | |
| 5673 ci->sp_off_flags |= (1 << idx); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5674 if (idx == SPO_LC_OFF) // lc=99 |
| 7 | 5675 { |
| 5676 end += 3; | |
| 5677 *p = getdigits(&end); | |
| 5678 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5679 // "lc=" offset automatically sets "ms=" offset |
| 7 | 5680 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF))) |
| 5681 { | |
| 5682 ci->sp_off_flags |= (1 << SPO_MS_OFF); | |
| 5683 ci->sp_offsets[SPO_MS_OFF] = *p; | |
| 5684 } | |
| 5685 } | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5686 else // yy=x+99 |
| 7 | 5687 { |
| 5688 end += 4; | |
| 5689 if (*end == '+') | |
| 5690 { | |
| 5691 ++end; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5692 *p = getdigits(&end); // positive offset |
| 7 | 5693 } |
| 5694 else if (*end == '-') | |
| 5695 { | |
| 5696 ++end; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5697 *p = -getdigits(&end); // negative offset |
| 7 | 5698 } |
| 5699 } | |
| 5700 if (*end != ',') | |
| 5701 break; | |
| 5702 ++end; | |
| 5703 } | |
| 5704 } | |
| 5705 } while (idx >= 0); | |
| 5706 | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5707 if (!ends_excmd2(arg, end) && !VIM_ISWHITE(*end)) |
| 7 | 5708 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5709 semsg(_(e_garbage_after_pattern_str), arg); |
| 7 | 5710 return NULL; |
| 5711 } | |
| 5712 return skipwhite(end); | |
| 5713 } | |
| 5714 | |
| 5715 /* | |
| 5716 * Handle ":syntax sync .." command. | |
| 5717 */ | |
| 5718 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5719 syn_cmd_sync(exarg_T *eap, int syncing UNUSED) |
| 7 | 5720 { |
| 5721 char_u *arg_start = eap->arg; | |
| 5722 char_u *arg_end; | |
| 5723 char_u *key = NULL; | |
| 5724 char_u *next_arg; | |
| 5725 int illegal = FALSE; | |
| 5726 int finished = FALSE; | |
| 5727 long n; | |
| 5728 char_u *cpo_save; | |
| 5729 | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5730 if (ends_excmd2(eap->cmd, arg_start)) |
| 7 | 5731 { |
| 5732 syn_cmd_list(eap, TRUE); | |
| 5733 return; | |
| 5734 } | |
| 5735 | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5736 while (!ends_excmd2(eap->cmd, arg_start)) |
| 7 | 5737 { |
| 5738 arg_end = skiptowhite(arg_start); | |
| 5739 next_arg = skipwhite(arg_end); | |
| 5740 vim_free(key); | |
|
20751
d9a2e5dcfd9f
patch 8.2.0928: many type casts are used for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20623
diff
changeset
|
5741 key = vim_strnsave_up(arg_start, arg_end - arg_start); |
|
21240
e35955a787a8
patch 8.2.1171: possible crash when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
5742 if (key == NULL) |
|
e35955a787a8
patch 8.2.1171: possible crash when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
5743 break; |
| 7 | 5744 if (STRCMP(key, "CCOMMENT") == 0) |
| 5745 { | |
| 5746 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5747 curwin->w_s->b_syn_sync_flags |= SF_CCOMMENT; |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5748 if (!ends_excmd2(eap->cmd, next_arg)) |
| 7 | 5749 { |
| 5750 arg_end = skiptowhite(next_arg); | |
| 5751 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5752 curwin->w_s->b_syn_sync_id = syn_check_group(next_arg, |
| 7 | 5753 (int)(arg_end - next_arg)); |
| 5754 next_arg = skipwhite(arg_end); | |
| 5755 } | |
| 5756 else if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5757 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment"); |
| 7 | 5758 } |
| 5759 else if ( STRNCMP(key, "LINES", 5) == 0 | |
| 5760 || STRNCMP(key, "MINLINES", 8) == 0 | |
| 5761 || STRNCMP(key, "MAXLINES", 8) == 0 | |
| 5762 || STRNCMP(key, "LINEBREAKS", 10) == 0) | |
| 5763 { | |
| 5764 if (key[4] == 'S') | |
| 5765 arg_end = key + 6; | |
| 5766 else if (key[0] == 'L') | |
| 5767 arg_end = key + 11; | |
| 5768 else | |
| 5769 arg_end = key + 9; | |
| 5770 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end)) | |
| 5771 { | |
| 5772 illegal = TRUE; | |
| 5773 break; | |
| 5774 } | |
| 5775 n = getdigits(&arg_end); | |
| 5776 if (!eap->skip) | |
| 5777 { | |
| 5778 if (key[4] == 'B') | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5779 curwin->w_s->b_syn_sync_linebreaks = n; |
| 7 | 5780 else if (key[1] == 'A') |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5781 curwin->w_s->b_syn_sync_maxlines = n; |
| 7 | 5782 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5783 curwin->w_s->b_syn_sync_minlines = n; |
| 7 | 5784 } |
| 5785 } | |
| 5786 else if (STRCMP(key, "FROMSTART") == 0) | |
| 5787 { | |
| 5788 if (!eap->skip) | |
| 5789 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5790 curwin->w_s->b_syn_sync_minlines = MAXLNUM; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5791 curwin->w_s->b_syn_sync_maxlines = 0; |
| 7 | 5792 } |
| 5793 } | |
| 5794 else if (STRCMP(key, "LINECONT") == 0) | |
| 5795 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5796 if (*next_arg == NUL) // missing pattern |
|
7504
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5797 { |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5798 illegal = TRUE; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5799 break; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5800 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5801 if (curwin->w_s->b_syn_linecont_pat != NULL) |
| 7 | 5802 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5803 emsg(_(e_syntax_sync_line_continuations_pattern_specified_twice)); |
| 7 | 5804 finished = TRUE; |
| 5805 break; | |
| 5806 } | |
|
19892
5feb426d2ea1
patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents:
19181
diff
changeset
|
5807 arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5808 if (*arg_end != *next_arg) // end delimiter not found |
| 7 | 5809 { |
| 5810 illegal = TRUE; | |
| 5811 break; | |
| 5812 } | |
| 5813 | |
| 5814 if (!eap->skip) | |
| 5815 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5816 // store the pattern and compiled regexp program |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
5817 if ((curwin->w_s->b_syn_linecont_pat = |
|
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
5818 vim_strnsave(next_arg + 1, |
|
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
5819 arg_end - next_arg - 1)) == NULL) |
| 7 | 5820 { |
| 5821 finished = TRUE; | |
| 5822 break; | |
| 5823 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5824 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic; |
| 7 | 5825 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5826 // Make 'cpoptions' empty, to avoid the 'l' flag |
| 7 | 5827 cpo_save = p_cpo; |
|
23493
f8382c4e6551
patch 8.2.2289: Vim9: 'cpo' can become empty
Bram Moolenaar <Bram@vim.org>
parents:
23043
diff
changeset
|
5828 p_cpo = empty_option; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5829 curwin->w_s->b_syn_linecont_prog = |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5830 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); |
| 7 | 5831 p_cpo = cpo_save; |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
5832 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5833 syn_clear_time(&curwin->w_s->b_syn_linecont_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5834 #endif |
| 7 | 5835 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5836 if (curwin->w_s->b_syn_linecont_prog == NULL) |
| 7 | 5837 { |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
5838 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat); |
| 7 | 5839 finished = TRUE; |
| 5840 break; | |
| 5841 } | |
| 5842 } | |
| 5843 next_arg = skipwhite(arg_end + 1); | |
| 5844 } | |
| 5845 else | |
| 5846 { | |
| 5847 eap->arg = next_arg; | |
| 5848 if (STRCMP(key, "MATCH") == 0) | |
| 5849 syn_cmd_match(eap, TRUE); | |
| 5850 else if (STRCMP(key, "REGION") == 0) | |
| 5851 syn_cmd_region(eap, TRUE); | |
| 5852 else if (STRCMP(key, "CLEAR") == 0) | |
| 5853 syn_cmd_clear(eap, TRUE); | |
| 5854 else | |
| 5855 illegal = TRUE; | |
| 5856 finished = TRUE; | |
| 5857 break; | |
| 5858 } | |
| 5859 arg_start = next_arg; | |
| 5860 } | |
| 5861 vim_free(key); | |
| 5862 if (illegal) | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5863 semsg(_(e_illegal_arguments_str), arg_start); |
| 7 | 5864 else if (!finished) |
| 5865 { | |
|
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
5866 set_nextcmd(eap, arg_start); |
|
29732
89e1d67814a9
patch 9.0.0206: redraw flags are not named specifically
Bram Moolenaar <Bram@vim.org>
parents:
29566
diff
changeset
|
5867 redraw_curbuf_later(UPD_SOME_VALID); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5868 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
| 7 | 5869 } |
| 5870 } | |
| 5871 | |
| 5872 /* | |
| 5873 * Convert a line of highlight group names into a list of group ID numbers. | |
| 5874 * "arg" should point to the "contains" or "nextgroup" keyword. | |
| 5875 * "arg" is advanced to after the last group name. | |
| 5876 * Careful: the argument is modified (NULs added). | |
| 5877 * returns FAIL for some error, OK for success. | |
| 5878 */ | |
| 5879 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5880 get_id_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5881 char_u **arg, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5882 int keylen, // length of keyword |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5883 short **list, // where to store the resulting list, if not |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5884 // NULL, the list is silently skipped! |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5885 int skip) |
| 7 | 5886 { |
| 5887 char_u *p = NULL; | |
| 5888 char_u *end; | |
| 5889 int round; | |
| 5890 int count; | |
| 5891 int total_count = 0; | |
| 5892 short *retval = NULL; | |
| 5893 char_u *name; | |
| 5894 regmatch_T regmatch; | |
| 5895 int id; | |
| 5896 int i; | |
| 5897 int failed = FALSE; | |
| 5898 | |
| 5899 /* | |
| 5900 * We parse the list twice: | |
| 5901 * round == 1: count the number of items, allocate the array. | |
| 5902 * round == 2: fill the array with the items. | |
| 5903 * In round 1 new groups may be added, causing the number of items to | |
| 5904 * grow when a regexp is used. In that case round 1 is done once again. | |
| 5905 */ | |
| 5906 for (round = 1; round <= 2; ++round) | |
| 5907 { | |
| 5908 /* | |
| 5909 * skip "contains" | |
| 5910 */ | |
| 5911 p = skipwhite(*arg + keylen); | |
| 5912 if (*p != '=') | |
| 5913 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5914 semsg(_(e_missing_equal_sign_str), *arg); |
| 7 | 5915 break; |
| 5916 } | |
| 5917 p = skipwhite(p + 1); | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5918 if (ends_excmd2(*arg, p)) |
| 7 | 5919 { |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5920 semsg(_(e_empty_argument_str), *arg); |
| 7 | 5921 break; |
| 5922 } | |
| 5923 | |
| 5924 /* | |
| 5925 * parse the arguments after "contains" | |
| 5926 */ | |
| 5927 count = 0; | |
|
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5928 while (!ends_excmd2(*arg, p)) |
| 7 | 5929 { |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5930 for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end) |
| 7 | 5931 ; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5932 name = alloc(end - p + 3); // leave room for "^$" |
| 7 | 5933 if (name == NULL) |
| 5934 { | |
| 5935 failed = TRUE; | |
| 5936 break; | |
| 5937 } | |
| 419 | 5938 vim_strncpy(name + 1, p, end - p); |
| 7 | 5939 if ( STRCMP(name + 1, "ALLBUT") == 0 |
| 5940 || STRCMP(name + 1, "ALL") == 0 | |
| 5941 || STRCMP(name + 1, "TOP") == 0 | |
| 5942 || STRCMP(name + 1, "CONTAINED") == 0) | |
| 5943 { | |
| 5944 if (TOUPPER_ASC(**arg) != 'C') | |
| 5945 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5946 semsg(_(e_str_not_allowed_here), name + 1); |
| 7 | 5947 failed = TRUE; |
| 5948 vim_free(name); | |
| 5949 break; | |
| 5950 } | |
| 5951 if (count != 0) | |
| 5952 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5953 semsg(_(e_str_must_be_first_in_contains_list), name + 1); |
| 7 | 5954 failed = TRUE; |
| 5955 vim_free(name); | |
| 5956 break; | |
| 5957 } | |
| 5958 if (name[1] == 'A') | |
|
24442
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5959 id = SYNID_ALLBUT + current_syn_inc_tag; |
| 7 | 5960 else if (name[1] == 'T') |
|
24442
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5961 { |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5962 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5963 id = curwin->w_s->b_syn_topgrp; |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5964 else |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5965 id = SYNID_TOP + current_syn_inc_tag; |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5966 } |
| 7 | 5967 else |
|
24442
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5968 id = SYNID_CONTAINED + current_syn_inc_tag; |
|
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5969 |
| 7 | 5970 } |
| 5971 else if (name[1] == '@') | |
| 5972 { | |
|
10629
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5973 if (skip) |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5974 id = -1; |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5975 else |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5976 id = syn_check_cluster(name + 2, (int)(end - p - 1)); |
| 7 | 5977 } |
| 5978 else | |
| 5979 { | |
| 5980 /* | |
| 5981 * Handle full group name. | |
| 5982 */ | |
| 5983 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL) | |
| 5984 id = syn_check_group(name + 1, (int)(end - p)); | |
| 5985 else | |
| 5986 { | |
| 5987 /* | |
| 5988 * Handle match of regexp with group names. | |
| 5989 */ | |
| 5990 *name = '^'; | |
| 5991 STRCAT(name, "$"); | |
| 5992 regmatch.regprog = vim_regcomp(name, RE_MAGIC); | |
| 5993 if (regmatch.regprog == NULL) | |
| 5994 { | |
| 5995 failed = TRUE; | |
| 5996 vim_free(name); | |
| 5997 break; | |
| 5998 } | |
| 5999 | |
| 6000 regmatch.rm_ic = TRUE; | |
| 6001 id = 0; | |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
6002 for (i = highlight_num_groups(); --i >= 0; ) |
| 7 | 6003 { |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
6004 if (vim_regexec(®match, highlight_group_name(i), |
| 7 | 6005 (colnr_T)0)) |
| 6006 { | |
| 6007 if (round == 2) | |
| 6008 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6009 // Got more items than expected; can happen |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6010 // when adding items that match: |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6011 // "contains=a.*b,axb". |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6012 // Go back to first round |
| 7 | 6013 if (count >= total_count) |
| 6014 { | |
| 6015 vim_free(retval); | |
| 6016 round = 1; | |
| 6017 } | |
| 6018 else | |
| 6019 retval[count] = i + 1; | |
| 6020 } | |
| 6021 ++count; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6022 id = -1; // remember that we found one |
| 7 | 6023 } |
| 6024 } | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
6025 vim_regfree(regmatch.regprog); |
| 7 | 6026 } |
| 6027 } | |
| 6028 vim_free(name); | |
| 6029 if (id == 0) | |
| 6030 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
6031 semsg(_(e_unknown_group_name_str), p); |
| 7 | 6032 failed = TRUE; |
| 6033 break; | |
| 6034 } | |
| 6035 if (id > 0) | |
| 6036 { | |
| 6037 if (round == 2) | |
| 6038 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6039 // Got more items than expected, go back to first round |
| 7 | 6040 if (count >= total_count) |
| 6041 { | |
| 6042 vim_free(retval); | |
| 6043 round = 1; | |
| 6044 } | |
| 6045 else | |
| 6046 retval[count] = id; | |
| 6047 } | |
| 6048 ++count; | |
| 6049 } | |
| 6050 p = skipwhite(end); | |
| 6051 if (*p != ',') | |
| 6052 break; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6053 p = skipwhite(p + 1); // skip comma in between arguments |
| 7 | 6054 } |
| 6055 if (failed) | |
| 6056 break; | |
| 6057 if (round == 1) | |
| 6058 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
6059 retval = ALLOC_MULT(short, count + 1); |
| 7 | 6060 if (retval == NULL) |
| 6061 break; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6062 retval[count] = 0; // zero means end of the list |
| 7 | 6063 total_count = count; |
| 6064 } | |
| 6065 } | |
| 6066 | |
| 6067 *arg = p; | |
| 6068 if (failed || retval == NULL) | |
| 6069 { | |
| 6070 vim_free(retval); | |
| 6071 return FAIL; | |
| 6072 } | |
| 6073 | |
| 6074 if (*list == NULL) | |
| 6075 *list = retval; | |
| 6076 else | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6077 vim_free(retval); // list already found, don't overwrite it |
| 7 | 6078 |
| 6079 return OK; | |
| 6080 } | |
| 6081 | |
| 6082 /* | |
| 6083 * Make a copy of an ID list. | |
| 6084 */ | |
| 6085 static short * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6086 copy_id_list(short *list) |
| 7 | 6087 { |
| 6088 int len; | |
| 6089 int count; | |
| 6090 short *retval; | |
| 6091 | |
| 6092 if (list == NULL) | |
| 6093 return NULL; | |
| 6094 | |
| 6095 for (count = 0; list[count]; ++count) | |
| 6096 ; | |
| 6097 len = (count + 1) * sizeof(short); | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
6098 retval = alloc(len); |
| 7 | 6099 if (retval != NULL) |
| 6100 mch_memmove(retval, list, (size_t)len); | |
| 6101 | |
| 6102 return retval; | |
| 6103 } | |
| 6104 | |
| 6105 /* | |
| 6106 * Check if syntax group "ssp" is in the ID list "list" of "cur_si". | |
| 6107 * "cur_si" can be NULL if not checking the "containedin" list. | |
| 6108 * Used to check if a syntax item is in the "contains" or "nextgroup" list of | |
| 6109 * the current item. | |
| 6110 * This function is called very often, keep it fast!! | |
| 6111 */ | |
| 6112 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6113 in_id_list( |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6114 stateitem_T *cur_si, // current item or NULL |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6115 short *list, // id list |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6116 struct sp_syn *ssp, // group id and ":syn include" tag of group |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6117 int contained) // group id is contained |
| 7 | 6118 { |
| 6119 int retval; | |
| 6120 short *scl_list; | |
| 6121 short item; | |
| 6122 short id = ssp->id; | |
| 6123 static int depth = 0; | |
| 6124 int r; | |
| 6125 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6126 // If ssp has a "containedin" list and "cur_si" is in it, return TRUE. |
| 36 | 6127 if (cur_si != NULL && ssp->cont_in_list != NULL |
| 6128 && !(cur_si->si_flags & HL_MATCH)) | |
| 7 | 6129 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6130 // Ignore transparent items without a contains argument. Double check |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6131 // that we don't go back past the first one. |
| 7 | 6132 while ((cur_si->si_flags & HL_TRANS_CONT) |
| 6133 && cur_si > (stateitem_T *)(current_state.ga_data)) | |
| 6134 --cur_si; | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6135 // cur_si->si_idx is -1 for keywords, these never contain anything. |
| 7 | 6136 if (cur_si->si_idx >= 0 && in_id_list(NULL, ssp->cont_in_list, |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6137 &(SYN_ITEMS(syn_block)[cur_si->si_idx].sp_syn), |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6138 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED)) |
| 7 | 6139 return TRUE; |
| 6140 } | |
| 6141 | |
| 6142 if (list == NULL) | |
| 6143 return FALSE; | |
| 6144 | |
| 6145 /* | |
| 6146 * If list is ID_LIST_ALL, we are in a transparent item that isn't | |
| 6147 * inside anything. Only allow not-contained groups. | |
| 6148 */ | |
| 6149 if (list == ID_LIST_ALL) | |
| 6150 return !contained; | |
| 6151 | |
| 6152 /* | |
| 6153 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the | |
| 6154 * contains list. We also require that "id" is at the same ":syn include" | |
| 6155 * level as the list. | |
| 6156 */ | |
| 6157 item = *list; | |
| 6158 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) | |
| 6159 { | |
| 6160 if (item < SYNID_TOP) | |
| 6161 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6162 // ALL or ALLBUT: accept all groups in the same file |
| 7 | 6163 if (item - SYNID_ALLBUT != ssp->inc_tag) |
| 6164 return FALSE; | |
| 6165 } | |
| 6166 else if (item < SYNID_CONTAINED) | |
| 6167 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6168 // TOP: accept all not-contained groups in the same file |
| 7 | 6169 if (item - SYNID_TOP != ssp->inc_tag || contained) |
| 6170 return FALSE; | |
| 6171 } | |
| 6172 else | |
| 6173 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6174 // CONTAINED: accept all contained groups in the same file |
| 7 | 6175 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) |
| 6176 return FALSE; | |
| 6177 } | |
| 6178 item = *++list; | |
| 6179 retval = FALSE; | |
| 6180 } | |
| 6181 else | |
| 6182 retval = TRUE; | |
| 6183 | |
| 6184 /* | |
| 6185 * Return "retval" if id is in the contains list. | |
| 6186 */ | |
| 6187 while (item != 0) | |
| 6188 { | |
| 6189 if (item == id) | |
| 6190 return retval; | |
| 6191 if (item >= SYNID_CLUSTER) | |
| 6192 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6193 scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list; |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6194 // restrict recursiveness to 30 to avoid an endless loop for a |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6195 // cluster that includes itself (indirectly) |
| 7 | 6196 if (scl_list != NULL && depth < 30) |
| 6197 { | |
| 6198 ++depth; | |
| 6199 r = in_id_list(NULL, scl_list, ssp, contained); | |
| 6200 --depth; | |
| 6201 if (r) | |
| 6202 return retval; | |
| 6203 } | |
| 6204 } | |
| 6205 item = *++list; | |
| 6206 } | |
| 6207 return !retval; | |
| 6208 } | |
| 6209 | |
| 6210 struct subcommand | |
| 6211 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6212 char *name; // subcommand name |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6213 void (*func)(exarg_T *, int); // function to call |
| 7 | 6214 }; |
| 6215 | |
| 6216 static struct subcommand subcommands[] = | |
| 6217 { | |
| 6218 {"case", syn_cmd_case}, | |
| 6219 {"clear", syn_cmd_clear}, | |
| 6220 {"cluster", syn_cmd_cluster}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6221 {"conceal", syn_cmd_conceal}, |
| 7 | 6222 {"enable", syn_cmd_enable}, |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6223 {"foldlevel", syn_cmd_foldlevel}, |
| 7 | 6224 {"include", syn_cmd_include}, |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6225 {"iskeyword", syn_cmd_iskeyword}, |
| 7 | 6226 {"keyword", syn_cmd_keyword}, |
| 6227 {"list", syn_cmd_list}, | |
| 6228 {"manual", syn_cmd_manual}, | |
| 6229 {"match", syn_cmd_match}, | |
| 6230 {"on", syn_cmd_on}, | |
| 6231 {"off", syn_cmd_off}, | |
| 6232 {"region", syn_cmd_region}, | |
| 6233 {"reset", syn_cmd_reset}, | |
| 419 | 6234 {"spell", syn_cmd_spell}, |
| 7 | 6235 {"sync", syn_cmd_sync}, |
| 6236 {"", syn_cmd_list}, | |
| 6237 {NULL, NULL} | |
| 6238 }; | |
| 6239 | |
| 6240 /* | |
| 6241 * ":syntax". | |
| 6242 * This searches the subcommands[] table for the subcommand name, and calls a | |
| 6243 * syntax_subcommand() function to do the rest. | |
| 6244 */ | |
| 6245 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6246 ex_syntax(exarg_T *eap) |
| 7 | 6247 { |
| 6248 char_u *arg = eap->arg; | |
| 6249 char_u *subcmd_end; | |
| 6250 char_u *subcmd_name; | |
| 6251 int i; | |
| 6252 | |
| 6253 syn_cmdlinep = eap->cmdlinep; | |
| 6254 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6255 // isolate subcommand name |
| 7 | 6256 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end) |
| 6257 ; | |
|
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
6258 subcmd_name = vim_strnsave(arg, subcmd_end - arg); |
| 7 | 6259 if (subcmd_name != NULL) |
| 6260 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6261 if (eap->skip) // skip error messages for all subcommands |
| 7 | 6262 ++emsg_skip; |
| 6263 for (i = 0; ; ++i) | |
| 6264 { | |
| 6265 if (subcommands[i].name == NULL) | |
| 6266 { | |
|
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
6267 semsg(_(e_invalid_syntax_subcommand_str), subcmd_name); |
| 7 | 6268 break; |
| 6269 } | |
| 6270 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0) | |
| 6271 { | |
| 6272 eap->arg = skipwhite(subcmd_end); | |
| 6273 (subcommands[i].func)(eap, FALSE); | |
| 6274 break; | |
| 6275 } | |
| 6276 } | |
| 6277 vim_free(subcmd_name); | |
| 6278 if (eap->skip) | |
| 6279 --emsg_skip; | |
| 6280 } | |
| 6281 } | |
| 6282 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6283 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6284 ex_ownsyntax(exarg_T *eap) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6285 { |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6286 char_u *old_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6287 char_u *new_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6288 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6289 if (curwin->w_s == &curwin->w_buffer->b_s) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6290 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16790
diff
changeset
|
6291 curwin->w_s = ALLOC_ONE(synblock_T); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6292 memset(curwin->w_s, 0, sizeof(synblock_T)); |
|
7030
8d513ddfe3ec
commit https://github.com/vim/vim/commit/670acbc70f371409b46b722bd9a1166e53574f42
Christian Brabandt <cb@256bit.org>
parents:
7017
diff
changeset
|
6293 hash_init(&curwin->w_s->b_keywtab); |
|
8d513ddfe3ec
commit https://github.com/vim/vim/commit/670acbc70f371409b46b722bd9a1166e53574f42
Christian Brabandt <cb@256bit.org>
parents:
7017
diff
changeset
|
6294 hash_init(&curwin->w_s->b_keywtab_ic); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6295 #ifdef FEAT_SPELL |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6296 // TODO: keep the spell checking as it was. |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6297 curwin->w_p_spell = FALSE; // No spell checking |
|
22258
a6af570dad75
patch 8.2.1678: crash when using ":set" after ":ownsyntax"
Bram Moolenaar <Bram@vim.org>
parents:
21240
diff
changeset
|
6298 // make sure option values are "empty_option" instead of NULL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6299 clear_string_option(&curwin->w_s->b_p_spc); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6300 clear_string_option(&curwin->w_s->b_p_spf); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6301 clear_string_option(&curwin->w_s->b_p_spl); |
|
22258
a6af570dad75
patch 8.2.1678: crash when using ":set" after ":ownsyntax"
Bram Moolenaar <Bram@vim.org>
parents:
21240
diff
changeset
|
6302 clear_string_option(&curwin->w_s->b_p_spo); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6303 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6304 clear_string_option(&curwin->w_s->b_syn_isk); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6305 } |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6306 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6307 // save value of b:current_syntax |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6308 old_value = get_var_value((char_u *)"b:current_syntax"); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6309 if (old_value != NULL) |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6310 old_value = vim_strsave(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6311 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6312 // Apply the "syntax" autocommand event, this finds and loads the syntax |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6313 // file. |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6314 apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6315 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6316 // move value of b:current_syntax to w:current_syntax |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6317 new_value = get_var_value((char_u *)"b:current_syntax"); |
|
2256
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6318 if (new_value != NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6319 set_internal_string_var((char_u *)"w:current_syntax", new_value); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6320 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6321 // restore value of b:current_syntax |
|
2256
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6322 if (old_value == NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6323 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6324 else |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6325 { |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6326 set_internal_string_var((char_u *)"b:current_syntax", old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6327 vim_free(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6328 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6329 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6330 |
| 7 | 6331 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6332 syntax_present(win_T *win) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6333 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6334 return (win->w_s->b_syn_patterns.ga_len != 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6335 || win->w_s->b_syn_clusters.ga_len != 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6336 || win->w_s->b_keywtab.ht_used > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6337 || win->w_s->b_keywtab_ic.ht_used > 0); |
| 7 | 6338 } |
| 6339 | |
| 6340 | |
| 6341 static enum | |
| 6342 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6343 EXP_SUBCMD, // expand ":syn" sub-commands |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6344 EXP_CASE, // expand ":syn case" arguments |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6345 EXP_SPELL, // expand ":syn spell" arguments |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6346 EXP_SYNC, // expand ":syn sync" arguments |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6347 EXP_CLUSTER // expand ":syn list @cluster" arguments |
| 7 | 6348 } expand_what; |
| 6349 | |
| 1322 | 6350 /* |
| 6351 * Reset include_link, include_default, include_none to 0. | |
| 6352 * Called when we are done expanding. | |
| 6353 */ | |
| 6354 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6355 reset_expand_highlight(void) |
| 1322 | 6356 { |
| 6357 include_link = include_default = include_none = 0; | |
| 6358 } | |
| 6359 | |
| 6360 /* | |
| 6361 * Handle command line completion for :match and :echohl command: Add "None" | |
| 6362 * as highlight group. | |
| 6363 */ | |
| 6364 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6365 set_context_in_echohl_cmd(expand_T *xp, char_u *arg) |
| 1322 | 6366 { |
| 6367 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 6368 xp->xp_pattern = arg; | |
| 6369 include_none = 1; | |
| 6370 } | |
| 7 | 6371 |
| 6372 /* | |
| 6373 * Handle command line completion for :syntax command. | |
| 6374 */ | |
| 6375 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6376 set_context_in_syntax_cmd(expand_T *xp, char_u *arg) |
| 7 | 6377 { |
| 6378 char_u *p; | |
| 6379 | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6380 // Default: expand subcommands |
| 7 | 6381 xp->xp_context = EXPAND_SYNTAX; |
| 6382 expand_what = EXP_SUBCMD; | |
| 6383 xp->xp_pattern = arg; | |
| 1322 | 6384 include_link = 0; |
| 6385 include_default = 0; | |
| 7 | 6386 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6387 // (part of) subcommand already typed |
| 7 | 6388 if (*arg != NUL) |
| 6389 { | |
| 6390 p = skiptowhite(arg); | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6391 if (*p != NUL) // past first word |
| 7 | 6392 { |
| 6393 xp->xp_pattern = skipwhite(p); | |
| 6394 if (*skiptowhite(xp->xp_pattern) != NUL) | |
| 6395 xp->xp_context = EXPAND_NOTHING; | |
| 6396 else if (STRNICMP(arg, "case", p - arg) == 0) | |
| 6397 expand_what = EXP_CASE; | |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6398 else if (STRNICMP(arg, "spell", p - arg) == 0) |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6399 expand_what = EXP_SPELL; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6400 else if (STRNICMP(arg, "sync", p - arg) == 0) |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6401 expand_what = EXP_SYNC; |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6402 else if (STRNICMP(arg, "list", p - arg) == 0) |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6403 { |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6404 p = skipwhite(p); |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6405 if (*p == '@') |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6406 expand_what = EXP_CLUSTER; |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6407 else |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6408 xp->xp_context = EXPAND_HIGHLIGHT; |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6409 } |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6410 else if (STRNICMP(arg, "keyword", p - arg) == 0 |
| 7 | 6411 || STRNICMP(arg, "region", p - arg) == 0 |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6412 || STRNICMP(arg, "match", p - arg) == 0) |
| 7 | 6413 xp->xp_context = EXPAND_HIGHLIGHT; |
| 6414 else | |
| 6415 xp->xp_context = EXPAND_NOTHING; | |
| 6416 } | |
| 6417 } | |
| 6418 } | |
| 6419 | |
| 6420 /* | |
| 6421 * Function given to ExpandGeneric() to obtain the list syntax names for | |
| 6422 * expansion. | |
| 6423 */ | |
| 6424 char_u * | |
|
29892
db0939444c96
patch 9.0.0284: using static buffer for multiple completion functions
Bram Moolenaar <Bram@vim.org>
parents:
29890
diff
changeset
|
6425 get_syntax_name(expand_T *xp, int idx) |
| 7 | 6426 { |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6427 switch (expand_what) |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6428 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6429 case EXP_SUBCMD: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6430 return (char_u *)subcommands[idx].name; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6431 case EXP_CASE: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6432 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6433 static char *case_args[] = {"match", "ignore", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6434 return (char_u *)case_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6435 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6436 case EXP_SPELL: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6437 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6438 static char *spell_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6439 {"toplevel", "notoplevel", "default", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6440 return (char_u *)spell_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6441 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6442 case EXP_SYNC: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6443 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6444 static char *sync_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6445 {"ccomment", "clear", "fromstart", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6446 "linebreaks=", "linecont", "lines=", "match", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6447 "maxlines=", "minlines=", "region", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6448 return (char_u *)sync_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6449 } |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6450 case EXP_CLUSTER: |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6451 { |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6452 if (idx < curwin->w_s->b_syn_clusters.ga_len) |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6453 { |
|
29892
db0939444c96
patch 9.0.0284: using static buffer for multiple completion functions
Bram Moolenaar <Bram@vim.org>
parents:
29890
diff
changeset
|
6454 vim_snprintf((char *)xp->xp_buf, EXPAND_BUF_LEN, "@%s", |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6455 SYN_CLSTR(curwin->w_s)[idx].scl_name); |
|
29892
db0939444c96
patch 9.0.0284: using static buffer for multiple completion functions
Bram Moolenaar <Bram@vim.org>
parents:
29890
diff
changeset
|
6456 return xp->xp_buf; |
|
29890
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6457 } |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6458 else |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6459 return NULL; |
|
80929331a836
patch 9.0.0283: cannot complete "syn list @cluster"
Bram Moolenaar <Bram@vim.org>
parents:
29732
diff
changeset
|
6460 } |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6461 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6462 return NULL; |
| 7 | 6463 } |
| 6464 | |
| 6465 | |
| 6466 /* | |
| 6467 * Function called for expression evaluation: get syntax ID at file position. | |
| 6468 */ | |
| 6469 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6470 syn_get_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6471 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6472 long lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6473 colnr_T col, |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6474 int trans, // remove transparency |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6475 int *spellp, // return: can do spell checking |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6476 int keep_state) // keep state of char at "col" |
| 7 | 6477 { |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6478 // When the position is not after the current position and in the same |
|
28475
a7556b47ff09
patch 8.2.4762: using freed memory using synstack() and synID() in WinEnter
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
6479 // line of the same window with the same buffer, need to restart parsing. |
|
a7556b47ff09
patch 8.2.4762: using freed memory using synstack() and synID() in WinEnter
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
6480 if (wp != syn_win |
|
a7556b47ff09
patch 8.2.4762: using freed memory using synstack() and synID() in WinEnter
Bram Moolenaar <Bram@vim.org>
parents:
28357
diff
changeset
|
6481 || wp->w_buffer != syn_buf |
| 7 | 6482 || lnum != current_lnum |
| 253 | 6483 || col < current_col) |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6484 syntax_start(wp, lnum); |
|
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6485 else if (wp->w_buffer == syn_buf |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6486 && lnum == current_lnum |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6487 && col > current_col) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6488 // next_match may not be correct when moving around, e.g. with the |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6489 // "skip" expression in searchpair() |
|
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6490 next_match_idx = -1; |
| 7 | 6491 |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6492 (void)get_syntax_attr(col, spellp, keep_state); |
| 7 | 6493 |
| 6494 return (trans ? current_trans_id : current_id); | |
| 6495 } | |
| 6496 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6497 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6498 /* |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6499 * Get extra information about the syntax item. Must be called right after |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6500 * get_syntax_attr(). |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
6501 * Stores the current item sequence nr in "*seqnrp". |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6502 * Returns the current flags. |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6503 */ |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6504 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6505 get_syntax_info(int *seqnrp) |
|
2392
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
6506 { |
|
0371401d9d33
Give each syntax item a sequence number, so that we know when it starts and
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
6507 *seqnrp = current_seqnr; |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6508 return current_flags; |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6509 } |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6510 |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6511 /* |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6512 * Return conceal substitution character |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6513 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6514 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6515 syn_get_sub_char(void) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6516 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6517 return current_sub_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6518 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6519 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6520 |
| 1500 | 6521 #if defined(FEAT_EVAL) || defined(PROTO) |
| 6522 /* | |
| 6523 * Return the syntax ID at position "i" in the current stack. | |
| 6524 * The caller must have called syn_get_id() before to fill the stack. | |
| 6525 * Returns -1 when "i" is out of range. | |
| 6526 */ | |
| 6527 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6528 syn_get_stack_item(int i) |
| 1500 | 6529 { |
| 1504 | 6530 if (i >= current_state.ga_len) |
| 6531 { | |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6532 // Need to invalidate the state, because we didn't properly finish it |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6533 // for the last character, "keep_state" was TRUE. |
| 1504 | 6534 invalidate_current_state(); |
| 6535 current_col = MAXCOL; | |
| 1500 | 6536 return -1; |
| 1504 | 6537 } |
| 1500 | 6538 return CUR_STATE(i).si_id; |
| 6539 } | |
| 6540 #endif | |
| 6541 | |
| 7 | 6542 #if defined(FEAT_FOLDING) || defined(PROTO) |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6543 static int |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6544 syn_cur_foldlevel(void) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6545 { |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6546 int level = 0; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6547 int i; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6548 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6549 for (i = 0; i < current_state.ga_len; ++i) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6550 if (CUR_STATE(i).si_flags & HL_FOLD) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6551 ++level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6552 return level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6553 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6554 |
| 7 | 6555 /* |
| 6556 * Function called to get folding level for line "lnum" in window "wp". | |
| 6557 */ | |
| 6558 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6559 syn_get_foldlevel(win_T *wp, long lnum) |
| 7 | 6560 { |
| 6561 int level = 0; | |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6562 int low_level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6563 int cur_level; |
| 7 | 6564 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6565 // Return quickly when there are no fold items at all. |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6566 if (wp->w_s->b_syn_folditems != 0 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6567 && !wp->w_s->b_syn_error |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6568 # ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6569 && !wp->w_s->b_syn_slow |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6570 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6571 ) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6572 { |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6573 syntax_start(wp, lnum); |
| 7 | 6574 |
|
20623
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6575 // Start with the fold level at the start of the line. |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6576 level = syn_cur_foldlevel(); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6577 |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6578 if (wp->w_s->b_syn_foldlevel == SYNFLD_MINIMUM) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6579 { |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6580 // Find the lowest fold level that is followed by a higher one. |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6581 cur_level = level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6582 low_level = cur_level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6583 while (!current_finished) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6584 { |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6585 (void)syn_current_attr(FALSE, FALSE, NULL, FALSE); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6586 cur_level = syn_cur_foldlevel(); |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6587 if (cur_level < low_level) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6588 low_level = cur_level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6589 else if (cur_level > low_level) |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6590 level = low_level; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6591 ++current_col; |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6592 } |
|
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6593 } |
| 7 | 6594 } |
| 6595 if (level > wp->w_p_fdn) | |
| 1028 | 6596 { |
| 7 | 6597 level = wp->w_p_fdn; |
| 1028 | 6598 if (level < 0) |
| 6599 level = 0; | |
| 6600 } | |
| 7 | 6601 return level; |
| 6602 } | |
| 6603 #endif | |
| 6604 | |
| 6567 | 6605 #if defined(FEAT_PROFILE) || defined(PROTO) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6606 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6607 * ":syntime". |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6608 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6609 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6610 ex_syntime(exarg_T *eap) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6611 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6612 if (STRCMP(eap->arg, "on") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6613 syn_time_on = TRUE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6614 else if (STRCMP(eap->arg, "off") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6615 syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6616 else if (STRCMP(eap->arg, "clear") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6617 syntime_clear(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6618 else if (STRCMP(eap->arg, "report") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6619 syntime_report(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6620 else |
|
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
6621 semsg(_(e_invalid_argument_str), eap->arg); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6622 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6623 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6624 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6625 syn_clear_time(syn_time_T *st) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6626 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6627 profile_zero(&st->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6628 profile_zero(&st->slowest); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6629 st->count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6630 st->match = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6631 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6632 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6633 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6634 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6635 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6636 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6637 syntime_clear(void) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6638 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6639 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6640 synpat_T *spp; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6641 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6642 if (!syntax_present(curwin)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6643 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6644 msg(_(msg_no_items)); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6645 return; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6646 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6647 for (idx = 0; idx < curwin->w_s->b_syn_patterns.ga_len; ++idx) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6648 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6649 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6650 syn_clear_time(&spp->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6651 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6652 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6653 |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6654 /* |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6655 * Function given to ExpandGeneric() to obtain the possible arguments of the |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6656 * ":syntime {on,off,clear,report}" command. |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6657 */ |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6658 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6659 get_syntime_arg(expand_T *xp UNUSED, int idx) |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6660 { |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6661 switch (idx) |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6662 { |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6663 case 0: return (char_u *)"on"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6664 case 1: return (char_u *)"off"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6665 case 2: return (char_u *)"clear"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6666 case 3: return (char_u *)"report"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6667 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6668 return NULL; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6669 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6670 |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6671 typedef struct |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6672 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6673 proftime_T total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6674 int count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6675 int match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6676 proftime_T slowest; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6677 proftime_T average; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6678 int id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6679 char_u *pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6680 } time_entry_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6681 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6682 static int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6683 syn_compare_syntime(const void *v1, const void *v2) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6684 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6685 const time_entry_T *s1 = v1; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6686 const time_entry_T *s2 = v2; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6687 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6688 return profile_cmp(&s1->total, &s2->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6689 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6690 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6691 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6692 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6693 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6694 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6695 syntime_report(void) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6696 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6697 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6698 synpat_T *spp; |
|
30310
029c59bf78f1
patch 9.0.0491: no good reason to build without the float feature
Bram Moolenaar <Bram@vim.org>
parents:
29892
diff
changeset
|
6699 # if defined(FEAT_RELTIME) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6700 proftime_T tm; |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6701 # endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6702 int len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6703 proftime_T total_total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6704 int total_count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6705 garray_T ga; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6706 time_entry_T *p; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6707 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6708 if (!syntax_present(curwin)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6709 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6710 msg(_(msg_no_items)); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6711 return; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6712 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6713 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6714 ga_init2(&ga, sizeof(time_entry_T), 50); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6715 profile_zero(&total_total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6716 for (idx = 0; idx < curwin->w_s->b_syn_patterns.ga_len; ++idx) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6717 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6718 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6719 if (spp->sp_time.count > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6720 { |
| 7009 | 6721 (void)ga_grow(&ga, 1); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6722 p = ((time_entry_T *)ga.ga_data) + ga.ga_len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6723 p->total = spp->sp_time.total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6724 profile_add(&total_total, &spp->sp_time.total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6725 p->count = spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6726 p->match = spp->sp_time.match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6727 total_count += spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6728 p->slowest = spp->sp_time.slowest; |
|
30310
029c59bf78f1
patch 9.0.0491: no good reason to build without the float feature
Bram Moolenaar <Bram@vim.org>
parents:
29892
diff
changeset
|
6729 # if defined(FEAT_RELTIME) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6730 profile_divide(&spp->sp_time.total, spp->sp_time.count, &tm); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6731 p->average = tm; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6732 # endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6733 p->id = spp->sp_syn.id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6734 p->pattern = spp->sp_pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6735 ++ga.ga_len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6736 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6737 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6738 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6739 // Sort on total time. Skip if there are no items to avoid passing NULL |
|
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6740 // pointer to qsort(). |
|
10530
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6741 if (ga.ga_len > 1) |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6742 qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(time_entry_T), |
|
4776
e4bc21965079
updated for version 7.3.1135
Bram Moolenaar <bram@vim.org>
parents:
4766
diff
changeset
|
6743 syn_compare_syntime); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6744 |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6745 msg_puts_title(_(" TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6746 msg_puts("\n"); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6747 for (idx = 0; idx < ga.ga_len && !got_int; ++idx) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6748 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6749 p = ((time_entry_T *)ga.ga_data) + idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6750 |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6751 msg_puts(profile_msg(&p->total)); |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6752 msg_puts(" "); // make sure there is always a separating space |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6753 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6754 msg_outnum(p->count); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6755 msg_puts(" "); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6756 msg_advance(20); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6757 msg_outnum(p->match); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6758 msg_puts(" "); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6759 msg_advance(26); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6760 msg_puts(profile_msg(&p->slowest)); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6761 msg_puts(" "); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6762 msg_advance(38); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6763 msg_puts(profile_msg(&p->average)); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6764 msg_puts(" "); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6765 msg_advance(50); |
|
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
6766 msg_outtrans(highlight_group_name(p->id - 1)); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6767 msg_puts(" "); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6768 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6769 msg_advance(69); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6770 if (Columns < 80) |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6771 len = 20; // will wrap anyway |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6772 else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6773 len = Columns - 70; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6774 if (len > (int)STRLEN(p->pattern)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6775 len = (int)STRLEN(p->pattern); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6776 msg_outtrans_len(p->pattern, len); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6777 msg_puts("\n"); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6778 } |
|
4791
65cef998f860
updated for version 7.3.1142
Bram Moolenaar <bram@vim.org>
parents:
4776
diff
changeset
|
6779 ga_clear(&ga); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6780 if (!got_int) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6781 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6782 msg_puts("\n"); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6783 msg_puts(profile_msg(&total_total)); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6784 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6785 msg_outnum(total_count); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6786 msg_puts("\n"); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6787 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6788 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6789 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6790 |
|
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6791 #endif // FEAT_SYN_HL |