Mercurial > vim
annotate src/syntax.c @ 29417:1d47d224a1cc v9.0.0050
patch 9.0.0050: split else-of is confusing
Commit: https://github.com/vim/vim/commit/b26592a84c8f578c8fbe83cf02ebb47453de1683
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 12 17:34:31 2022 +0100
patch 9.0.0050: split else-of is confusing
Problem: Split else-of is confusing.
Solution: Join the lines. (closes https://github.com/vim/vim/issues/10696)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 12 Jul 2022 18:45:04 +0200 |
parents | 48b36959a4fc |
children | 99e3763cbd34 |
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. |
7 | 1488 if (sp->sst_stacksize == current_state.ga_len |
1489 && sp->sst_next_list == current_next_list) | |
1490 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1491 // Need to compare all states on both stacks. |
7 | 1492 if (sp->sst_stacksize > SST_FIX_STATES) |
1493 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
1494 else | |
1495 bp = sp->sst_union.sst_stack; | |
1496 | |
1497 for (i = current_state.ga_len; --i >= 0; ) | |
1498 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1499 // If the item has another index the state is different. |
7 | 1500 if (bp[i].bs_idx != CUR_STATE(i).si_idx) |
1501 break; | |
1502 if (bp[i].bs_extmatch != CUR_STATE(i).si_extmatch) | |
1503 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1504 // When the extmatch pointers are different, the strings in |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1505 // them can still be the same. Check if the extmatch |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1506 // references are equal. |
7 | 1507 bsx = bp[i].bs_extmatch; |
1508 six = CUR_STATE(i).si_extmatch; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1509 // If one of the extmatch pointers is NULL the states are |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1510 // different. |
7 | 1511 if (bsx == NULL || six == NULL) |
1512 break; | |
1513 for (j = 0; j < NSUBEXP; ++j) | |
1514 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1515 // Check each referenced match string. They must all be |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1516 // equal. |
7 | 1517 if (bsx->matches[j] != six->matches[j]) |
1518 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1519 // If the pointer is different it can still be the |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1520 // same text. Compare the strings, ignore case when |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1521 // the start item has the sp_ic flag set. |
7 | 1522 if (bsx->matches[j] == NULL |
1523 || six->matches[j] == NULL) | |
1524 break; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1525 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic |
7 | 1526 ? MB_STRICMP(bsx->matches[j], |
1527 six->matches[j]) != 0 | |
1528 : STRCMP(bsx->matches[j], six->matches[j]) != 0) | |
1529 break; | |
1530 } | |
1531 } | |
1532 if (j != NSUBEXP) | |
1533 break; | |
1534 } | |
1535 } | |
1536 if (i < 0) | |
1537 return TRUE; | |
1538 } | |
1539 return FALSE; | |
1540 } | |
1541 | |
1542 /* | |
1543 * We stop parsing syntax above line "lnum". If the stored state at or below | |
1544 * this line depended on a change before it, it now depends on the line below | |
1545 * the last parsed line. | |
1546 * The window looks like this: | |
1547 * line which changed | |
1548 * displayed line | |
1549 * displayed line | |
1550 * lnum -> line below window | |
1551 */ | |
1552 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1553 syntax_end_parsing(linenr_T lnum) |
7 | 1554 { |
1555 synstate_T *sp; | |
1556 | |
1557 sp = syn_stack_find_entry(lnum); | |
1558 if (sp != NULL && sp->sst_lnum < lnum) | |
1559 sp = sp->sst_next; | |
1560 | |
1561 if (sp != NULL && sp->sst_change_lnum != 0) | |
1562 sp->sst_change_lnum = lnum; | |
1563 } | |
1564 | |
1565 /* | |
1566 * End of handling of the state stack. | |
1567 ****************************************/ | |
1568 | |
1569 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1570 invalidate_current_state(void) |
7 | 1571 { |
1572 clear_current_state(); | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1573 current_state.ga_itemsize = 0; // mark current_state invalid |
7 | 1574 current_next_list = NULL; |
1575 keepend_level = -1; | |
1576 } | |
1577 | |
1578 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1579 validate_current_state(void) |
7 | 1580 { |
1581 current_state.ga_itemsize = sizeof(stateitem_T); | |
1582 current_state.ga_growsize = 3; | |
1583 } | |
1584 | |
1585 /* | |
1586 * Return TRUE if the syntax at start of lnum changed since last time. | |
1587 * This will only be called just after get_syntax_attr() for the previous | |
1588 * line, to check if the next line needs to be redrawn too. | |
1589 */ | |
1590 int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1591 syntax_check_changed(linenr_T lnum) |
7 | 1592 { |
1593 int retval = TRUE; | |
1594 synstate_T *sp; | |
1595 | |
1596 /* | |
1597 * Check the state stack when: | |
1598 * - lnum is just below the previously syntaxed line. | |
1599 * - lnum is not before the lines with saved states. | |
1600 * - lnum is not past the lines with saved states. | |
1601 * - lnum is at or before the last changed line. | |
1602 */ | |
1603 if (VALID_STATE(¤t_state) && lnum == current_lnum + 1) | |
1604 { | |
1605 sp = syn_stack_find_entry(lnum); | |
1606 if (sp != NULL && sp->sst_lnum == lnum) | |
1607 { | |
1608 /* | |
1609 * finish the previous line (needed when not all of the line was | |
1610 * drawn) | |
1611 */ | |
1612 (void)syn_finish_line(FALSE); | |
1613 | |
1614 /* | |
1615 * Compare the current state with the previously saved state of | |
1616 * the line. | |
1617 */ | |
1618 if (syn_stack_equal(sp)) | |
1619 retval = FALSE; | |
1620 | |
1621 /* | |
1622 * Store the current state in b_sst_array[] for later use. | |
1623 */ | |
1624 ++current_lnum; | |
1512 | 1625 (void)store_current_state(); |
7 | 1626 } |
1627 } | |
1628 | |
1629 return retval; | |
1630 } | |
1631 | |
1632 /* | |
1633 * Finish the current line. | |
1634 * This doesn't return any attributes, it only gets the state at the end of | |
1635 * the line. It can start anywhere in the line, as long as the current state | |
1636 * is valid. | |
1637 */ | |
1638 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1639 syn_finish_line( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1640 int syncing) // called for syncing |
7 | 1641 { |
1642 stateitem_T *cur_si; | |
442 | 1643 colnr_T prev_current_col; |
7 | 1644 |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1645 while (!current_finished) |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1646 { |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1647 (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
|
1648 /* |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1649 * 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
|
1650 */ |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1651 if (syncing && current_state.ga_len) |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1652 { |
7 | 1653 /* |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1654 * Check for match with sync item. |
7 | 1655 */ |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1656 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
|
1657 if (cur_si->si_idx >= 0 |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1658 && (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
|
1659 & (HL_SYNC_HERE|HL_SYNC_THERE))) |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1660 return TRUE; |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1661 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1662 // 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
|
1663 // 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
|
1664 // past the NUL. |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1665 prev_current_col = current_col; |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1666 if (syn_getcurline()[current_col] != NUL) |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1667 ++current_col; |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1668 check_state_ends(); |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1669 current_col = prev_current_col; |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1670 } |
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1671 ++current_col; |
7 | 1672 } |
1673 return FALSE; | |
1674 } | |
1675 | |
1676 /* | |
1677 * Return highlight attributes for next character. | |
1678 * Must first call syntax_start() once for the line. | |
1679 * "col" is normally 0 for the first use in a line, and increments by one each | |
1680 * time. It's allowed to skip characters and to stop before the end of the | |
1681 * line. But only a "col" after a previously used column is allowed. | |
221 | 1682 * When "can_spell" is not NULL set it to TRUE when spell-checking should be |
1683 * done. | |
7 | 1684 */ |
1685 int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1686 get_syntax_attr( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1687 colnr_T col, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1688 int *can_spell, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1689 int keep_state) // keep state of char at "col" |
7 | 1690 { |
1691 int attr = 0; | |
1692 | |
1363 | 1693 if (can_spell != NULL) |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1694 // 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
|
1695 // ":syn spell toplevel" was used. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1696 *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
|
1697 ? (syn_block->b_spell_cluster_id == 0) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1698 : (syn_block->b_syn_spell == SYNSPL_TOP); |
1363 | 1699 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1700 // check for out of memory situation |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1701 if (syn_block->b_sst_array == NULL) |
7 | 1702 return 0; |
1703 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1704 // After 'synmaxcol' the attribute is always zero. |
431 | 1705 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc) |
419 | 1706 { |
1707 clear_current_state(); | |
1708 #ifdef FEAT_EVAL | |
1709 current_id = 0; | |
1710 current_trans_id = 0; | |
1711 #endif | |
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1712 #ifdef FEAT_CONCEAL |
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1713 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
|
1714 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
|
1715 #endif |
419 | 1716 return 0; |
1717 } | |
1718 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1719 // Make sure current_state is valid |
7 | 1720 if (INVALID_STATE(¤t_state)) |
1721 validate_current_state(); | |
1722 | |
1723 /* | |
1724 * Skip from the current column to "col", get the attributes for "col". | |
1725 */ | |
1726 while (current_col <= col) | |
1727 { | |
1504 | 1728 attr = syn_current_attr(FALSE, TRUE, can_spell, |
1729 current_col == col ? keep_state : FALSE); | |
7 | 1730 ++current_col; |
1731 } | |
1732 | |
1733 return attr; | |
1734 } | |
1735 | |
1736 /* | |
1737 * Get syntax attributes for current_lnum, current_col. | |
1738 */ | |
1739 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1740 syn_current_attr( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 int keep_state) // keep syntax stack afterwards |
7 | 1745 { |
1746 int syn_id; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1747 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
|
1748 lpos_T hl_startpos; // was: int hl_startcol; |
7 | 1749 lpos_T hl_endpos; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1750 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
|
1751 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
|
1752 int end_idx; // group ID for end pattern |
7 | 1753 int idx; |
1754 synpat_T *spp; | |
221 | 1755 stateitem_T *cur_si, *sip = NULL; |
7 | 1756 int startcol; |
1757 int endcol; | |
1758 long flags; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1759 int cchar; |
7 | 1760 short *next_list; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1761 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
|
1762 static int try_next_column = FALSE; // must try in next col |
7 | 1763 int do_keywords; |
1764 regmmatch_T regmatch; | |
1765 lpos_T pos; | |
1766 int lc_col; | |
1767 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
|
1768 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
|
1769 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
|
1770 // looking for a pattern match! |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1771 |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1772 // variables for zero-width matches that have a "nextgroup" argument |
7 | 1773 int keep_next_list; |
1774 int zero_width_next_list = FALSE; | |
1775 garray_T zero_width_next_ga; | |
1776 | |
1777 /* | |
1778 * No character, no attributes! Past end of line? | |
1779 * Do try matching with an empty line (could be the start of a region). | |
1780 */ | |
1781 line = syn_getcurline(); | |
1782 if (line[current_col] == NUL && current_col != 0) | |
1783 { | |
1784 /* | |
1785 * If we found a match after the last column, use it. | |
1786 */ | |
1787 if (next_match_idx >= 0 && next_match_col >= (int)current_col | |
1788 && next_match_col != MAXCOL) | |
1789 (void)push_next_match(NULL); | |
1790 | |
1791 current_finished = TRUE; | |
1792 current_state_stored = FALSE; | |
1793 return 0; | |
1794 } | |
1795 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1796 // if the current or next character is NUL, we will finish the line now |
7 | 1797 if (line[current_col] == NUL || line[current_col + 1] == NUL) |
1798 { | |
1799 current_finished = TRUE; | |
1800 current_state_stored = FALSE; | |
1801 } | |
1802 | |
1803 /* | |
1804 * When in the previous column there was a match but it could not be used | |
1805 * (empty match or already matched in this column) need to try again in | |
1806 * the next column. | |
1807 */ | |
1808 if (try_next_column) | |
1809 { | |
1810 next_match_idx = -1; | |
1811 try_next_column = FALSE; | |
1812 } | |
1813 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1814 // Only check for keywords when not syncing and there are some. |
7 | 1815 do_keywords = !syncing |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1816 && (syn_block->b_keywtab.ht_used > 0 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1817 || syn_block->b_keywtab_ic.ht_used > 0); |
7 | 1818 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1819 // 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
|
1820 // 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
|
1821 ga_init2(&zero_width_next_ga, sizeof(int), 10); |
7 | 1822 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1823 // use syntax iskeyword option |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1824 save_chartab(buf_chartab); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1825 |
7 | 1826 /* |
1827 * Repeat matching keywords and patterns, to find contained items at the | |
1828 * same column. This stops when there are no extra matches at the current | |
1829 * column. | |
1830 */ | |
1831 do | |
1832 { | |
1833 found_match = FALSE; | |
1834 keep_next_list = FALSE; | |
1835 syn_id = 0; | |
1836 | |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1837 |
7 | 1838 /* |
1839 * 1. Check for a current state. | |
1840 * Only when there is no current state, or if the current state may | |
1841 * contain other things, we need to check for keywords and patterns. | |
1842 * Always need to check for contained items if some item has the | |
1843 * "containedin" argument (takes extra time!). | |
1844 */ | |
1845 if (current_state.ga_len) | |
1846 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
1847 else | |
1848 cur_si = NULL; | |
1849 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1850 if (syn_block->b_syn_containedin || cur_si == NULL |
7 | 1851 || cur_si->si_cont_list != NULL) |
1852 { | |
1853 /* | |
1854 * 2. Check for keywords, if on a keyword char after a non-keyword | |
1855 * char. Don't do this when syncing. | |
1856 */ | |
1857 if (do_keywords) | |
1858 { | |
1859 line = syn_getcurline(); | |
4043 | 1860 if (vim_iswordp_buf(line + current_col, syn_buf) |
7 | 1861 && (current_col == 0 |
4043 | 1862 || !vim_iswordp_buf(line + current_col - 1 |
7 | 1863 - (has_mbyte |
1864 ? (*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
|
1865 : 0) , syn_buf))) |
7 | 1866 { |
1867 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
|
1868 &endcol, &flags, &next_list, cur_si, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1869 &cchar); |
205 | 1870 if (syn_id != 0) |
7 | 1871 { |
1872 if (push_current_state(KEYWORD_IDX) == OK) | |
1873 { | |
1874 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
1875 cur_si->si_m_startcol = current_col; | |
1876 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
|
1877 cur_si->si_h_startpos.col = 0; // starts right away |
7 | 1878 cur_si->si_m_endpos.lnum = current_lnum; |
1879 cur_si->si_m_endpos.col = endcol; | |
1880 cur_si->si_h_endpos.lnum = current_lnum; | |
1881 cur_si->si_h_endpos.col = endcol; | |
1882 cur_si->si_ends = TRUE; | |
1883 cur_si->si_end_idx = 0; | |
1884 cur_si->si_flags = flags; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1885 #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
|
1886 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
|
1887 cur_si->si_cchar = cchar; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1888 if (current_state.ga_len > 1) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1889 cur_si->si_flags |= |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1890 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
|
1891 & HL_CONCEAL; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1892 #endif |
7 | 1893 cur_si->si_id = syn_id; |
1894 cur_si->si_trans_id = syn_id; | |
1895 if (flags & HL_TRANSP) | |
1896 { | |
1897 if (current_state.ga_len < 2) | |
1898 { | |
1899 cur_si->si_attr = 0; | |
1900 cur_si->si_trans_id = 0; | |
1901 } | |
1902 else | |
1903 { | |
1904 cur_si->si_attr = CUR_STATE( | |
1905 current_state.ga_len - 2).si_attr; | |
1906 cur_si->si_trans_id = CUR_STATE( | |
1907 current_state.ga_len - 2).si_trans_id; | |
1908 } | |
1909 } | |
1910 else | |
1911 cur_si->si_attr = syn_id2attr(syn_id); | |
1912 cur_si->si_cont_list = NULL; | |
1913 cur_si->si_next_list = next_list; | |
1914 check_keepend(); | |
1915 } | |
1916 else | |
1917 vim_free(next_list); | |
1918 } | |
1919 } | |
1920 } | |
1921 | |
1922 /* | |
205 | 1923 * 3. Check for patterns (only if no keyword found). |
7 | 1924 */ |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1925 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len) |
7 | 1926 { |
1927 /* | |
1928 * If we didn't check for a match yet, or we are past it, check | |
1929 * for any match with a pattern. | |
1930 */ | |
1931 if (next_match_idx < 0 || next_match_col < (int)current_col) | |
1932 { | |
1933 /* | |
1934 * Check all relevant patterns for a match at this | |
1935 * position. This is complicated, because matching with a | |
1936 * pattern takes quite a bit of time, thus we want to | |
1937 * avoid doing it when it's not needed. | |
1938 */ | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1939 next_match_idx = 0; // no match in this line yet |
7 | 1940 next_match_col = MAXCOL; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1941 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; ) |
7 | 1942 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1943 spp = &(SYN_ITEMS(syn_block)[idx]); |
7 | 1944 if ( spp->sp_syncing == syncing |
1945 && (displaying || !(spp->sp_flags & HL_DISPLAY)) | |
1946 && (spp->sp_type == SPTYPE_MATCH | |
1947 || spp->sp_type == SPTYPE_START) | |
1948 && (current_next_list != NULL | |
1949 ? in_id_list(NULL, current_next_list, | |
1950 &spp->sp_syn, 0) | |
1951 : (cur_si == NULL | |
1952 ? !(spp->sp_flags & HL_CONTAINED) | |
1953 : in_id_list(cur_si, | |
1954 cur_si->si_cont_list, &spp->sp_syn, | |
1955 spp->sp_flags & HL_CONTAINED)))) | |
1956 { | |
6375 | 1957 int r; |
1958 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1959 // 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
|
1960 // 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
|
1961 // this item. |
7 | 1962 if (spp->sp_line_id == current_line_id |
1963 && spp->sp_startcol >= next_match_col) | |
1964 continue; | |
1965 spp->sp_line_id = current_line_id; | |
1966 | |
1967 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF]; | |
1968 if (lc_col < 0) | |
1969 lc_col = 0; | |
1970 | |
1971 regmatch.rmm_ic = spp->sp_ic; | |
1972 regmatch.regprog = spp->sp_prog; | |
6375 | 1973 r = syn_regexec(®match, |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1974 current_lnum, |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1975 (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
|
1976 IF_SYN_TIME(&spp->sp_time)); |
6375 | 1977 spp->sp_prog = regmatch.regprog; |
1978 if (!r) | |
7 | 1979 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1980 // no match in this line, try another one |
7 | 1981 spp->sp_startcol = MAXCOL; |
1982 continue; | |
1983 } | |
1984 | |
1985 /* | |
1986 * Compute the first column of the match. | |
1987 */ | |
1988 syn_add_start_off(&pos, ®match, | |
1989 spp, SPO_MS_OFF, -1); | |
1990 if (pos.lnum > current_lnum) | |
1991 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1992 // 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
|
1993 // we can't handle that |
7 | 1994 spp->sp_startcol = MAXCOL; |
1995 continue; | |
1996 } | |
1997 startcol = pos.col; | |
1998 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
1999 // 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
|
2000 // matches in the current line |
7 | 2001 spp->sp_startcol = startcol; |
2002 | |
2003 /* | |
2004 * If a previously found match starts at a lower | |
2005 * column number, don't use this one. | |
2006 */ | |
2007 if (startcol >= next_match_col) | |
2008 continue; | |
2009 | |
2010 /* | |
2011 * If we matched this pattern at this position | |
2012 * before, skip it. Must retry in the next | |
2013 * column, because it may match from there. | |
2014 */ | |
2015 if (did_match_already(idx, &zero_width_next_ga)) | |
2016 { | |
2017 try_next_column = TRUE; | |
2018 continue; | |
2019 } | |
2020 | |
2021 endpos.lnum = regmatch.endpos[0].lnum; | |
2022 endpos.col = regmatch.endpos[0].col; | |
2023 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2024 // Compute the highlight start. |
7 | 2025 syn_add_start_off(&hl_startpos, ®match, |
2026 spp, SPO_HS_OFF, -1); | |
2027 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2028 // Compute the region start. |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2029 // Default is to use the end of the match. |
7 | 2030 syn_add_end_off(&eos_pos, ®match, |
2031 spp, SPO_RS_OFF, 0); | |
2032 | |
2033 /* | |
2034 * Grab the external submatches before they get | |
2035 * overwritten. Reference count doesn't change. | |
2036 */ | |
2037 unref_extmatch(cur_extmatch); | |
2038 cur_extmatch = re_extmatch_out; | |
2039 re_extmatch_out = NULL; | |
2040 | |
2041 flags = 0; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2042 eoe_pos.lnum = 0; // avoid warning |
7 | 2043 eoe_pos.col = 0; |
2044 end_idx = 0; | |
2045 hl_endpos.lnum = 0; | |
2046 | |
2047 /* | |
2048 * For a "oneline" the end must be found in the | |
2049 * same line too. Search for it after the end of | |
2050 * the match with the start pattern. Set the | |
2051 * resulting end positions at the same time. | |
2052 */ | |
2053 if (spp->sp_type == SPTYPE_START | |
2054 && (spp->sp_flags & HL_ONELINE)) | |
2055 { | |
2056 lpos_T startpos; | |
2057 | |
2058 startpos = endpos; | |
2059 find_endpos(idx, &startpos, &endpos, &hl_endpos, | |
2060 &flags, &eoe_pos, &end_idx, cur_extmatch); | |
2061 if (endpos.lnum == 0) | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2062 continue; // not found |
7 | 2063 } |
2064 | |
2065 /* | |
2066 * For a "match" the size must be > 0 after the | |
2067 * end offset needs has been added. Except when | |
2068 * syncing. | |
2069 */ | |
2070 else if (spp->sp_type == SPTYPE_MATCH) | |
2071 { | |
2072 syn_add_end_off(&hl_endpos, ®match, spp, | |
2073 SPO_HE_OFF, 0); | |
2074 syn_add_end_off(&endpos, ®match, spp, | |
2075 SPO_ME_OFF, 0); | |
2076 if (endpos.lnum == current_lnum | |
2077 && (int)endpos.col + syncing < startcol) | |
2078 { | |
2079 /* | |
2080 * If an empty string is matched, may need | |
2081 * to try matching again at next column. | |
2082 */ | |
2083 if (regmatch.startpos[0].col | |
2084 == regmatch.endpos[0].col) | |
2085 try_next_column = TRUE; | |
2086 continue; | |
2087 } | |
2088 } | |
2089 | |
2090 /* | |
2091 * keep the best match so far in next_match_* | |
2092 */ | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2093 // 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
|
2094 // before endpos. |
7 | 2095 if (hl_startpos.lnum == current_lnum |
2096 && (int)hl_startpos.col < startcol) | |
2097 hl_startpos.col = startcol; | |
2098 limit_pos_zero(&hl_endpos, &endpos); | |
2099 | |
2100 next_match_idx = idx; | |
2101 next_match_col = startcol; | |
2102 next_match_m_endpos = endpos; | |
2103 next_match_h_endpos = hl_endpos; | |
2104 next_match_h_startpos = hl_startpos; | |
2105 next_match_flags = flags; | |
2106 next_match_eos_pos = eos_pos; | |
2107 next_match_eoe_pos = eoe_pos; | |
2108 next_match_end_idx = end_idx; | |
2109 unref_extmatch(next_match_extmatch); | |
2110 next_match_extmatch = cur_extmatch; | |
2111 cur_extmatch = NULL; | |
2112 } | |
2113 } | |
2114 } | |
2115 | |
2116 /* | |
2117 * If we found a match at the current column, use it. | |
2118 */ | |
2119 if (next_match_idx >= 0 && next_match_col == (int)current_col) | |
2120 { | |
2121 synpat_T *lspp; | |
2122 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2123 // 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
|
2124 // 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
|
2125 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
7 | 2126 if (next_match_m_endpos.lnum == current_lnum |
2127 && next_match_m_endpos.col == current_col | |
2128 && lspp->sp_next_list != NULL) | |
2129 { | |
2130 current_next_list = lspp->sp_next_list; | |
2131 current_next_flags = lspp->sp_flags; | |
2132 keep_next_list = TRUE; | |
2133 zero_width_next_list = TRUE; | |
2134 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2135 // 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
|
2136 // 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
|
2137 // endless loop). |
7 | 2138 if (ga_grow(&zero_width_next_ga, 1) == OK) |
2139 { | |
2140 ((int *)(zero_width_next_ga.ga_data)) | |
2141 [zero_width_next_ga.ga_len++] = next_match_idx; | |
2142 } | |
2143 next_match_idx = -1; | |
2144 } | |
2145 else | |
2146 cur_si = push_next_match(cur_si); | |
2147 found_match = TRUE; | |
2148 } | |
2149 } | |
2150 } | |
2151 | |
2152 /* | |
2153 * Handle searching for nextgroup match. | |
2154 */ | |
2155 if (current_next_list != NULL && !keep_next_list) | |
2156 { | |
2157 /* | |
2158 * If a nextgroup was not found, continue looking for one if: | |
2159 * - this is an empty line and the "skipempty" option was given | |
2160 * - we are on white space and the "skipwhite" option was given | |
2161 */ | |
2162 if (!found_match) | |
2163 { | |
2164 line = syn_getcurline(); | |
2165 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
|
2166 && VIM_ISWHITE(line[current_col])) |
7 | 2167 || ((current_next_flags & HL_SKIPEMPTY) |
2168 && *line == NUL)) | |
2169 break; | |
2170 } | |
2171 | |
2172 /* | |
2173 * If a nextgroup was found: Use it, and continue looking for | |
2174 * contained matches. | |
2175 * If a nextgroup was not found: Continue looking for a normal | |
2176 * match. | |
2177 * When did set current_next_list for a zero-width item and no | |
2178 * match was found don't loop (would get stuck). | |
2179 */ | |
2180 current_next_list = NULL; | |
2181 next_match_idx = -1; | |
2182 if (!zero_width_next_list) | |
2183 found_match = TRUE; | |
2184 } | |
2185 | |
2186 } while (found_match); | |
2187 | |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2188 restore_chartab(buf_chartab); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2189 |
7 | 2190 /* |
2191 * Use attributes from the current state, if within its highlighting. | |
2192 * If not, use attributes from the current-but-one state, etc. | |
2193 */ | |
2194 current_attr = 0; | |
2195 #ifdef FEAT_EVAL | |
2196 current_id = 0; | |
2197 current_trans_id = 0; | |
2198 #endif | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2199 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2200 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
|
2201 current_seqnr = 0; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2202 #endif |
7 | 2203 if (cur_si != NULL) |
2204 { | |
221 | 2205 #ifndef FEAT_EVAL |
2206 int current_trans_id = 0; | |
2207 #endif | |
7 | 2208 for (idx = current_state.ga_len - 1; idx >= 0; --idx) |
2209 { | |
2210 sip = &CUR_STATE(idx); | |
2211 if ((current_lnum > sip->si_h_startpos.lnum | |
2212 || (current_lnum == sip->si_h_startpos.lnum | |
2213 && current_col >= sip->si_h_startpos.col)) | |
2214 && (sip->si_h_endpos.lnum == 0 | |
2215 || current_lnum < sip->si_h_endpos.lnum | |
2216 || (current_lnum == sip->si_h_endpos.lnum | |
2217 && current_col < sip->si_h_endpos.col))) | |
2218 { | |
2219 current_attr = sip->si_attr; | |
2220 #ifdef FEAT_EVAL | |
2221 current_id = sip->si_id; | |
221 | 2222 #endif |
7 | 2223 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
|
2224 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2225 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
|
2226 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
|
2227 current_sub_char = sip->si_cchar; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2228 #endif |
7 | 2229 break; |
2230 } | |
2231 } | |
2232 | |
221 | 2233 if (can_spell != NULL) |
2234 { | |
2235 struct sp_syn sps; | |
2236 | |
2237 /* | |
2238 * set "can_spell" to TRUE if spell checking is supposed to be | |
2239 * done in the current item. | |
2240 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2241 if (syn_block->b_spell_cluster_id == 0) |
227 | 2242 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2243 // 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
|
2244 // @NoSpell cluster. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2245 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
|
2246 || current_trans_id == 0) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2247 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP); |
227 | 2248 else |
2249 { | |
2250 sps.inc_tag = 0; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2251 sps.id = syn_block->b_nospell_cluster_id; |
227 | 2252 sps.cont_in_list = NULL; |
2253 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0); | |
2254 } | |
2255 } | |
221 | 2256 else |
2257 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2258 // 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
|
2259 // 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
|
2260 // 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
|
2261 // was used. |
320 | 2262 if (current_trans_id == 0) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2263 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP); |
320 | 2264 else |
2265 { | |
2266 sps.inc_tag = 0; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2267 sps.id = syn_block->b_spell_cluster_id; |
320 | 2268 sps.cont_in_list = NULL; |
2269 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0); | |
2270 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2271 if (syn_block->b_nospell_cluster_id != 0) |
320 | 2272 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2273 sps.id = syn_block->b_nospell_cluster_id; |
320 | 2274 if (in_id_list(sip, sip->si_cont_list, &sps, 0)) |
2275 *can_spell = FALSE; | |
2276 } | |
2277 } | |
221 | 2278 } |
2279 } | |
2280 | |
2281 | |
7 | 2282 /* |
2283 * Check for end of current state (and the states before it) at the | |
2284 * next column. Don't do this for syncing, because we would miss a | |
2285 * single character match. | |
2286 * First check if the current state ends at the current column. It | |
2287 * may be for an empty match and a containing item might end in the | |
2288 * current column. | |
2289 */ | |
1504 | 2290 if (!syncing && !keep_state) |
7 | 2291 { |
2292 check_state_ends(); | |
442 | 2293 if (current_state.ga_len > 0 |
2294 && syn_getcurline()[current_col] != NUL) | |
7 | 2295 { |
2296 ++current_col; | |
2297 check_state_ends(); | |
2298 --current_col; | |
2299 } | |
2300 } | |
2301 } | |
221 | 2302 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
|
2303 // 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
|
2304 // ":syn spell toplevel" was used. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2305 *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
|
2306 ? (syn_block->b_spell_cluster_id == 0) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2307 : (syn_block->b_syn_spell == SYNSPL_TOP); |
7 | 2308 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2309 // nextgroup ends at end of line, unless "skipnl" or "skipempty" present |
7 | 2310 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
|
2311 && (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
|
2312 && line[current_col + 1] == NUL |
7 | 2313 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) |
2314 current_next_list = NULL; | |
2315 | |
2316 if (zero_width_next_ga.ga_len > 0) | |
2317 ga_clear(&zero_width_next_ga); | |
2318 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2319 // No longer need external matches. But keep next_match_extmatch. |
7 | 2320 unref_extmatch(re_extmatch_out); |
2321 re_extmatch_out = NULL; | |
2322 unref_extmatch(cur_extmatch); | |
2323 | |
2324 return current_attr; | |
2325 } | |
2326 | |
2327 | |
2328 /* | |
2329 * Check if we already matched pattern "idx" at the current column. | |
2330 */ | |
2331 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2332 did_match_already(int idx, garray_T *gap) |
7 | 2333 { |
2334 int i; | |
2335 | |
2336 for (i = current_state.ga_len; --i >= 0; ) | |
2337 if (CUR_STATE(i).si_m_startcol == (int)current_col | |
2338 && CUR_STATE(i).si_m_lnum == (int)current_lnum | |
2339 && CUR_STATE(i).si_idx == idx) | |
2340 return TRUE; | |
2341 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2342 // 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
|
2343 // stack, and can only be matched once anyway. |
7 | 2344 for (i = gap->ga_len; --i >= 0; ) |
2345 if (((int *)(gap->ga_data))[i] == idx) | |
2346 return TRUE; | |
2347 | |
2348 return FALSE; | |
2349 } | |
2350 | |
2351 /* | |
2352 * Push the next match onto the stack. | |
2353 */ | |
2354 static stateitem_T * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2355 push_next_match(stateitem_T *cur_si) |
7 | 2356 { |
2357 synpat_T *spp; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2358 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2359 int save_flags; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2360 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2361 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2362 spp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
7 | 2363 |
2364 /* | |
2365 * Push the item in current_state stack; | |
2366 */ | |
2367 if (push_current_state(next_match_idx) == OK) | |
2368 { | |
2369 /* | |
2370 * If it's a start-skip-end type that crosses lines, figure out how | |
2371 * much it continues in this line. Otherwise just fill in the length. | |
2372 */ | |
2373 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
2374 cur_si->si_h_startpos = next_match_h_startpos; | |
2375 cur_si->si_m_startcol = current_col; | |
2376 cur_si->si_m_lnum = current_lnum; | |
2377 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
|
2378 #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
|
2379 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
|
2380 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
|
2381 if (current_state.ga_len > 1) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2382 cur_si->si_flags |= |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2383 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
|
2384 #endif |
7 | 2385 cur_si->si_next_list = spp->sp_next_list; |
2386 cur_si->si_extmatch = ref_extmatch(next_match_extmatch); | |
2387 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE)) | |
2388 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2389 // Try to find the end pattern in the current line |
7 | 2390 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE); |
2391 check_keepend(); | |
2392 } | |
2393 else | |
2394 { | |
2395 cur_si->si_m_endpos = next_match_m_endpos; | |
2396 cur_si->si_h_endpos = next_match_h_endpos; | |
2397 cur_si->si_ends = TRUE; | |
2398 cur_si->si_flags |= next_match_flags; | |
2399 cur_si->si_eoe_pos = next_match_eoe_pos; | |
2400 cur_si->si_end_idx = next_match_end_idx; | |
2401 } | |
2402 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND)) | |
2403 keepend_level = current_state.ga_len - 1; | |
2404 check_keepend(); | |
2405 update_si_attr(current_state.ga_len - 1); | |
2406 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2407 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2408 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
|
2409 #endif |
7 | 2410 /* |
2411 * If the start pattern has another highlight group, push another item | |
2412 * on the stack for the start pattern. | |
2413 */ | |
2414 if ( spp->sp_type == SPTYPE_START | |
2415 && spp->sp_syn_match_id != 0 | |
2416 && push_current_state(next_match_idx) == OK) | |
2417 { | |
2418 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
2419 cur_si->si_h_startpos = next_match_h_startpos; | |
2420 cur_si->si_m_startcol = current_col; | |
2421 cur_si->si_m_lnum = current_lnum; | |
2422 cur_si->si_m_endpos = next_match_eos_pos; | |
2423 cur_si->si_h_endpos = next_match_eos_pos; | |
2424 cur_si->si_ends = TRUE; | |
2425 cur_si->si_end_idx = 0; | |
2426 cur_si->si_flags = HL_MATCH; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2427 #ifdef FEAT_CONCEAL |
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2428 cur_si->si_seqnr = next_seqnr++; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2429 cur_si->si_flags |= save_flags; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2430 if (cur_si->si_flags & HL_CONCEALENDS) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2431 cur_si->si_flags |= HL_CONCEAL; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2432 #endif |
7 | 2433 cur_si->si_next_list = NULL; |
2434 check_keepend(); | |
2435 update_si_attr(current_state.ga_len - 1); | |
2436 } | |
2437 } | |
2438 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2439 next_match_idx = -1; // try other match next time |
7 | 2440 |
2441 return cur_si; | |
2442 } | |
2443 | |
2444 /* | |
2445 * Check for end of current state (and the states before it). | |
2446 */ | |
2447 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2448 check_state_ends(void) |
7 | 2449 { |
2450 stateitem_T *cur_si; | |
2863 | 2451 int had_extend; |
7 | 2452 |
2453 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
2454 for (;;) | |
2455 { | |
2456 if (cur_si->si_ends | |
2457 && (cur_si->si_m_endpos.lnum < current_lnum | |
2458 || (cur_si->si_m_endpos.lnum == current_lnum | |
2459 && cur_si->si_m_endpos.col <= current_col))) | |
2460 { | |
2461 /* | |
2462 * If there is an end pattern group ID, highlight the end pattern | |
2463 * now. No need to pop the current item from the stack. | |
2464 * Only do this if the end pattern continues beyond the current | |
2465 * position. | |
2466 */ | |
2467 if (cur_si->si_end_idx | |
2468 && (cur_si->si_eoe_pos.lnum > current_lnum | |
2469 || (cur_si->si_eoe_pos.lnum == current_lnum | |
2470 && cur_si->si_eoe_pos.col > current_col))) | |
2471 { | |
2472 cur_si->si_idx = cur_si->si_end_idx; | |
2473 cur_si->si_end_idx = 0; | |
2474 cur_si->si_m_endpos = cur_si->si_eoe_pos; | |
2475 cur_si->si_h_endpos = cur_si->si_eoe_pos; | |
2476 cur_si->si_flags |= HL_MATCH; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2477 #ifdef FEAT_CONCEAL |
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2478 cur_si->si_seqnr = next_seqnr++; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2479 if (cur_si->si_flags & HL_CONCEALENDS) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2480 cur_si->si_flags |= HL_CONCEAL; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2481 #endif |
7 | 2482 update_si_attr(current_state.ga_len - 1); |
36 | 2483 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2484 // nextgroup= should not match in the end pattern |
2831 | 2485 current_next_list = NULL; |
2486 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2487 // what matches next may be different now, clear it |
36 | 2488 next_match_idx = 0; |
2489 next_match_col = MAXCOL; | |
7 | 2490 break; |
2491 } | |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2492 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2493 // 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
|
2494 // "skipempty" |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2495 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
|
2496 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
|
2497 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
|
2498 && 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
|
2499 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
|
2500 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2501 // 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
|
2502 // "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
|
2503 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
|
2504 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2505 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
|
2506 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2507 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
|
2508 break; |
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 if (had_extend && keepend_level >= 0) |
7 | 2511 { |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2512 syn_update_ends(FALSE); |
7 | 2513 if (current_state.ga_len == 0) |
2514 break; | |
28357
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2515 } |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2516 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2517 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
|
2518 |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2519 /* |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2520 * 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
|
2521 * 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
|
2522 * 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
|
2523 * 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
|
2524 * - "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
|
2525 * - 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
|
2526 * - "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
|
2527 */ |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2528 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
|
2529 && 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
|
2530 == SPTYPE_START |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2531 && !(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
|
2532 { |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2533 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
|
2534 check_keepend(); |
86b6432aa1d8
patch 8.2.4704: using "else" after return or break increases indent
Bram Moolenaar <Bram@vim.org>
parents:
28179
diff
changeset
|
2535 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
|
2536 && 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
|
2537 && 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
|
2538 break; |
7 | 2539 } |
2540 } | |
2541 else | |
2542 break; | |
2543 } | |
2544 } | |
2545 | |
2546 /* | |
2547 * Update an entry in the current_state stack for a match or region. This | |
2548 * fills in si_attr, si_next_list and si_cont_list. | |
2549 */ | |
2550 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2551 update_si_attr(int idx) |
7 | 2552 { |
2553 stateitem_T *sip = &CUR_STATE(idx); | |
2554 synpat_T *spp; | |
2555 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2556 // This should not happen... |
1371 | 2557 if (sip->si_idx < 0) |
2558 return; | |
2559 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2560 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]); |
7 | 2561 if (sip->si_flags & HL_MATCH) |
2562 sip->si_id = spp->sp_syn_match_id; | |
2563 else | |
2564 sip->si_id = spp->sp_syn.id; | |
2565 sip->si_attr = syn_id2attr(sip->si_id); | |
2566 sip->si_trans_id = sip->si_id; | |
2567 if (sip->si_flags & HL_MATCH) | |
2568 sip->si_cont_list = NULL; | |
2569 else | |
2570 sip->si_cont_list = spp->sp_cont_list; | |
2571 | |
2572 /* | |
2573 * For transparent items, take attr from outer item. | |
2574 * Also take cont_list, if there is none. | |
2575 * Don't do this for the matchgroup of a start or end pattern. | |
2576 */ | |
2577 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH)) | |
2578 { | |
2579 if (idx == 0) | |
2580 { | |
2581 sip->si_attr = 0; | |
2582 sip->si_trans_id = 0; | |
2583 if (sip->si_cont_list == NULL) | |
2584 sip->si_cont_list = ID_LIST_ALL; | |
2585 } | |
2586 else | |
2587 { | |
2588 sip->si_attr = CUR_STATE(idx - 1).si_attr; | |
2589 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id; | |
2590 if (sip->si_cont_list == NULL) | |
2591 { | |
2592 sip->si_flags |= HL_TRANS_CONT; | |
2593 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list; | |
2594 } | |
2595 } | |
2596 } | |
2597 } | |
2598 | |
2599 /* | |
2600 * Check the current stack for patterns with "keepend" flag. | |
2601 * Propagate the match-end to contained items, until a "skipend" item is found. | |
2602 */ | |
2603 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2604 check_keepend(void) |
7 | 2605 { |
2606 int i; | |
2607 lpos_T maxpos; | |
991 | 2608 lpos_T maxpos_h; |
7 | 2609 stateitem_T *sip; |
2610 | |
2611 /* | |
2612 * This check can consume a lot of time; only do it from the level where | |
2613 * there really is a keepend. | |
2614 */ | |
2615 if (keepend_level < 0) | |
2616 return; | |
2617 | |
2618 /* | |
2619 * Find the last index of an "extend" item. "keepend" items before that | |
2620 * won't do anything. If there is no "extend" item "i" will be | |
2621 * "keepend_level" and all "keepend" items will work normally. | |
2622 */ | |
2623 for (i = current_state.ga_len - 1; i > keepend_level; --i) | |
2624 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
2625 break; | |
2626 | |
2627 maxpos.lnum = 0; | |
1702 | 2628 maxpos.col = 0; |
991 | 2629 maxpos_h.lnum = 0; |
1702 | 2630 maxpos_h.col = 0; |
7 | 2631 for ( ; i < current_state.ga_len; ++i) |
2632 { | |
2633 sip = &CUR_STATE(i); | |
2634 if (maxpos.lnum != 0) | |
2635 { | |
2636 limit_pos_zero(&sip->si_m_endpos, &maxpos); | |
991 | 2637 limit_pos_zero(&sip->si_h_endpos, &maxpos_h); |
7 | 2638 limit_pos_zero(&sip->si_eoe_pos, &maxpos); |
2639 sip->si_ends = TRUE; | |
2640 } | |
991 | 2641 if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) |
2642 { | |
2643 if (maxpos.lnum == 0 | |
7 | 2644 || maxpos.lnum > sip->si_m_endpos.lnum |
2645 || (maxpos.lnum == sip->si_m_endpos.lnum | |
991 | 2646 && maxpos.col > sip->si_m_endpos.col)) |
2647 maxpos = sip->si_m_endpos; | |
2648 if (maxpos_h.lnum == 0 | |
2649 || maxpos_h.lnum > sip->si_h_endpos.lnum | |
2650 || (maxpos_h.lnum == sip->si_h_endpos.lnum | |
2651 && maxpos_h.col > sip->si_h_endpos.col)) | |
2652 maxpos_h = sip->si_h_endpos; | |
2653 } | |
7 | 2654 } |
2655 } | |
2656 | |
2657 /* | |
2658 * Update an entry in the current_state stack for a start-skip-end pattern. | |
2659 * This finds the end of the current item, if it's in the current line. | |
2660 * | |
2661 * Return the flags for the matched END. | |
2662 */ | |
2663 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2664 update_si_end( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2665 stateitem_T *sip, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2666 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
|
2667 int force) // when TRUE overrule a previous end |
7 | 2668 { |
2669 lpos_T startpos; | |
2670 lpos_T endpos; | |
2671 lpos_T hl_endpos; | |
2672 lpos_T end_endpos; | |
2673 int end_idx; | |
2674 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2675 // return quickly for a keyword |
1371 | 2676 if (sip->si_idx < 0) |
2677 return; | |
2678 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2679 // 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
|
2680 // 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
|
2681 // from a containing item. |
7 | 2682 if (!force && sip->si_m_endpos.lnum >= current_lnum) |
2683 return; | |
2684 | |
2685 /* | |
2686 * We need to find the end of the region. It may continue in the next | |
2687 * line. | |
2688 */ | |
2689 end_idx = 0; | |
2690 startpos.lnum = current_lnum; | |
2691 startpos.col = startcol; | |
2692 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos, | |
2693 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch); | |
2694 | |
2695 if (endpos.lnum == 0) | |
2696 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2697 // No end pattern matched. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2698 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) |
7 | 2699 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2700 // a "oneline" never continues in the next line |
7 | 2701 sip->si_ends = TRUE; |
2702 sip->si_m_endpos.lnum = current_lnum; | |
2703 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline()); | |
2704 } | |
2705 else | |
2706 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2707 // continues in the next line |
7 | 2708 sip->si_ends = FALSE; |
2709 sip->si_m_endpos.lnum = 0; | |
2710 } | |
2711 sip->si_h_endpos = sip->si_m_endpos; | |
2712 } | |
2713 else | |
2714 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2715 // match within this line |
7 | 2716 sip->si_m_endpos = endpos; |
2717 sip->si_h_endpos = hl_endpos; | |
2718 sip->si_eoe_pos = end_endpos; | |
2719 sip->si_ends = TRUE; | |
2720 sip->si_end_idx = end_idx; | |
2721 } | |
2722 } | |
2723 | |
2724 /* | |
2725 * Add a new state to the current state stack. | |
2726 * It is cleared and the index set to "idx". | |
2727 * Return FAIL if it's not possible (out of memory). | |
2728 */ | |
2729 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2730 push_current_state(int idx) |
7 | 2731 { |
2732 if (ga_grow(¤t_state, 1) == FAIL) | |
2733 return FAIL; | |
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
2734 CLEAR_POINTER(&CUR_STATE(current_state.ga_len)); |
7 | 2735 CUR_STATE(current_state.ga_len).si_idx = idx; |
2736 ++current_state.ga_len; | |
2737 return OK; | |
2738 } | |
2739 | |
2740 /* | |
2741 * Remove a state from the current_state stack. | |
2742 */ | |
2743 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2744 pop_current_state(void) |
7 | 2745 { |
2746 if (current_state.ga_len) | |
2747 { | |
2748 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch); | |
2749 --current_state.ga_len; | |
2750 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2751 // after the end of a pattern, try matching a keyword or pattern |
7 | 2752 next_match_idx = -1; |
2753 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2754 // if first state with "keepend" is popped, reset keepend_level |
7 | 2755 if (keepend_level >= current_state.ga_len) |
2756 keepend_level = -1; | |
2757 } | |
2758 | |
2759 /* | |
2760 * Find the end of a start/skip/end syntax region after "startpos". | |
2761 * Only checks one line. | |
2762 * Also handles a match item that continued from a previous line. | |
2763 * If not found, the syntax item continues in the next line. m_endpos->lnum | |
2764 * will be 0. | |
2765 * If found, the end of the region and the end of the highlighting is | |
2766 * computed. | |
2767 */ | |
2768 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2769 find_endpos( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2770 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
|
2771 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
|
2772 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
|
2773 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
|
2774 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
|
2775 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
|
2776 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
|
2777 reg_extmatch_T *start_ext) // submatches from the start pattern |
7 | 2778 { |
2779 colnr_T matchcol; | |
2780 synpat_T *spp, *spp_skip; | |
2781 int start_idx; | |
2782 int best_idx; | |
2783 regmmatch_T regmatch; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2784 regmmatch_T best_regmatch; // startpos/endpos of best match |
7 | 2785 lpos_T pos; |
2786 char_u *line; | |
2787 int had_match = FALSE; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2788 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
|
2789 |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2790 // just in case we are invoked for a keyword |
1371 | 2791 if (idx < 0) |
2792 return; | |
2793 | |
7 | 2794 /* |
2795 * Check for being called with a START pattern. | |
2796 * Can happen with a match that continues to the next line, because it | |
2797 * contained a region. | |
2798 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2799 spp = &(SYN_ITEMS(syn_block)[idx]); |
7 | 2800 if (spp->sp_type != SPTYPE_START) |
2801 { | |
2802 *hl_endpos = *startpos; | |
2803 return; | |
2804 } | |
2805 | |
2806 /* | |
2807 * Find the SKIP or first END pattern after the last START pattern. | |
2808 */ | |
2809 for (;;) | |
2810 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2811 spp = &(SYN_ITEMS(syn_block)[idx]); |
7 | 2812 if (spp->sp_type != SPTYPE_START) |
2813 break; | |
2814 ++idx; | |
2815 } | |
2816 | |
2817 /* | |
2818 * Lookup the SKIP pattern (if present) | |
2819 */ | |
2820 if (spp->sp_type == SPTYPE_SKIP) | |
2821 { | |
2822 spp_skip = spp; | |
2823 ++idx; | |
2824 } | |
2825 else | |
2826 spp_skip = NULL; | |
2827 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2828 // Setup external matches for syn_regexec(). |
7 | 2829 unref_extmatch(re_extmatch_in); |
2830 re_extmatch_in = ref_extmatch(start_ext); | |
2831 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2832 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
|
2833 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
|
2834 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
|
2835 |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2836 // use syntax iskeyword option |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2837 save_chartab(buf_chartab); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2838 |
7 | 2839 for (;;) |
2840 { | |
2841 /* | |
2842 * Find end pattern that matches first after "matchcol". | |
2843 */ | |
2844 best_idx = -1; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2845 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx) |
7 | 2846 { |
2847 int lc_col = matchcol; | |
6375 | 2848 int r; |
7 | 2849 |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2850 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
|
2851 if (spp->sp_type != SPTYPE_END) // past last END pattern |
7 | 2852 break; |
2853 lc_col -= spp->sp_offsets[SPO_LC_OFF]; | |
2854 if (lc_col < 0) | |
2855 lc_col = 0; | |
2856 | |
2857 regmatch.rmm_ic = spp->sp_ic; | |
2858 regmatch.regprog = spp->sp_prog; | |
6375 | 2859 r = syn_regexec(®match, startpos->lnum, lc_col, |
2860 IF_SYN_TIME(&spp->sp_time)); | |
2861 spp->sp_prog = regmatch.regprog; | |
2862 if (r) | |
7 | 2863 { |
2864 if (best_idx == -1 || regmatch.startpos[0].col | |
2865 < best_regmatch.startpos[0].col) | |
2866 { | |
2867 best_idx = idx; | |
2868 best_regmatch.startpos[0] = regmatch.startpos[0]; | |
2869 best_regmatch.endpos[0] = regmatch.endpos[0]; | |
2870 } | |
2871 } | |
2872 } | |
2873 | |
2874 /* | |
2875 * If all end patterns have been tried, and there is no match, the | |
2876 * item continues until end-of-line. | |
2877 */ | |
2878 if (best_idx == -1) | |
2879 break; | |
2880 | |
2881 /* | |
2882 * If the skip pattern matches before the end pattern, | |
2883 * continue searching after the skip pattern. | |
2884 */ | |
2885 if (spp_skip != NULL) | |
2886 { | |
2887 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF]; | |
6375 | 2888 int r; |
7 | 2889 |
2890 if (lc_col < 0) | |
2891 lc_col = 0; | |
2892 regmatch.rmm_ic = spp_skip->sp_ic; | |
2893 regmatch.regprog = spp_skip->sp_prog; | |
6375 | 2894 r = syn_regexec(®match, startpos->lnum, lc_col, |
2895 IF_SYN_TIME(&spp_skip->sp_time)); | |
2896 spp_skip->sp_prog = regmatch.regprog; | |
2897 if (r && regmatch.startpos[0].col | |
7 | 2898 <= best_regmatch.startpos[0].col) |
2899 { | |
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2900 int line_len; |
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
2901 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2902 // Add offset to skip pattern match |
7 | 2903 syn_add_end_off(&pos, ®match, spp_skip, SPO_ME_OFF, 1); |
2904 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2905 // 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
|
2906 // match with an end pattern in this line. |
7 | 2907 if (pos.lnum > startpos->lnum) |
2908 break; | |
2909 | |
2910 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
|
2911 line_len = (int)STRLEN(line); |
7 | 2912 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2913 // take care of an empty match or negative offset |
7 | 2914 if (pos.col <= matchcol) |
2915 ++matchcol; | |
2916 else if (pos.col <= regmatch.endpos[0].col) | |
2917 matchcol = pos.col; | |
2918 else | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2919 // Be careful not to jump over the NUL at the end-of-line |
7 | 2920 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
|
2921 matchcol < line_len && matchcol < pos.col; |
7 | 2922 ++matchcol) |
2923 ; | |
2924 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2925 // 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
|
2926 if (matchcol >= line_len) |
7 | 2927 break; |
2928 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2929 continue; // start with first end pattern again |
7 | 2930 } |
2931 } | |
2932 | |
2933 /* | |
2934 * Match from start pattern to end pattern. | |
2935 * Correct for match and highlight offset of end pattern. | |
2936 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2937 spp = &(SYN_ITEMS(syn_block)[best_idx]); |
7 | 2938 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
|
2939 // can't end before the start |
7 | 2940 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col) |
2941 m_endpos->col = startpos->col; | |
2942 | |
2943 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
|
2944 // can't end before the start |
7 | 2945 if (end_endpos->lnum == startpos->lnum |
2946 && end_endpos->col < startpos->col) | |
2947 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
|
2948 // can't end after the match |
7 | 2949 limit_pos(end_endpos, m_endpos); |
2950 | |
2951 /* | |
2952 * If the end group is highlighted differently, adjust the pointers. | |
2953 */ | |
2954 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0) | |
2955 { | |
2956 *end_idx = best_idx; | |
2957 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT))) | |
2958 { | |
2959 hl_endpos->lnum = best_regmatch.endpos[0].lnum; | |
2960 hl_endpos->col = best_regmatch.endpos[0].col; | |
2961 } | |
2962 else | |
2963 { | |
2964 hl_endpos->lnum = best_regmatch.startpos[0].lnum; | |
2965 hl_endpos->col = best_regmatch.startpos[0].col; | |
2966 } | |
2967 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF]; | |
2968 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2969 // can't end before the start |
7 | 2970 if (hl_endpos->lnum == startpos->lnum |
2971 && hl_endpos->col < startpos->col) | |
2972 hl_endpos->col = startpos->col; | |
2973 limit_pos(hl_endpos, m_endpos); | |
2974 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2975 // 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
|
2976 // into the matchgroup for the end |
7 | 2977 *m_endpos = *hl_endpos; |
2978 } | |
2979 else | |
2980 { | |
2981 *end_idx = 0; | |
2982 *hl_endpos = *end_endpos; | |
2983 } | |
2984 | |
2985 *flagsp = spp->sp_flags; | |
2986 | |
2987 had_match = TRUE; | |
2988 break; | |
2989 } | |
2990 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2991 // no match for an END pattern in this line |
7 | 2992 if (!had_match) |
2993 m_endpos->lnum = 0; | |
2994 | |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2995 restore_chartab(buf_chartab); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2996 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
2997 // Remove external matches. |
7 | 2998 unref_extmatch(re_extmatch_in); |
2999 re_extmatch_in = NULL; | |
3000 } | |
3001 | |
3002 /* | |
3003 * Limit "pos" not to be after "limit". | |
3004 */ | |
3005 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3006 limit_pos(lpos_T *pos, lpos_T *limit) |
7 | 3007 { |
3008 if (pos->lnum > limit->lnum) | |
3009 *pos = *limit; | |
3010 else if (pos->lnum == limit->lnum && pos->col > limit->col) | |
3011 pos->col = limit->col; | |
3012 } | |
3013 | |
3014 /* | |
3015 * Limit "pos" not to be after "limit", unless pos->lnum is zero. | |
3016 */ | |
3017 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3018 limit_pos_zero( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3019 lpos_T *pos, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3020 lpos_T *limit) |
7 | 3021 { |
3022 if (pos->lnum == 0) | |
3023 *pos = *limit; | |
3024 else | |
3025 limit_pos(pos, limit); | |
3026 } | |
3027 | |
3028 /* | |
3029 * Add offset to matched text for end of match or highlight. | |
3030 */ | |
3031 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3032 syn_add_end_off( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3033 lpos_T *result, // returned position |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3034 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
|
3035 synpat_T *spp, // matched pattern |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3036 int idx, // index of offset |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3037 int extra) // extra chars for offset to start |
7 | 3038 { |
3039 int col; | |
1624 | 3040 int off; |
3041 char_u *base; | |
3042 char_u *p; | |
7 | 3043 |
3044 if (spp->sp_off_flags & (1 << idx)) | |
3045 { | |
3046 result->lnum = regmatch->startpos[0].lnum; | |
1624 | 3047 col = regmatch->startpos[0].col; |
3048 off = spp->sp_offsets[idx] + extra; | |
7 | 3049 } |
3050 else | |
3051 { | |
3052 result->lnum = regmatch->endpos[0].lnum; | |
3053 col = regmatch->endpos[0].col; | |
1624 | 3054 off = spp->sp_offsets[idx]; |
3055 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3056 // 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
|
3057 // is a matchgroup. Watch out for match with last NL in the buffer. |
1624 | 3058 if (result->lnum > syn_buf->b_ml.ml_line_count) |
3059 col = 0; | |
3060 else if (off != 0) | |
3061 { | |
3062 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
3063 p = base + col; | |
3064 if (off > 0) | |
3065 { | |
3066 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
|
3067 MB_PTR_ADV(p); |
1624 | 3068 } |
3069 else if (off < 0) | |
3070 { | |
3071 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
|
3072 MB_PTR_BACK(base, p); |
1624 | 3073 } |
3074 col = (int)(p - base); | |
3075 } | |
3076 result->col = col; | |
7 | 3077 } |
3078 | |
3079 /* | |
3080 * Add offset to matched text for start of match or highlight. | |
3081 * Avoid resulting column to become negative. | |
3082 */ | |
3083 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3084 syn_add_start_off( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3085 lpos_T *result, // returned position |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3086 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
|
3087 synpat_T *spp, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3088 int idx, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3089 int extra) // extra chars for offset to end |
7 | 3090 { |
3091 int col; | |
1624 | 3092 int off; |
3093 char_u *base; | |
3094 char_u *p; | |
7 | 3095 |
3096 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT))) | |
3097 { | |
3098 result->lnum = regmatch->endpos[0].lnum; | |
1624 | 3099 col = regmatch->endpos[0].col; |
3100 off = spp->sp_offsets[idx] + extra; | |
7 | 3101 } |
3102 else | |
3103 { | |
3104 result->lnum = regmatch->startpos[0].lnum; | |
3105 col = regmatch->startpos[0].col; | |
1624 | 3106 off = spp->sp_offsets[idx]; |
3107 } | |
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3108 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
|
3109 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3110 // 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
|
3111 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
|
3112 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
|
3113 } |
1624 | 3114 if (off != 0) |
3115 { | |
3116 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
3117 p = base + col; | |
3118 if (off > 0) | |
3119 { | |
3120 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
|
3121 MB_PTR_ADV(p); |
1624 | 3122 } |
3123 else if (off < 0) | |
3124 { | |
3125 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
|
3126 MB_PTR_BACK(base, p); |
1624 | 3127 } |
3128 col = (int)(p - base); | |
3129 } | |
3130 result->col = col; | |
7 | 3131 } |
3132 | |
3133 /* | |
3134 * Get current line in syntax buffer. | |
3135 */ | |
3136 static char_u * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3137 syn_getcurline(void) |
7 | 3138 { |
3139 return ml_get_buf(syn_buf, current_lnum, FALSE); | |
3140 } | |
3141 | |
3142 /* | |
410 | 3143 * Call vim_regexec() to find a match with "rmp" in "syn_buf". |
7 | 3144 * Returns TRUE when there is a match. |
3145 */ | |
3146 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3147 syn_regexec( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3148 regmmatch_T *rmp, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3149 linenr_T lnum, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3150 colnr_T col, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3151 syn_time_T *st UNUSED) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3152 { |
29218
48b36959a4fc
patch 8.2.5128: syntax disabled when using synID() in searchpair() skip expr
Bram Moolenaar <Bram@vim.org>
parents:
29071
diff
changeset
|
3153 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
|
3154 int timed_out = FALSE; |
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3155 #ifdef FEAT_PROFILE |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3156 proftime_T pt; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3157 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3158 if (syn_time_on) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3159 profile_start(&pt); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3160 #endif |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3161 |
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3162 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
|
3163 // 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
|
3164 // 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
|
3165 // 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
|
3166 return FALSE; |
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
13976
diff
changeset
|
3167 |
410 | 3168 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
|
3169 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
|
3170 |
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3171 #ifdef FEAT_PROFILE |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3172 if (syn_time_on) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3173 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3174 profile_end(&pt); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3175 profile_add(&st->total, &pt); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3176 if (profile_cmp(&pt, &st->slowest) < 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3177 st->slowest = pt; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3178 ++st->count; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3179 if (r > 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3180 ++st->match; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3181 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3182 #endif |
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3183 #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
|
3184 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
|
3185 { |
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3186 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
|
3187 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
|
3188 } |
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3189 #endif |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3190 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3191 if (r > 0) |
7 | 3192 { |
3193 rmp->startpos[0].lnum += lnum; | |
3194 rmp->endpos[0].lnum += lnum; | |
3195 return TRUE; | |
3196 } | |
3197 return FALSE; | |
3198 } | |
3199 | |
3200 /* | |
3201 * Check one position in a line for a matching keyword. | |
3202 * 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
|
3203 * Return its ID if found, 0 otherwise. |
7 | 3204 */ |
3205 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3206 check_keyword_id( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3207 char_u *line, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3208 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
|
3209 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
|
3210 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
|
3211 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
|
3212 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
|
3213 int *ccharp UNUSED) // conceal substitution char |
7 | 3214 { |
134 | 3215 keyentry_T *kp; |
3216 char_u *kwp; | |
7 | 3217 int round; |
134 | 3218 int kwlen; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3219 char_u keyword[MAXKEYWLEN + 1]; // assume max. keyword len is 80 |
134 | 3220 hashtab_T *ht; |
3221 hashitem_T *hi; | |
7 | 3222 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3223 // 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
|
3224 // checked. |
134 | 3225 kwp = line + startcol; |
3226 kwlen = 0; | |
7 | 3227 do |
3228 { | |
3229 if (has_mbyte) | |
474 | 3230 kwlen += (*mb_ptr2len)(kwp + kwlen); |
7 | 3231 else |
134 | 3232 ++kwlen; |
3233 } | |
4043 | 3234 while (vim_iswordp_buf(kwp + kwlen, syn_buf)); |
134 | 3235 |
3236 if (kwlen > MAXKEYWLEN) | |
7 | 3237 return 0; |
3238 | |
3239 /* | |
3240 * Must make a copy of the keyword, so we can add a NUL and make it | |
3241 * lowercase. | |
3242 */ | |
419 | 3243 vim_strncpy(keyword, kwp, kwlen); |
7 | 3244 |
3245 /* | |
3246 * Try twice: | |
3247 * 1. matching case | |
3248 * 2. ignoring case | |
3249 */ | |
3250 for (round = 1; round <= 2; ++round) | |
3251 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3252 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic; |
134 | 3253 if (ht->ht_used == 0) |
7 | 3254 continue; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3255 if (round == 2) // ignore case |
134 | 3256 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1); |
7 | 3257 |
3258 /* | |
134 | 3259 * Find keywords that match. There can be several with different |
3260 * attributes. | |
7 | 3261 * When current_next_list is non-zero accept only that group, otherwise: |
3262 * Accept a not-contained keyword at toplevel. | |
3263 * Accept a keyword at other levels only if it is in the contains list. | |
3264 */ | |
134 | 3265 hi = hash_find(ht, keyword); |
3266 if (!HASHITEM_EMPTY(hi)) | |
3267 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next) | |
7 | 3268 { |
134 | 3269 if (current_next_list != 0 |
3270 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0) | |
3271 : (cur_si == NULL | |
3272 ? !(kp->flags & HL_CONTAINED) | |
3273 : in_id_list(cur_si, cur_si->si_cont_list, | |
3274 &kp->k_syn, kp->flags & HL_CONTAINED))) | |
3275 { | |
3276 *endcolp = startcol + kwlen; | |
3277 *flagsp = kp->flags; | |
3278 *next_listp = kp->next_list; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3279 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3280 *ccharp = kp->k_char; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3281 #endif |
134 | 3282 return kp->k_syn.id; |
3283 } | |
7 | 3284 } |
3285 } | |
3286 return 0; | |
3287 } | |
3288 | |
3289 /* | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3290 * Handle ":syntax conceal" command. |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3291 */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3292 static void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3293 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
|
3294 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3295 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3296 char_u *arg = eap->arg; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3297 char_u *next; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3298 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3299 eap->nextcmd = find_nextcmd(arg); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3300 if (eap->skip) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3301 return; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3302 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3303 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
|
3304 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
|
3305 { |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3306 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
|
3307 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
|
3308 else |
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3309 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
|
3310 } |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3311 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
|
3312 curwin->w_s->b_syn_conceal = TRUE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3313 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
|
3314 curwin->w_s->b_syn_conceal = FALSE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3315 else |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3316 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
|
3317 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3318 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3319 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3320 /* |
7 | 3321 * Handle ":syntax case" command. |
3322 */ | |
3323 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3324 syn_cmd_case(exarg_T *eap, int syncing UNUSED) |
7 | 3325 { |
3326 char_u *arg = eap->arg; | |
3327 char_u *next; | |
3328 | |
3329 eap->nextcmd = find_nextcmd(arg); | |
3330 if (eap->skip) | |
3331 return; | |
3332 | |
3333 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
|
3334 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
|
3335 { |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3336 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
|
3337 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
|
3338 else |
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3339 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
|
3340 } |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3341 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
|
3342 curwin->w_s->b_syn_ic = FALSE; |
7 | 3343 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
|
3344 curwin->w_s->b_syn_ic = TRUE; |
7 | 3345 else |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3346 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
|
3347 } |
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 /* |
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 * 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
|
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 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
|
3353 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
|
3354 { |
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 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
|
3356 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
|
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 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
|
3359 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
|
3360 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
|
3361 |
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 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
|
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 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
|
3365 { |
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3366 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
|
3367 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
|
3368 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
|
3369 } |
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 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
|
3371 } |
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 |
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 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
|
3374 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
|
3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3380 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
|
3381 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
|
3382 } |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3383 |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
3384 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
|
3385 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
|
3386 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3387 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
|
3388 } |
7 | 3389 } |
3390 | |
3391 /* | |
419 | 3392 * Handle ":syntax spell" command. |
3393 */ | |
3394 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3395 syn_cmd_spell(exarg_T *eap, int syncing UNUSED) |
419 | 3396 { |
3397 char_u *arg = eap->arg; | |
3398 char_u *next; | |
3399 | |
3400 eap->nextcmd = find_nextcmd(arg); | |
3401 if (eap->skip) | |
3402 return; | |
3403 | |
3404 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
|
3405 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
|
3406 { |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3407 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
|
3408 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
|
3409 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
|
3410 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
|
3411 else |
27553
0ea5147a95f7
patch 8.2.4303: a few messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27028
diff
changeset
|
3412 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
|
3413 } |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3414 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
|
3415 curwin->w_s->b_syn_spell = SYNSPL_TOP; |
419 | 3416 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
|
3417 curwin->w_s->b_syn_spell = SYNSPL_NOTOP; |
1064 | 3418 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
|
3419 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT; |
419 | 3420 else |
6880 | 3421 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3422 semsg(_(e_illegal_argument_str_2), arg); |
6880 | 3423 return; |
3424 } | |
3425 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3426 // assume spell checking changed, force a redraw |
6880 | 3427 redraw_win_later(curwin, NOT_VALID); |
419 | 3428 } |
3429 | |
3430 /* | |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3431 * Handle ":syntax iskeyword" command. |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3432 */ |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3433 static void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3434 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
|
3435 { |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3436 char_u *arg = eap->arg; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3437 char_u save_chartab[32]; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3438 char_u *save_isk; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3439 |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3440 if (eap->skip) |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3441 return; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3442 |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3443 arg = skipwhite(arg); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3444 if (*arg == NUL) |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3445 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3446 msg_puts("\n"); |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3447 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
|
3448 { |
27561
c796016c6204
patch 8.2.4307: a few more messages should not be translated
Bram Moolenaar <Bram@vim.org>
parents:
27553
diff
changeset
|
3449 msg_puts("syntax iskeyword "); |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3450 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
|
3451 } |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3452 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
|
3453 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
|
3454 } |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3455 else |
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 if (STRNICMP(arg, "clear", 5) == 0) |
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(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
|
3460 (size_t)32); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3461 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
|
3462 } |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3463 else |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3464 { |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3465 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
|
3466 save_isk = curbuf->b_p_isk; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3467 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
|
3468 |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3469 buf_init_chartab(curbuf, FALSE); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3470 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
|
3471 (size_t)32); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3472 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
|
3473 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
|
3474 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
|
3475 curbuf->b_p_isk = save_isk; |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3476 } |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3477 } |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3478 redraw_win_later(curwin, NOT_VALID); |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3479 } |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3480 |
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3481 /* |
7 | 3482 * Clear all syntax info for one buffer. |
3483 */ | |
3484 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3485 syntax_clear(synblock_T *block) |
7 | 3486 { |
3487 int i; | |
3488 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3489 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
|
3490 #ifdef FEAT_RELTIME |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3491 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
|
3492 #endif |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3493 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
|
3494 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
|
3495 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
|
3496 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
|
3497 #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
|
3498 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
|
3499 #endif |
7 | 3500 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3501 // free the keywords |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3502 clear_keywtab(&block->b_keywtab); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3503 clear_keywtab(&block->b_keywtab_ic); |
7 | 3504 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3505 // free the syntax patterns |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3506 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
|
3507 syn_clear_pattern(block, i); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3508 ga_clear(&block->b_syn_patterns); |
7 | 3509 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3510 // free the syntax clusters |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3511 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
|
3512 syn_clear_cluster(block, i); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3513 ga_clear(&block->b_syn_clusters); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3514 block->b_spell_cluster_id = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3515 block->b_nospell_cluster_id = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3516 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3517 block->b_syn_sync_flags = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3518 block->b_syn_sync_minlines = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3519 block->b_syn_sync_maxlines = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3520 block->b_syn_sync_linebreaks = 0; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3521 |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3522 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
|
3523 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
|
3524 VIM_CLEAR(block->b_syn_linecont_pat); |
7 | 3525 #ifdef FEAT_FOLDING |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3526 block->b_syn_folditems = 0; |
7 | 3527 #endif |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3528 clear_string_option(&block->b_syn_isk); |
7 | 3529 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3530 // free the stored states |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3531 syn_stack_free_all(block); |
7 | 3532 invalidate_current_state(); |
2743 | 3533 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3534 // Reset the counter for ":syn include" |
2743 | 3535 running_syn_inc_tag = 0; |
7 | 3536 } |
3537 | |
3538 /* | |
2253
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3539 * 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
|
3540 */ |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3541 void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3542 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
|
3543 { |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3544 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
|
3545 { |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3546 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
|
3547 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
|
3548 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
|
3549 } |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3550 } |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3551 |
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3552 /* |
7 | 3553 * Clear syncing info for one buffer. |
3554 */ | |
3555 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3556 syntax_sync_clear(void) |
7 | 3557 { |
3558 int i; | |
3559 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3560 // free the syntax patterns |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3561 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
|
3562 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
|
3563 syn_remove_pattern(curwin->w_s, i); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3564 |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3565 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
|
3566 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
|
3567 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
|
3568 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
|
3569 |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3570 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
|
3571 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
|
3572 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
|
3573 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
|
3574 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3575 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
7 | 3576 } |
3577 | |
3578 /* | |
3579 * Remove one pattern from the buffer's pattern list. | |
3580 */ | |
3581 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3582 syn_remove_pattern( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3583 synblock_T *block, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3584 int idx) |
7 | 3585 { |
3586 synpat_T *spp; | |
3587 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3588 spp = &(SYN_ITEMS(block)[idx]); |
7 | 3589 #ifdef FEAT_FOLDING |
3590 if (spp->sp_flags & HL_FOLD) | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3591 --block->b_syn_folditems; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3592 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3593 syn_clear_pattern(block, idx); |
7 | 3594 mch_memmove(spp, spp + 1, |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3595 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
|
3596 --block->b_syn_patterns.ga_len; |
7 | 3597 } |
3598 | |
3599 /* | |
3600 * Clear and free one syntax pattern. When clearing all, must be called from | |
3601 * last to first! | |
3602 */ | |
3603 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3604 syn_clear_pattern(synblock_T *block, int i) |
7 | 3605 { |
2250
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_pattern); |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3607 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
|
3608 // 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
|
3609 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
|
3610 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3611 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
|
3612 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
|
3613 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list); |
7 | 3614 } |
3615 } | |
3616 | |
3617 /* | |
3618 * Clear and free one syntax cluster. | |
3619 */ | |
3620 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3621 syn_clear_cluster(synblock_T *block, int i) |
7 | 3622 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3623 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
|
3624 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
|
3625 vim_free(SYN_CLSTR(block)[i].scl_list); |
7 | 3626 } |
3627 | |
3628 /* | |
3629 * Handle ":syntax clear" command. | |
3630 */ | |
3631 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3632 syn_cmd_clear(exarg_T *eap, int syncing) |
7 | 3633 { |
3634 char_u *arg = eap->arg; | |
3635 char_u *arg_end; | |
3636 int id; | |
3637 | |
3638 eap->nextcmd = find_nextcmd(arg); | |
3639 if (eap->skip) | |
3640 return; | |
3641 | |
3642 /* | |
3643 * We have to disable this within ":syn include @group filename", | |
3644 * because otherwise @group would get deleted. | |
3645 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn | |
3646 * clear". | |
3647 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3648 if (curwin->w_s->b_syn_topgrp != 0) |
7 | 3649 return; |
3650 | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3651 if (ends_excmd2(eap->cmd, arg)) |
7 | 3652 { |
3653 /* | |
3654 * No argument: Clear all syntax items. | |
3655 */ | |
3656 if (syncing) | |
3657 syntax_sync_clear(); | |
3658 else | |
3659 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3660 syntax_clear(curwin->w_s); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3661 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
|
3662 do_unlet((char_u *)"b:current_syntax", TRUE); |
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
3663 do_unlet((char_u *)"w:current_syntax", TRUE); |
7 | 3664 } |
3665 } | |
3666 else | |
3667 { | |
3668 /* | |
3669 * Clear the group IDs that are in the argument. | |
3670 */ | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3671 while (!ends_excmd2(eap->cmd, arg)) |
7 | 3672 { |
3673 arg_end = skiptowhite(arg); | |
3674 if (*arg == '@') | |
3675 { | |
3676 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
3677 if (id == 0) | |
3678 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3679 semsg(_(e_no_such_syntax_cluster_1), arg); |
7 | 3680 break; |
3681 } | |
3682 else | |
3683 { | |
3684 /* | |
3685 * We can't physically delete a cluster without changing | |
3686 * the IDs of other clusters, so we do the next best thing | |
3687 * and make it empty. | |
3688 */ | |
3689 short scl_id = id - SYNID_CLUSTER; | |
3690 | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3691 VIM_CLEAR(SYN_CLSTR(curwin->w_s)[scl_id].scl_list); |
7 | 3692 } |
3693 } | |
3694 else | |
3695 { | |
3696 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
3697 if (id == 0) | |
3698 { | |
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
3699 semsg(_(e_no_such_highlight_group_name_str), arg); |
7 | 3700 break; |
3701 } | |
3702 else | |
3703 syn_clear_one(id, syncing); | |
3704 } | |
3705 arg = skipwhite(arg_end); | |
3706 } | |
3707 } | |
745 | 3708 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3709 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
7 | 3710 } |
3711 | |
3712 /* | |
3713 * Clear one syntax group for the current buffer. | |
3714 */ | |
3715 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3716 syn_clear_one(int id, int syncing) |
7 | 3717 { |
3718 synpat_T *spp; | |
3719 int idx; | |
3720 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3721 // Clear keywords only when not ":syn sync clear group-name" |
7 | 3722 if (!syncing) |
3723 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3724 (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
|
3725 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic); |
7 | 3726 } |
3727 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3728 // clear the patterns for "id" |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3729 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
|
3730 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3731 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
7 | 3732 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
3733 continue; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3734 syn_remove_pattern(curwin->w_s, idx); |
7 | 3735 } |
3736 } | |
3737 | |
3738 /* | |
3739 * Handle ":syntax on" command. | |
3740 */ | |
3741 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3742 syn_cmd_on(exarg_T *eap, int syncing UNUSED) |
7 | 3743 { |
3744 syn_cmd_onoff(eap, "syntax"); | |
3745 } | |
3746 | |
3747 /* | |
3748 * Handle ":syntax enable" command. | |
3749 */ | |
3750 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3751 syn_cmd_enable(exarg_T *eap, int syncing UNUSED) |
7 | 3752 { |
26199
eaa97adb0732
patch 8.2.3631: "syntax enable" does not work properly in Vim9 context
Bram Moolenaar <Bram@vim.org>
parents:
25521
diff
changeset
|
3753 set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"enable"); |
7 | 3754 syn_cmd_onoff(eap, "syntax"); |
148 | 3755 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
7 | 3756 } |
3757 | |
3758 /* | |
3759 * Handle ":syntax reset" command. | |
8815
50d9fb580ffe
commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816
Christian Brabandt <cb@256bit.org>
parents:
8806
diff
changeset
|
3760 * It actually resets highlighting, not syntax. |
7 | 3761 */ |
3762 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3763 syn_cmd_reset(exarg_T *eap, int syncing UNUSED) |
7 | 3764 { |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3765 set_nextcmd(eap, eap->arg); |
7 | 3766 if (!eap->skip) |
3767 { | |
26199
eaa97adb0732
patch 8.2.3631: "syntax enable" does not work properly in Vim9 context
Bram Moolenaar <Bram@vim.org>
parents:
25521
diff
changeset
|
3768 set_internal_string_var((char_u *)"g:syntax_cmd", (char_u *)"reset"); |
7 | 3769 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); |
148 | 3770 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
7 | 3771 } |
3772 } | |
3773 | |
3774 /* | |
3775 * Handle ":syntax manual" command. | |
3776 */ | |
3777 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3778 syn_cmd_manual(exarg_T *eap, int syncing UNUSED) |
7 | 3779 { |
3780 syn_cmd_onoff(eap, "manual"); | |
3781 } | |
3782 | |
3783 /* | |
3784 * Handle ":syntax off" command. | |
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_off(exarg_T *eap, int syncing UNUSED) |
7 | 3788 { |
3789 syn_cmd_onoff(eap, "nosyntax"); | |
3790 } | |
3791 | |
3792 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3793 syn_cmd_onoff(exarg_T *eap, char *name) |
7 | 3794 { |
3795 char_u buf[100]; | |
3796 | |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3797 set_nextcmd(eap, eap->arg); |
7 | 3798 if (!eap->skip) |
3799 { | |
3800 STRCPY(buf, "so "); | |
274 | 3801 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); |
7 | 3802 do_cmdline_cmd(buf); |
3803 } | |
3804 } | |
3805 | |
3806 /* | |
3807 * Handle ":syntax [list]" command: list current syntax words. | |
3808 */ | |
3809 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3810 syn_cmd_list( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3811 exarg_T *eap, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3812 int syncing) // when TRUE: list syncing items |
7 | 3813 { |
3814 char_u *arg = eap->arg; | |
3815 int id; | |
3816 char_u *arg_end; | |
3817 | |
3818 eap->nextcmd = find_nextcmd(arg); | |
3819 if (eap->skip) | |
3820 return; | |
3821 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3822 if (!syntax_present(curwin)) |
7 | 3823 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3824 msg(_(msg_no_items)); |
7 | 3825 return; |
3826 } | |
3827 | |
3828 if (syncing) | |
3829 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3830 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT) |
7 | 3831 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3832 msg_puts(_("syncing on C-style comments")); |
7 | 3833 syn_lines_msg(); |
3834 syn_match_msg(); | |
3835 return; | |
3836 } | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3837 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
|
3838 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3839 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
|
3840 msg_puts(_("no syncing")); |
7 | 3841 else |
3842 { | |
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3843 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
|
3844 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
|
3845 else |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3846 { |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3847 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
|
3848 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
|
3849 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
|
3850 } |
7 | 3851 syn_match_msg(); |
3852 } | |
3853 return; | |
3854 } | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3855 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
|
3856 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
|
3857 || 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
|
3858 || curwin->w_s->b_syn_sync_linebreaks > 0) |
7 | 3859 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3860 msg_puts(_("\nsyncing on items")); |
7 | 3861 syn_lines_msg(); |
3862 syn_match_msg(); | |
3863 } | |
3864 } | |
3865 else | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3866 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
|
3867 if (ends_excmd2(eap->cmd, arg)) |
7 | 3868 { |
3869 /* | |
3870 * No argument: List all group IDs and all syntax clusters. | |
3871 */ | |
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
3872 for (id = 1; id <= highlight_num_groups() && !got_int; ++id) |
7 | 3873 syn_list_one(id, syncing, FALSE); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3874 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id) |
7 | 3875 syn_list_cluster(id); |
3876 } | |
3877 else | |
3878 { | |
3879 /* | |
3880 * List the group IDs and syntax clusters that are in the argument. | |
3881 */ | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
3882 while (!ends_excmd2(eap->cmd, arg) && !got_int) |
7 | 3883 { |
3884 arg_end = skiptowhite(arg); | |
3885 if (*arg == '@') | |
3886 { | |
3887 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
3888 if (id == 0) | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
3889 semsg(_(e_no_such_syntax_cluster_2), arg); |
7 | 3890 else |
3891 syn_list_cluster(id - SYNID_CLUSTER); | |
3892 } | |
3893 else | |
3894 { | |
3895 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
3896 if (id == 0) | |
25306
078edc1821bf
patch 8.2.3190: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
24768
diff
changeset
|
3897 semsg(_(e_no_such_highlight_group_name_str), arg); |
7 | 3898 else |
3899 syn_list_one(id, syncing, TRUE); | |
3900 } | |
3901 arg = skipwhite(arg_end); | |
3902 } | |
3903 } | |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
3904 set_nextcmd(eap, arg); |
7 | 3905 } |
3906 | |
3907 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3908 syn_lines_msg(void) |
7 | 3909 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3910 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
|
3911 || curwin->w_s->b_syn_sync_minlines > 0) |
7 | 3912 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3913 msg_puts("; "); |
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3914 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
|
3915 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
|
3916 else |
7 | 3917 { |
22928
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3918 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
|
3919 { |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3920 msg_puts(_("minimal ")); |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3921 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
|
3922 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
|
3923 msg_puts(", "); |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3924 } |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3925 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
|
3926 { |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3927 msg_puts(_("maximal ")); |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3928 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
|
3929 } |
de6c242ec236
patch 8.2.2011: "syn sync" reports a very large number
Bram Moolenaar <Bram@vim.org>
parents:
22258
diff
changeset
|
3930 msg_puts(_(" lines before top line")); |
7 | 3931 } |
3932 } | |
3933 } | |
3934 | |
3935 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3936 syn_match_msg(void) |
7 | 3937 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3938 if (curwin->w_s->b_syn_sync_linebreaks > 0) |
7 | 3939 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3940 msg_puts(_("; match ")); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3941 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
|
3942 msg_puts(_(" line breaks")); |
7 | 3943 } |
3944 } | |
3945 | |
3946 static int last_matchgroup; | |
3947 | |
3948 struct name_list | |
3949 { | |
3950 int flag; | |
3951 char *name; | |
3952 }; | |
3953 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
3954 static void syn_list_flags(struct name_list *nl, int flags, int attr); |
7 | 3955 |
3956 /* | |
3957 * List one syntax item, for ":syntax" or "syntax list syntax_name". | |
3958 */ | |
3959 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3960 syn_list_one( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3961 int id, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3962 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
|
3963 int link_only) // when TRUE; list link-only too |
7 | 3964 { |
3965 int attr; | |
3966 int idx; | |
3967 int did_header = FALSE; | |
3968 synpat_T *spp; | |
3969 static struct name_list namelist1[] = | |
3970 { | |
3971 {HL_DISPLAY, "display"}, | |
3972 {HL_CONTAINED, "contained"}, | |
3973 {HL_ONELINE, "oneline"}, | |
3974 {HL_KEEPEND, "keepend"}, | |
3975 {HL_EXTEND, "extend"}, | |
3976 {HL_EXCLUDENL, "excludenl"}, | |
3977 {HL_TRANSP, "transparent"}, | |
3978 {HL_FOLD, "fold"}, | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3979 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3980 {HL_CONCEAL, "conceal"}, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3981 {HL_CONCEALENDS, "concealends"}, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3982 #endif |
7 | 3983 {0, NULL} |
3984 }; | |
3985 static struct name_list namelist2[] = | |
3986 { | |
3987 {HL_SKIPWHITE, "skipwhite"}, | |
3988 {HL_SKIPNL, "skipnl"}, | |
3989 {HL_SKIPEMPTY, "skipempty"}, | |
3990 {0, NULL} | |
3991 }; | |
3992 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3993 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
|
3994 |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
3995 // list the keywords for "id" |
7 | 3996 if (!syncing) |
3997 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3998 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
|
3999 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic, |
7 | 4000 did_header, attr); |
4001 } | |
4002 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4003 // list the patterns for "id" |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4004 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
|
4005 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4006 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
7 | 4007 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
4008 continue; | |
4009 | |
4010 (void)syn_list_header(did_header, 999, id); | |
4011 did_header = TRUE; | |
4012 last_matchgroup = 0; | |
4013 if (spp->sp_type == SPTYPE_MATCH) | |
4014 { | |
4015 put_pattern("match", ' ', spp, attr); | |
4016 msg_putchar(' '); | |
4017 } | |
4018 else if (spp->sp_type == SPTYPE_START) | |
4019 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4020 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
|
4021 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
|
4022 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
|
4023 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
|
4024 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
|
4025 && 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
|
4026 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
7 | 4027 --idx; |
4028 msg_putchar(' '); | |
4029 } | |
4030 syn_list_flags(namelist1, spp->sp_flags, attr); | |
4031 | |
4032 if (spp->sp_cont_list != NULL) | |
4033 put_id_list((char_u *)"contains", spp->sp_cont_list, attr); | |
4034 | |
4035 if (spp->sp_syn.cont_in_list != NULL) | |
4036 put_id_list((char_u *)"containedin", | |
4037 spp->sp_syn.cont_in_list, attr); | |
4038 | |
4039 if (spp->sp_next_list != NULL) | |
4040 { | |
4041 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr); | |
4042 syn_list_flags(namelist2, spp->sp_flags, attr); | |
4043 } | |
4044 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE)) | |
4045 { | |
4046 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
|
4047 msg_puts_attr("grouphere", attr); |
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_attr("groupthere", attr); |
7 | 4050 msg_putchar(' '); |
4051 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
|
4052 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
|
4053 [spp->sp_sync_idx].sp_syn.id - 1)); |
7 | 4054 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4055 msg_puts("NONE"); |
7 | 4056 msg_putchar(' '); |
4057 } | |
4058 } | |
4059 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4060 // 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
|
4061 if (highlight_link_id(id - 1) && (did_header || link_only) && !got_int) |
7 | 4062 { |
4063 (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
|
4064 msg_puts_attr("links to", attr); |
7 | 4065 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
|
4066 msg_outtrans(highlight_group_name(highlight_link_id(id - 1) - 1)); |
7 | 4067 } |
4068 } | |
4069 | |
4070 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4071 syn_list_flags(struct name_list *nlist, int flags, int attr) |
7 | 4072 { |
4073 int i; | |
4074 | |
3263 | 4075 for (i = 0; nlist[i].flag != 0; ++i) |
4076 if (flags & nlist[i].flag) | |
4077 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4078 msg_puts_attr(nlist[i].name, attr); |
7 | 4079 msg_putchar(' '); |
4080 } | |
4081 } | |
4082 | |
4083 /* | |
4084 * List one syntax cluster, for ":syntax" or "syntax list syntax_name". | |
4085 */ | |
4086 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4087 syn_list_cluster(int id) |
7 | 4088 { |
4089 int endcol = 15; | |
4090 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4091 // slight hack: roughly duplicate the guts of syn_list_header() |
7 | 4092 msg_putchar('\n'); |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4093 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name); |
7 | 4094 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4095 if (msg_col >= endcol) // output at least one space |
7 | 4096 endcol = msg_col + 1; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4097 if (Columns <= endcol) // avoid hang for tiny window |
7 | 4098 endcol = Columns - 1; |
4099 | |
4100 msg_advance(endcol); | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4101 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
|
4102 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4103 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
|
4104 HL_ATTR(HLF_D)); |
7 | 4105 } |
4106 else | |
4107 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4108 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
|
4109 msg_puts("=NONE"); |
7 | 4110 } |
4111 } | |
4112 | |
4113 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4114 put_id_list(char_u *name, short *list, int attr) |
7 | 4115 { |
4116 short *p; | |
4117 | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4118 msg_puts_attr((char *)name, attr); |
7 | 4119 msg_putchar('='); |
4120 for (p = list; *p; ++p) | |
4121 { | |
4122 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP) | |
4123 { | |
4124 if (p[1]) | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4125 msg_puts("ALLBUT"); |
7 | 4126 else |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4127 msg_puts("ALL"); |
7 | 4128 } |
4129 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED) | |
4130 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4131 msg_puts("TOP"); |
7 | 4132 } |
4133 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER) | |
4134 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4135 msg_puts("CONTAINED"); |
7 | 4136 } |
4137 else if (*p >= SYNID_CLUSTER) | |
4138 { | |
4139 short scl_id = *p - SYNID_CLUSTER; | |
4140 | |
4141 msg_putchar('@'); | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4142 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name); |
7 | 4143 } |
4144 else | |
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4145 msg_outtrans(highlight_group_name(*p - 1)); |
7 | 4146 if (p[1]) |
4147 msg_putchar(','); | |
4148 } | |
4149 msg_putchar(' '); | |
4150 } | |
4151 | |
4152 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4153 put_pattern( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4154 char *s, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4155 int c, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4156 synpat_T *spp, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4157 int attr) |
7 | 4158 { |
4159 long n; | |
4160 int mask; | |
4161 int first; | |
4162 static char *sepchars = "/+=-#@\"|'^&"; | |
4163 int i; | |
4164 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4165 // May have to write "matchgroup=group" |
7 | 4166 if (last_matchgroup != spp->sp_syn_match_id) |
4167 { | |
4168 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
|
4169 msg_puts_attr("matchgroup", attr); |
7 | 4170 msg_putchar('='); |
4171 if (last_matchgroup == 0) | |
4172 msg_outtrans((char_u *)"NONE"); | |
4173 else | |
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
4174 msg_outtrans(highlight_group_name(last_matchgroup - 1)); |
7 | 4175 msg_putchar(' '); |
4176 } | |
4177 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4178 // 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
|
4179 msg_puts_attr(s, attr); |
7 | 4180 msg_putchar(c); |
4181 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4182 // output the pattern, in between a char that is not in the pattern |
7 | 4183 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; ) |
4184 if (sepchars[++i] == NUL) | |
4185 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4186 i = 0; // no good char found, just use the first one |
7 | 4187 break; |
4188 } | |
4189 msg_putchar(sepchars[i]); | |
4190 msg_outtrans(spp->sp_pattern); | |
4191 msg_putchar(sepchars[i]); | |
4192 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4193 // output any pattern options |
7 | 4194 first = TRUE; |
4195 for (i = 0; i < SPO_COUNT; ++i) | |
4196 { | |
4197 mask = (1 << i); | |
4198 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT))) | |
4199 { | |
4200 if (!first) | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4201 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
|
4202 msg_puts(spo_name_tab[i]); |
7 | 4203 n = spp->sp_offsets[i]; |
4204 if (i != SPO_LC_OFF) | |
4205 { | |
4206 if (spp->sp_off_flags & mask) | |
4207 msg_putchar('s'); | |
4208 else | |
4209 msg_putchar('e'); | |
4210 if (n > 0) | |
4211 msg_putchar('+'); | |
4212 } | |
4213 if (n || i == SPO_LC_OFF) | |
4214 msg_outnum(n); | |
4215 first = FALSE; | |
4216 } | |
4217 } | |
4218 msg_putchar(' '); | |
4219 } | |
4220 | |
4221 /* | |
4222 * List or clear the keywords for one syntax group. | |
4223 * Return TRUE if the header has been printed. | |
4224 */ | |
4225 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4226 syn_list_keywords( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4227 int id, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4228 hashtab_T *ht, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4229 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
|
4230 int attr) |
7 | 4231 { |
4232 int outlen; | |
134 | 4233 hashitem_T *hi; |
4234 keyentry_T *kp; | |
4235 int todo; | |
7 | 4236 int prev_contained = 0; |
4237 short *prev_next_list = NULL; | |
4238 short *prev_cont_in_list = NULL; | |
4239 int prev_skipnl = 0; | |
4240 int prev_skipwhite = 0; | |
4241 int prev_skipempty = 0; | |
4242 | |
4243 /* | |
4244 * Unfortunately, this list of keywords is not sorted on alphabet but on | |
4245 * hash value... | |
4246 */ | |
835 | 4247 todo = (int)ht->ht_used; |
134 | 4248 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi) |
4249 { | |
4250 if (!HASHITEM_EMPTY(hi)) | |
4251 { | |
4252 --todo; | |
4253 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next) | |
7 | 4254 { |
134 | 4255 if (kp->k_syn.id == id) |
7 | 4256 { |
134 | 4257 if (prev_contained != (kp->flags & HL_CONTAINED) |
4258 || prev_skipnl != (kp->flags & HL_SKIPNL) | |
4259 || prev_skipwhite != (kp->flags & HL_SKIPWHITE) | |
4260 || prev_skipempty != (kp->flags & HL_SKIPEMPTY) | |
4261 || prev_cont_in_list != kp->k_syn.cont_in_list | |
4262 || prev_next_list != kp->next_list) | |
4263 outlen = 9999; | |
4264 else | |
4265 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
|
4266 // output "contained" and "nextgroup" on each line |
134 | 4267 if (syn_list_header(did_header, outlen, id)) |
4268 { | |
4269 prev_contained = 0; | |
4270 prev_next_list = NULL; | |
4271 prev_cont_in_list = NULL; | |
4272 prev_skipnl = 0; | |
4273 prev_skipwhite = 0; | |
4274 prev_skipempty = 0; | |
4275 } | |
4276 did_header = TRUE; | |
4277 if (prev_contained != (kp->flags & HL_CONTAINED)) | |
4278 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4279 msg_puts_attr("contained", attr); |
134 | 4280 msg_putchar(' '); |
4281 prev_contained = (kp->flags & HL_CONTAINED); | |
4282 } | |
4283 if (kp->k_syn.cont_in_list != prev_cont_in_list) | |
4284 { | |
4285 put_id_list((char_u *)"containedin", | |
4286 kp->k_syn.cont_in_list, attr); | |
4287 msg_putchar(' '); | |
4288 prev_cont_in_list = kp->k_syn.cont_in_list; | |
4289 } | |
4290 if (kp->next_list != prev_next_list) | |
4291 { | |
4292 put_id_list((char_u *)"nextgroup", kp->next_list, attr); | |
4293 msg_putchar(' '); | |
4294 prev_next_list = kp->next_list; | |
4295 if (kp->flags & HL_SKIPNL) | |
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("skipnl", attr); |
134 | 4298 msg_putchar(' '); |
4299 prev_skipnl = (kp->flags & HL_SKIPNL); | |
4300 } | |
4301 if (kp->flags & HL_SKIPWHITE) | |
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("skipwhite", attr); |
134 | 4304 msg_putchar(' '); |
4305 prev_skipwhite = (kp->flags & HL_SKIPWHITE); | |
4306 } | |
4307 if (kp->flags & HL_SKIPEMPTY) | |
4308 { | |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
4309 msg_puts_attr("skipempty", attr); |
134 | 4310 msg_putchar(' '); |
4311 prev_skipempty = (kp->flags & HL_SKIPEMPTY); | |
4312 } | |
4313 } | |
4314 msg_outtrans(kp->keyword); | |
7 | 4315 } |
4316 } | |
4317 } | |
4318 } | |
4319 | |
4320 return did_header; | |
4321 } | |
4322 | |
4323 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4324 syn_clear_keyword(int id, hashtab_T *ht) |
134 | 4325 { |
4326 hashitem_T *hi; | |
4327 keyentry_T *kp; | |
4328 keyentry_T *kp_prev; | |
4329 keyentry_T *kp_next; | |
4330 int todo; | |
4331 | |
4332 hash_lock(ht); | |
835 | 4333 todo = (int)ht->ht_used; |
134 | 4334 for (hi = ht->ht_array; todo > 0; ++hi) |
4335 { | |
4336 if (!HASHITEM_EMPTY(hi)) | |
4337 { | |
4338 --todo; | |
4339 kp_prev = NULL; | |
4340 for (kp = HI2KE(hi); kp != NULL; ) | |
7 | 4341 { |
134 | 4342 if (kp->k_syn.id == id) |
4343 { | |
4344 kp_next = kp->ke_next; | |
4345 if (kp_prev == NULL) | |
4346 { | |
4347 if (kp_next == NULL) | |
4348 hash_remove(ht, hi); | |
4349 else | |
4350 hi->hi_key = KE2HIKEY(kp_next); | |
4351 } | |
4352 else | |
4353 kp_prev->ke_next = kp_next; | |
4354 vim_free(kp->next_list); | |
4355 vim_free(kp->k_syn.cont_in_list); | |
4356 vim_free(kp); | |
4357 kp = kp_next; | |
4358 } | |
7 | 4359 else |
134 | 4360 { |
4361 kp_prev = kp; | |
4362 kp = kp->ke_next; | |
4363 } | |
7 | 4364 } |
134 | 4365 } |
4366 } | |
4367 hash_unlock(ht); | |
4368 } | |
4369 | |
4370 /* | |
4371 * Clear a whole keyword table. | |
7 | 4372 */ |
4373 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4374 clear_keywtab(hashtab_T *ht) |
134 | 4375 { |
4376 hashitem_T *hi; | |
4377 int todo; | |
4378 keyentry_T *kp; | |
4379 keyentry_T *kp_next; | |
4380 | |
835 | 4381 todo = (int)ht->ht_used; |
134 | 4382 for (hi = ht->ht_array; todo > 0; ++hi) |
4383 { | |
4384 if (!HASHITEM_EMPTY(hi)) | |
4385 { | |
4386 --todo; | |
4387 for (kp = HI2KE(hi); kp != NULL; kp = kp_next) | |
7 | 4388 { |
134 | 4389 kp_next = kp->ke_next; |
4390 vim_free(kp->next_list); | |
4391 vim_free(kp->k_syn.cont_in_list); | |
4392 vim_free(kp); | |
7 | 4393 } |
134 | 4394 } |
4395 } | |
4396 hash_clear(ht); | |
4397 hash_init(ht); | |
7 | 4398 } |
4399 | |
4400 /* | |
4401 * Add a keyword to the list of keywords. | |
4402 */ | |
4403 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4404 add_keyword( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4405 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
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 int conceal_char) |
7 | 4411 { |
134 | 4412 keyentry_T *kp; |
4413 hashtab_T *ht; | |
4414 hashitem_T *hi; | |
154 | 4415 char_u *name_ic; |
134 | 4416 long_u hash; |
154 | 4417 char_u name_folded[MAXKEYWLEN + 1]; |
7 | 4418 |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4419 if (curwin->w_s->b_syn_ic) |
154 | 4420 name_ic = str_foldcase(name, (int)STRLEN(name), |
4421 name_folded, MAXKEYWLEN + 1); | |
4422 else | |
4423 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
|
4424 kp = alloc(offsetof(keyentry_T, keyword) + STRLEN(name_ic) + 1); |
134 | 4425 if (kp == NULL) |
4426 return; | |
4427 STRCPY(kp->keyword, name_ic); | |
4428 kp->k_syn.id = id; | |
4429 kp->k_syn.inc_tag = current_syn_inc_tag; | |
4430 kp->flags = flags; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4431 kp->k_char = conceal_char; |
134 | 4432 kp->k_syn.cont_in_list = copy_id_list(cont_in_list); |
4433 if (cont_in_list != NULL) | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4434 curwin->w_s->b_syn_containedin = TRUE; |
134 | 4435 kp->next_list = copy_id_list(next_list); |
4436 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4437 if (curwin->w_s->b_syn_ic) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4438 ht = &curwin->w_s->b_keywtab_ic; |
7 | 4439 else |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4440 ht = &curwin->w_s->b_keywtab; |
134 | 4441 |
4442 hash = hash_hash(kp->keyword); | |
4443 hi = hash_lookup(ht, kp->keyword, hash); | |
4444 if (HASHITEM_EMPTY(hi)) | |
4445 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4446 // new keyword, add to hashtable |
134 | 4447 kp->ke_next = NULL; |
4448 hash_add_item(ht, hi, kp->keyword, hash); | |
4449 } | |
4450 else | |
4451 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4452 // keyword already exists, prepend to list |
134 | 4453 kp->ke_next = HI2KE(hi); |
4454 hi->hi_key = KE2HIKEY(kp); | |
4455 } | |
7 | 4456 } |
4457 | |
4458 /* | |
4459 * Get the start and end of the group name argument. | |
4460 * Return a pointer to the first argument. | |
4461 * Return NULL if the end of the command was found instead of further args. | |
4462 */ | |
4463 static char_u * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4464 get_group_name( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4465 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
|
4466 char_u **name_end) // pointer to end of the name |
7 | 4467 { |
4468 char_u *rest; | |
4469 | |
4470 *name_end = skiptowhite(arg); | |
4471 rest = skipwhite(*name_end); | |
4472 | |
4473 /* | |
4474 * Check if there are enough arguments. The first argument may be a | |
4475 * pattern, where '|' is allowed, so only check for NUL. | |
4476 */ | |
4477 if (ends_excmd(*arg) || *rest == NUL) | |
4478 return NULL; | |
4479 return rest; | |
4480 } | |
4481 | |
4482 /* | |
4483 * Check for syntax command option arguments. | |
4484 * This can be called at any place in the list of arguments, and just picks | |
4485 * out the arguments that are known. Can be called several times in a row to | |
4486 * collect all options in between other arguments. | |
4487 * Return a pointer to the next argument (which isn't an option). | |
4488 * Return NULL for any error; | |
4489 */ | |
4490 static char_u * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4491 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
|
4492 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
|
4493 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
|
4494 int *conceal_char UNUSED, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4495 int skip) // TRUE if skipping over command |
154 | 4496 { |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4497 char_u *arg = start; |
7 | 4498 char_u *gname_start, *gname; |
4499 int syn_id; | |
4500 int len; | |
154 | 4501 char *p; |
7 | 4502 int i; |
4503 int fidx; | |
4504 static struct flag | |
4505 { | |
4506 char *name; | |
154 | 4507 int argtype; |
4508 int flags; | |
4509 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED}, | |
4510 {"oOnNeElLiInNeE", 0, HL_ONELINE}, | |
4511 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND}, | |
4512 {"eExXtTeEnNdD", 0, HL_EXTEND}, | |
4513 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL}, | |
4514 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP}, | |
4515 {"sSkKiIpPnNlL", 0, HL_SKIPNL}, | |
4516 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE}, | |
4517 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY}, | |
4518 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE}, | |
4519 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE}, | |
4520 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY}, | |
4521 {"fFoOlLdD", 0, HL_FOLD}, | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4522 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL}, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4523 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS}, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4524 {"cCcChHaArR", 11, 0}, |
154 | 4525 {"cCoOnNtTaAiInNsS", 1, 0}, |
4526 {"cCoOnNtTaAiInNeEdDiInN", 2, 0}, | |
4527 {"nNeExXtTgGrRoOuUpP", 3, 0}, | |
7 | 4528 }; |
154 | 4529 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN"; |
7 | 4530 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4531 if (arg == NULL) // already detected error |
7 | 4532 return NULL; |
4533 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4534 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4535 if (curwin->w_s->b_syn_conceal) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4536 opt->flags |= HL_CONCEAL; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4537 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4538 |
7 | 4539 for (;;) |
4540 { | |
154 | 4541 /* |
4542 * This is used very often when a large number of keywords is defined. | |
4543 * Need to skip quickly when no option name is found. | |
4544 * Also avoid tolower(), it's slow. | |
4545 */ | |
4546 if (strchr(first_letters, *arg) == NULL) | |
4547 break; | |
7 | 4548 |
24768
7334bf933510
patch 8.2.2922: computing array length is done in various ways
Bram Moolenaar <Bram@vim.org>
parents:
24442
diff
changeset
|
4549 for (fidx = ARRAY_LENGTH(flagtab); --fidx >= 0; ) |
7 | 4550 { |
154 | 4551 p = flagtab[fidx].name; |
4552 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len) | |
4553 if (arg[len] != p[i] && arg[len] != p[i + 1]) | |
4554 break; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4555 if (p[i] == NUL && (VIM_ISWHITE(arg[len]) |
154 | 4556 || (flagtab[fidx].argtype > 0 |
4557 ? arg[len] == '=' | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4558 : ends_excmd2(start, arg + len)))) |
7 | 4559 { |
154 | 4560 if (opt->keyword |
4561 && (flagtab[fidx].flags == HL_DISPLAY | |
4562 || flagtab[fidx].flags == HL_FOLD | |
4563 || 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
|
4564 // treat "display", "fold" and "extend" as a keyword |
7 | 4565 fidx = -1; |
4566 break; | |
4567 } | |
4568 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4569 if (fidx < 0) // no match found |
154 | 4570 break; |
4571 | |
4572 if (flagtab[fidx].argtype == 1) | |
4573 { | |
4574 if (!opt->has_cont_list) | |
7 | 4575 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4576 emsg(_(e_contains_argument_not_accepted_here)); |
7 | 4577 return NULL; |
4578 } | |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4579 if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL) |
7 | 4580 return NULL; |
4581 } | |
154 | 4582 else if (flagtab[fidx].argtype == 2) |
4583 { | |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4584 if (get_id_list(&arg, 11, &opt->cont_in_list, skip) == FAIL) |
7 | 4585 return NULL; |
4586 } | |
154 | 4587 else if (flagtab[fidx].argtype == 3) |
4588 { | |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4589 if (get_id_list(&arg, 9, &opt->next_list, skip) == FAIL) |
7 | 4590 return NULL; |
4591 } | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4592 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
|
4593 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4594 // cchar=? |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4595 if (has_mbyte) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4596 { |
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4597 #ifdef FEAT_CONCEAL |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4598 *conceal_char = mb_ptr2char(arg + 6); |
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4599 #endif |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4600 arg += mb_ptr2len(arg + 6) - 1; |
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 else |
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4603 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4604 #ifdef FEAT_CONCEAL |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4605 *conceal_char = arg[6]; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4606 #else |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4607 ; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4608 #endif |
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4609 } |
2686 | 4610 #ifdef FEAT_CONCEAL |
4611 if (!vim_isprintc_strict(*conceal_char)) | |
4612 { | |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
4613 emsg(_(e_invalid_cchar_value)); |
2686 | 4614 return NULL; |
4615 } | |
4616 #endif | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4617 arg = skipwhite(arg + 7); |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4618 } |
7 | 4619 else |
154 | 4620 { |
4621 opt->flags |= flagtab[fidx].flags; | |
4622 arg = skipwhite(arg + len); | |
4623 | |
4624 if (flagtab[fidx].flags == HL_SYNC_HERE | |
4625 || flagtab[fidx].flags == HL_SYNC_THERE) | |
4626 { | |
4627 if (opt->sync_idx == NULL) | |
4628 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4629 emsg(_(e_groupthere_not_accepted_here)); |
154 | 4630 return NULL; |
4631 } | |
4632 gname_start = arg; | |
4633 arg = skiptowhite(arg); | |
4634 if (gname_start == arg) | |
4635 return NULL; | |
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
4636 gname = vim_strnsave(gname_start, arg - gname_start); |
154 | 4637 if (gname == NULL) |
4638 return NULL; | |
4639 if (STRCMP(gname, "NONE") == 0) | |
4640 *opt->sync_idx = NONE_IDX; | |
4641 else | |
4642 { | |
4643 syn_id = syn_name2id(gname); | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4644 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
|
4645 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
|
4646 && 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
|
4647 == SPTYPE_START) |
154 | 4648 { |
4649 *opt->sync_idx = i; | |
4650 break; | |
4651 } | |
4652 if (i < 0) | |
4653 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4654 semsg(_(e_didnt_find_region_item_for_str), gname); |
154 | 4655 vim_free(gname); |
4656 return NULL; | |
4657 } | |
4658 } | |
4659 | |
4660 vim_free(gname); | |
4661 arg = skipwhite(arg); | |
4662 } | |
4663 #ifdef FEAT_FOLDING | |
4664 else if (flagtab[fidx].flags == HL_FOLD | |
4665 && foldmethodIsSyntax(curwin)) | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4666 // Need to update folds later. |
154 | 4667 foldUpdateAll(curwin); |
4668 #endif | |
4669 } | |
4670 } | |
7 | 4671 |
4672 return arg; | |
4673 } | |
4674 | |
4675 /* | |
4676 * Adjustments to syntax item when declared in a ":syn include"'d file. | |
4677 * Set the contained flag, and if the item is not already contained, add it | |
4678 * to the specified top-level group, if any. | |
4679 */ | |
4680 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4681 syn_incl_toplevel(int id, int *flagsp) |
7 | 4682 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4683 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0) |
7 | 4684 return; |
4685 *flagsp |= HL_CONTAINED; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4686 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) |
7 | 4687 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4688 // 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
|
4689 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
|
4690 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER; |
7 | 4691 |
4692 if (grp_list != NULL) | |
4693 { | |
4694 grp_list[0] = id; | |
4695 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
|
4696 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
|
4697 &grp_list, CLUSTER_ADD); |
7 | 4698 } |
4699 } | |
4700 } | |
4701 | |
4702 /* | |
4703 * Handle ":syntax include [@{group-name}] filename" command. | |
4704 */ | |
4705 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4706 syn_cmd_include(exarg_T *eap, int syncing UNUSED) |
7 | 4707 { |
4708 char_u *arg = eap->arg; | |
4709 int sgl_id = 1; | |
4710 char_u *group_name_end; | |
4711 char_u *rest; | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
4712 char *errormsg = NULL; |
7 | 4713 int prev_toplvl_grp; |
4714 int prev_syn_inc_tag; | |
4715 int source = FALSE; | |
4716 | |
4717 eap->nextcmd = find_nextcmd(arg); | |
4718 if (eap->skip) | |
4719 return; | |
4720 | |
4721 if (arg[0] == '@') | |
4722 { | |
4723 ++arg; | |
4724 rest = get_group_name(arg, &group_name_end); | |
4725 if (rest == NULL) | |
4726 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
4727 emsg(_(e_filename_required)); |
7 | 4728 return; |
4729 } | |
4730 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); | |
2743 | 4731 if (sgl_id == 0) |
4732 return; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4733 // separate_nextcmd() and expand_filename() depend on this |
7 | 4734 eap->arg = rest; |
4735 } | |
4736 | |
4737 /* | |
4738 * Everything that's left, up to the next command, should be the | |
4739 * filename to include. | |
4740 */ | |
17336
81705f4d9e03
patch 8.1.1667: flags for Ex commands may clash with other symbols
Bram Moolenaar <Bram@vim.org>
parents:
17227
diff
changeset
|
4741 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
|
4742 separate_nextcmd(eap, FALSE); |
7 | 4743 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg)) |
4744 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4745 // 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
|
4746 // 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
|
4747 // ":runtime!" is used. |
7 | 4748 source = TRUE; |
4749 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL) | |
4750 { | |
4751 if (errormsg != NULL) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
14968
diff
changeset
|
4752 emsg(errormsg); |
7 | 4753 return; |
4754 } | |
4755 } | |
4756 | |
4757 /* | |
4758 * Save and restore the existing top-level grouplist id and ":syn | |
4759 * include" tag around the actual inclusion. | |
4760 */ | |
2743 | 4761 if (running_syn_inc_tag >= MAX_SYN_INC_TAG) |
4762 { | |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
4763 emsg(_(e_too_many_syntax_includes)); |
2743 | 4764 return; |
4765 } | |
7 | 4766 prev_syn_inc_tag = current_syn_inc_tag; |
4767 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
|
4768 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
|
4769 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
|
4770 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
|
4771 : 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
|
4772 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
|
4773 curwin->w_s->b_syn_topgrp = prev_toplvl_grp; |
7 | 4774 current_syn_inc_tag = prev_syn_inc_tag; |
4775 } | |
4776 | |
4777 /* | |
4778 * Handle ":syntax keyword {group-name} [{option}] keyword .." command. | |
4779 */ | |
4780 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4781 syn_cmd_keyword(exarg_T *eap, int syncing UNUSED) |
7 | 4782 { |
4783 char_u *arg = eap->arg; | |
4784 char_u *group_name_end; | |
4785 int syn_id; | |
4786 char_u *rest; | |
2743 | 4787 char_u *keyword_copy = NULL; |
7 | 4788 char_u *p; |
154 | 4789 char_u *kw; |
4790 syn_opt_arg_T syn_opt_arg; | |
4791 int cnt; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4792 int conceal_char = NUL; |
7 | 4793 |
4794 rest = get_group_name(arg, &group_name_end); | |
4795 | |
4796 if (rest != NULL) | |
4797 { | |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4798 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
|
4799 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
|
4800 else |
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4801 syn_id = syn_check_group(arg, (int)(group_name_end - arg)); |
2743 | 4802 if (syn_id != 0) |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4803 // 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
|
4804 keyword_copy = alloc(STRLEN(rest) + 1); |
7 | 4805 if (keyword_copy != NULL) |
4806 { | |
154 | 4807 syn_opt_arg.flags = 0; |
4808 syn_opt_arg.keyword = TRUE; | |
4809 syn_opt_arg.sync_idx = NULL; | |
4810 syn_opt_arg.has_cont_list = FALSE; | |
4811 syn_opt_arg.cont_in_list = NULL; | |
4812 syn_opt_arg.next_list = NULL; | |
4813 | |
7 | 4814 /* |
4815 * The options given apply to ALL keywords, so all options must be | |
4816 * found before keywords can be created. | |
154 | 4817 * 1: collect the options and copy the keywords to keyword_copy. |
7 | 4818 */ |
154 | 4819 cnt = 0; |
4820 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
|
4821 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
|
4822 rest = skipwhite(rest)) |
7 | 4823 { |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4824 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
|
4825 eap->skip); |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
4826 if (rest == NULL || ends_excmd2(eap->arg, rest)) |
154 | 4827 break; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4828 // 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
|
4829 while (*rest != NUL && !VIM_ISWHITE(*rest)) |
154 | 4830 { |
4831 if (*rest == '\\' && rest[1] != NUL) | |
4832 ++rest; | |
4833 *p++ = *rest++; | |
4834 } | |
4835 *p++ = NUL; | |
4836 ++cnt; | |
4837 } | |
4838 | |
4839 if (!eap->skip) | |
4840 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4841 // Adjust flags for use of ":syn include". |
154 | 4842 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
4843 | |
7 | 4844 /* |
154 | 4845 * 2: Add an entry for each keyword. |
7 | 4846 */ |
154 | 4847 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1) |
7 | 4848 { |
154 | 4849 for (p = vim_strchr(kw, '['); ; ) |
7 | 4850 { |
154 | 4851 if (p != NULL) |
4852 *p = NUL; | |
4853 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
|
4854 syn_opt_arg.cont_in_list, |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4855 syn_opt_arg.next_list, conceal_char); |
168 | 4856 if (p == NULL) |
4857 break; | |
4858 if (p[1] == NUL) | |
4859 { | |
26958
d92e0d85923f
patch 8.2.4008: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26913
diff
changeset
|
4860 semsg(_(e_error_missing_rsb_str), kw); |
7017 | 4861 goto error; |
168 | 4862 } |
4863 if (p[1] == ']') | |
4864 { | |
7017 | 4865 if (p[2] != NUL) |
4866 { | |
26966
ac75c145f0a9
patch 8.2.4012: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
4867 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
|
4868 kw, &p[2]); |
7017 | 4869 goto error; |
4870 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4871 kw = p + 1; // skip over the "]" |
168 | 4872 break; |
4873 } | |
154 | 4874 if (has_mbyte) |
7 | 4875 { |
474 | 4876 int l = (*mb_ptr2len)(p + 1); |
154 | 4877 |
4878 mch_memmove(p, p + 1, l); | |
4879 p += l; | |
4880 } | |
4881 else | |
4882 { | |
4883 p[0] = p[1]; | |
4884 ++p; | |
7 | 4885 } |
4886 } | |
4887 } | |
4888 } | |
7017 | 4889 error: |
7 | 4890 vim_free(keyword_copy); |
168 | 4891 vim_free(syn_opt_arg.cont_in_list); |
4892 vim_free(syn_opt_arg.next_list); | |
7 | 4893 } |
4894 } | |
4895 | |
4896 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
|
4897 set_nextcmd(eap, rest); |
7 | 4898 else |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
4899 semsg(_(e_invalid_argument_str), arg); |
7 | 4900 |
745 | 4901 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4902 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
7 | 4903 } |
4904 | |
4905 /* | |
4906 * Handle ":syntax match {name} [{options}] {pattern} [{options}]". | |
4907 * | |
4908 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .." | |
4909 */ | |
4910 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4911 syn_cmd_match( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4912 exarg_T *eap, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4913 int syncing) // TRUE for ":syntax sync match .. " |
7 | 4914 { |
4915 char_u *arg = eap->arg; | |
4916 char_u *group_name_end; | |
4917 char_u *rest; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4918 synpat_T item; // the item found in the line |
7 | 4919 int syn_id; |
4920 int idx; | |
154 | 4921 syn_opt_arg_T syn_opt_arg; |
7 | 4922 int sync_idx = 0; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4923 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
|
4924 int orig_called_emsg = called_emsg; |
7 | 4925 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4926 // Isolate the group name, check for validity |
7 | 4927 rest = get_group_name(arg, &group_name_end); |
4928 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4929 // Get options before the pattern |
154 | 4930 syn_opt_arg.flags = 0; |
4931 syn_opt_arg.keyword = FALSE; | |
4932 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL; | |
4933 syn_opt_arg.has_cont_list = TRUE; | |
4934 syn_opt_arg.cont_list = NULL; | |
4935 syn_opt_arg.cont_in_list = NULL; | |
4936 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
|
4937 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
7 | 4938 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4939 // get the pattern. |
7 | 4940 init_syn_patterns(); |
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
4941 CLEAR_FIELD(item); |
7 | 4942 rest = get_syn_pattern(rest, &item); |
154 | 4943 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
4944 syn_opt_arg.flags |= HL_HAS_EOL; | |
7 | 4945 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4946 // 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
|
4947 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
7 | 4948 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4949 if (rest != NULL) // all arguments are valid |
7 | 4950 { |
4951 /* | |
4952 * Check for trailing command and illegal trailing arguments. | |
4953 */ | |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
4954 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
|
4955 if (!ends_excmd2(eap->cmd, rest) || eap->skip) |
7 | 4956 rest = NULL; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4957 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL |
7 | 4958 && (syn_id = syn_check_group(arg, |
4959 (int)(group_name_end - arg))) != 0) | |
4960 { | |
154 | 4961 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
7 | 4962 /* |
4963 * Store the pattern in the syn_items list | |
4964 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4965 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
|
4966 SYN_ITEMS(curwin->w_s)[idx] = item; |
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_syncing = syncing; |
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_type = SPTYPE_MATCH; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4969 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
|
4970 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
|
4971 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
|
4972 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
|
4973 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
|
4974 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
154 | 4975 syn_opt_arg.cont_in_list; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4976 #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
|
4977 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
|
4978 #endif |
154 | 4979 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
|
4980 curwin->w_s->b_syn_containedin = TRUE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4981 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
|
4982 ++curwin->w_s->b_syn_patterns.ga_len; |
7 | 4983 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4984 // remember that we found a match for syncing on |
154 | 4985 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
|
4986 curwin->w_s->b_syn_sync_flags |= SF_MATCH; |
7 | 4987 #ifdef FEAT_FOLDING |
154 | 4988 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
|
4989 ++curwin->w_s->b_syn_folditems; |
7 | 4990 #endif |
4991 | |
745 | 4992 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
4993 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
|
4994 return; // don't free the progs and patterns now |
7 | 4995 } |
4996 } | |
4997 | |
4998 /* | |
4999 * Something failed, free the allocated memory. | |
5000 */ | |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5001 vim_regfree(item.sp_prog); |
7 | 5002 vim_free(item.sp_pattern); |
154 | 5003 vim_free(syn_opt_arg.cont_list); |
5004 vim_free(syn_opt_arg.cont_in_list); | |
5005 vim_free(syn_opt_arg.next_list); | |
7 | 5006 |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5007 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
|
5008 semsg(_(e_invalid_argument_str), arg); |
7 | 5009 } |
5010 | |
5011 /* | |
5012 * Handle ":syntax region {group-name} [matchgroup={group-name}] | |
5013 * start {start} .. [skip {skip}] end {end} .. [{options}]". | |
5014 */ | |
5015 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5016 syn_cmd_region( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5017 exarg_T *eap, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5018 int syncing) // TRUE for ":syntax sync region .." |
7 | 5019 { |
5020 char_u *arg = eap->arg; | |
5021 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
|
5022 char_u *rest; // next arg, NULL on error |
7 | 5023 char_u *key_end; |
5024 char_u *key = NULL; | |
5025 char_u *p; | |
5026 int item; | |
5027 #define ITEM_START 0 | |
5028 #define ITEM_SKIP 1 | |
5029 #define ITEM_END 2 | |
5030 #define ITEM_MATCHGROUP 3 | |
5031 struct pat_ptr | |
5032 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5033 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
|
5034 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
|
5035 struct pat_ptr *pp_next; // pointer to next pat_ptr |
7 | 5036 } *(pat_ptrs[3]); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5037 // patterns found in the line |
7 | 5038 struct pat_ptr *ppp; |
5039 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
|
5040 int pat_count = 0; // nr of syn_patterns found |
7 | 5041 int syn_id; |
5042 int matchgroup_id = 0; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5043 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
|
5044 int illegal = FALSE; // illegal arguments |
7 | 5045 int success = FALSE; |
5046 int idx; | |
154 | 5047 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
|
5048 int conceal_char = NUL; |
7 | 5049 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5050 // Isolate the group name, check for validity |
7 | 5051 rest = get_group_name(arg, &group_name_end); |
5052 | |
5053 pat_ptrs[0] = NULL; | |
5054 pat_ptrs[1] = NULL; | |
5055 pat_ptrs[2] = NULL; | |
5056 | |
5057 init_syn_patterns(); | |
5058 | |
154 | 5059 syn_opt_arg.flags = 0; |
5060 syn_opt_arg.keyword = FALSE; | |
5061 syn_opt_arg.sync_idx = NULL; | |
5062 syn_opt_arg.has_cont_list = TRUE; | |
5063 syn_opt_arg.cont_list = NULL; | |
5064 syn_opt_arg.cont_in_list = NULL; | |
5065 syn_opt_arg.next_list = NULL; | |
5066 | |
7 | 5067 /* |
5068 * get the options, patterns and matchgroup. | |
5069 */ | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5070 while (rest != NULL && !ends_excmd2(eap->cmd, rest)) |
7 | 5071 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5072 // 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
|
5073 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
|
5074 if (rest == NULL || ends_excmd2(eap->cmd, rest)) |
7 | 5075 break; |
5076 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5077 // must be a pattern or matchgroup then |
7 | 5078 key_end = rest; |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5079 while (*key_end && !VIM_ISWHITE(*key_end) && *key_end != '=') |
7 | 5080 ++key_end; |
5081 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
|
5082 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
|
5083 if (key == NULL) // out of memory |
7 | 5084 { |
5085 rest = NULL; | |
5086 break; | |
5087 } | |
5088 if (STRCMP(key, "MATCHGROUP") == 0) | |
5089 item = ITEM_MATCHGROUP; | |
5090 else if (STRCMP(key, "START") == 0) | |
5091 item = ITEM_START; | |
5092 else if (STRCMP(key, "END") == 0) | |
5093 item = ITEM_END; | |
5094 else if (STRCMP(key, "SKIP") == 0) | |
5095 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5096 if (pat_ptrs[ITEM_SKIP] != NULL) // one skip pattern allowed |
7 | 5097 { |
5098 illegal = TRUE; | |
5099 break; | |
5100 } | |
5101 item = ITEM_SKIP; | |
5102 } | |
5103 else | |
5104 break; | |
5105 rest = skipwhite(key_end); | |
5106 if (*rest != '=') | |
5107 { | |
5108 rest = NULL; | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5109 semsg(_(e_missing_equal_str), arg); |
7 | 5110 break; |
5111 } | |
5112 rest = skipwhite(rest + 1); | |
5113 if (*rest == NUL) | |
5114 { | |
5115 not_enough = TRUE; | |
5116 break; | |
5117 } | |
5118 | |
5119 if (item == ITEM_MATCHGROUP) | |
5120 { | |
5121 p = skiptowhite(rest); | |
5122 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip) | |
5123 matchgroup_id = 0; | |
5124 else | |
5125 { | |
5126 matchgroup_id = syn_check_group(rest, (int)(p - rest)); | |
5127 if (matchgroup_id == 0) | |
5128 { | |
5129 illegal = TRUE; | |
5130 break; | |
5131 } | |
5132 } | |
5133 rest = skipwhite(p); | |
5134 } | |
5135 else | |
5136 { | |
5137 /* | |
5138 * Allocate room for a syn_pattern, and link it in the list of | |
5139 * syn_patterns for this item, at the start (because the list is | |
5140 * used from end to start). | |
5141 */ | |
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
|
5142 ppp = ALLOC_ONE(struct pat_ptr); |
7 | 5143 if (ppp == NULL) |
5144 { | |
5145 rest = NULL; | |
5146 break; | |
5147 } | |
5148 ppp->pp_next = pat_ptrs[item]; | |
5149 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
|
5150 ppp->pp_synp = ALLOC_CLEAR_ONE(synpat_T); |
7 | 5151 if (ppp->pp_synp == NULL) |
5152 { | |
5153 rest = NULL; | |
5154 break; | |
5155 } | |
5156 | |
5157 /* | |
5158 * Get the syntax pattern and the following offset(s). | |
5159 */ | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5160 // Enable the appropriate \z specials. |
7 | 5161 if (item == ITEM_START) |
5162 reg_do_extmatch = REX_SET; | |
5163 else if (item == ITEM_SKIP || item == ITEM_END) | |
5164 reg_do_extmatch = REX_USE; | |
5165 rest = get_syn_pattern(rest, ppp->pp_synp); | |
5166 reg_do_extmatch = 0; | |
5167 if (item == ITEM_END && vim_regcomp_had_eol() | |
154 | 5168 && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
7 | 5169 ppp->pp_synp->sp_flags |= HL_HAS_EOL; |
5170 ppp->pp_matchgroup_id = matchgroup_id; | |
5171 ++pat_count; | |
5172 } | |
5173 } | |
5174 vim_free(key); | |
5175 if (illegal || not_enough) | |
5176 rest = NULL; | |
5177 | |
5178 /* | |
5179 * Must have a "start" and "end" pattern. | |
5180 */ | |
5181 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL || | |
5182 pat_ptrs[ITEM_END] == NULL)) | |
5183 { | |
5184 not_enough = TRUE; | |
5185 rest = NULL; | |
5186 } | |
5187 | |
5188 if (rest != NULL) | |
5189 { | |
5190 /* | |
5191 * Check for trailing garbage or command. | |
5192 * If OK, add the item. | |
5193 */ | |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
5194 set_nextcmd(eap, rest); |
7 | 5195 if (!ends_excmd(*rest) || eap->skip) |
5196 rest = NULL; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5197 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL |
7 | 5198 && (syn_id = syn_check_group(arg, |
5199 (int)(group_name_end - arg))) != 0) | |
5200 { | |
154 | 5201 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
7 | 5202 /* |
5203 * Store the start/skip/end in the syn_items list | |
5204 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5205 idx = curwin->w_s->b_syn_patterns.ga_len; |
7 | 5206 for (item = ITEM_START; item <= ITEM_END; ++item) |
5207 { | |
5208 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next) | |
5209 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5210 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
|
5211 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
|
5212 SYN_ITEMS(curwin->w_s)[idx].sp_type = |
7 | 5213 (item == ITEM_START) ? SPTYPE_START : |
5214 (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
|
5215 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
|
5216 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id; |
2743 | 5217 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = |
5218 current_syn_inc_tag; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5219 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id = |
7 | 5220 ppp->pp_matchgroup_id; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5221 #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
|
5222 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
|
5223 #endif |
7 | 5224 if (item == ITEM_START) |
5225 { | |
2250
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_cont_list = |
154 | 5227 syn_opt_arg.cont_list; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5228 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
154 | 5229 syn_opt_arg.cont_in_list; |
5230 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
|
5231 curwin->w_s->b_syn_containedin = TRUE; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5232 SYN_ITEMS(curwin->w_s)[idx].sp_next_list = |
154 | 5233 syn_opt_arg.next_list; |
7 | 5234 } |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5235 ++curwin->w_s->b_syn_patterns.ga_len; |
7 | 5236 ++idx; |
5237 #ifdef FEAT_FOLDING | |
154 | 5238 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
|
5239 ++curwin->w_s->b_syn_folditems; |
7 | 5240 #endif |
5241 } | |
5242 } | |
5243 | |
745 | 5244 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5245 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
|
5246 success = TRUE; // don't free the progs and patterns now |
7 | 5247 } |
5248 } | |
5249 | |
5250 /* | |
5251 * Free the allocated memory. | |
5252 */ | |
5253 for (item = ITEM_START; item <= ITEM_END; ++item) | |
5254 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next) | |
5255 { | |
17907
4cf69f8d1ec6
patch 8.1.1950: using NULL pointer after an out-of-memory
Bram Moolenaar <Bram@vim.org>
parents:
17781
diff
changeset
|
5256 if (!success && ppp->pp_synp != NULL) |
7 | 5257 { |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5258 vim_regfree(ppp->pp_synp->sp_prog); |
7 | 5259 vim_free(ppp->pp_synp->sp_pattern); |
5260 } | |
5261 vim_free(ppp->pp_synp); | |
5262 ppp_next = ppp->pp_next; | |
5263 vim_free(ppp); | |
5264 } | |
5265 | |
5266 if (!success) | |
5267 { | |
154 | 5268 vim_free(syn_opt_arg.cont_list); |
5269 vim_free(syn_opt_arg.cont_in_list); | |
5270 vim_free(syn_opt_arg.next_list); | |
7 | 5271 if (not_enough) |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5272 semsg(_(e_not_enough_arguments_syntax_region_str), arg); |
7 | 5273 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
|
5274 semsg(_(e_invalid_argument_str), arg); |
7 | 5275 } |
5276 } | |
5277 | |
5278 /* | |
5279 * A simple syntax group ID comparison function suitable for use in qsort() | |
5280 */ | |
5281 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5282 syn_compare_stub(const void *v1, const void *v2) |
7 | 5283 { |
5284 const short *s1 = v1; | |
5285 const short *s2 = v2; | |
5286 | |
5287 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0); | |
5288 } | |
5289 | |
5290 /* | |
5291 * Combines lists of syntax clusters. | |
5292 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed. | |
5293 */ | |
5294 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5295 syn_combine_list(short **clstr1, short **clstr2, int list_op) |
7 | 5296 { |
5297 int count1 = 0; | |
5298 int count2 = 0; | |
5299 short *g1; | |
5300 short *g2; | |
5301 short *clstr = NULL; | |
5302 int count; | |
5303 int round; | |
5304 | |
5305 /* | |
5306 * Handle degenerate cases. | |
5307 */ | |
5308 if (*clstr2 == NULL) | |
5309 return; | |
5310 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE) | |
5311 { | |
5312 if (list_op == CLUSTER_REPLACE) | |
5313 vim_free(*clstr1); | |
5314 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD) | |
5315 *clstr1 = *clstr2; | |
5316 else | |
5317 vim_free(*clstr2); | |
5318 return; | |
5319 } | |
5320 | |
5321 for (g1 = *clstr1; *g1; g1++) | |
5322 ++count1; | |
5323 for (g2 = *clstr2; *g2; g2++) | |
5324 ++count2; | |
5325 | |
5326 /* | |
5327 * For speed purposes, sort both lists. | |
5328 */ | |
5329 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub); | |
5330 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub); | |
5331 | |
5332 /* | |
5333 * We proceed in two passes; in round 1, we count the elements to place | |
5334 * in the new list, and in round 2, we allocate and populate the new | |
5335 * list. For speed, we use a mergesort-like method, adding the smaller | |
5336 * of the current elements in each list to the new list. | |
5337 */ | |
5338 for (round = 1; round <= 2; round++) | |
5339 { | |
5340 g1 = *clstr1; | |
5341 g2 = *clstr2; | |
5342 count = 0; | |
5343 | |
5344 /* | |
5345 * First, loop through the lists until one of them is empty. | |
5346 */ | |
5347 while (*g1 && *g2) | |
5348 { | |
5349 /* | |
5350 * We always want to add from the first list. | |
5351 */ | |
5352 if (*g1 < *g2) | |
5353 { | |
5354 if (round == 2) | |
5355 clstr[count] = *g1; | |
5356 count++; | |
5357 g1++; | |
5358 continue; | |
5359 } | |
5360 /* | |
5361 * We only want to add from the second list if we're adding the | |
5362 * lists. | |
5363 */ | |
5364 if (list_op == CLUSTER_ADD) | |
5365 { | |
5366 if (round == 2) | |
5367 clstr[count] = *g2; | |
5368 count++; | |
5369 } | |
5370 if (*g1 == *g2) | |
5371 g1++; | |
5372 g2++; | |
5373 } | |
5374 | |
5375 /* | |
5376 * Now add the leftovers from whichever list didn't get finished | |
5377 * first. As before, we only want to add from the second list if | |
5378 * we're adding the lists. | |
5379 */ | |
5380 for (; *g1; g1++, count++) | |
5381 if (round == 2) | |
5382 clstr[count] = *g1; | |
5383 if (list_op == CLUSTER_ADD) | |
5384 for (; *g2; g2++, count++) | |
5385 if (round == 2) | |
5386 clstr[count] = *g2; | |
5387 | |
5388 if (round == 1) | |
5389 { | |
5390 /* | |
5391 * If the group ended up empty, we don't need to allocate any | |
5392 * space for it. | |
5393 */ | |
5394 if (count == 0) | |
5395 { | |
5396 clstr = NULL; | |
5397 break; | |
5398 } | |
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
|
5399 clstr = ALLOC_MULT(short, count + 1); |
7 | 5400 if (clstr == NULL) |
5401 break; | |
5402 clstr[count] = 0; | |
5403 } | |
5404 } | |
5405 | |
5406 /* | |
5407 * Finally, put the new list in place. | |
5408 */ | |
5409 vim_free(*clstr1); | |
5410 vim_free(*clstr2); | |
5411 *clstr1 = clstr; | |
5412 } | |
5413 | |
5414 /* | |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5415 * Lookup a syntax cluster name and return its ID. |
7 | 5416 * If it is not found, 0 is returned. |
5417 */ | |
5418 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5419 syn_scl_name2id(char_u *name) |
7 | 5420 { |
5421 int i; | |
5422 char_u *name_u; | |
5423 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5424 // Avoid using stricmp() too much, it's slow on some systems |
7 | 5425 name_u = vim_strsave_up(name); |
5426 if (name_u == NULL) | |
5427 return 0; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5428 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
|
5429 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
|
5430 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0) |
7 | 5431 break; |
5432 vim_free(name_u); | |
5433 return (i < 0 ? 0 : i + SYNID_CLUSTER); | |
5434 } | |
5435 | |
5436 /* | |
5437 * Like syn_scl_name2id(), but take a pointer + length argument. | |
5438 */ | |
5439 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5440 syn_scl_namen2id(char_u *linep, int len) |
7 | 5441 { |
5442 char_u *name; | |
5443 int id = 0; | |
5444 | |
5445 name = vim_strnsave(linep, len); | |
5446 if (name != NULL) | |
5447 { | |
5448 id = syn_scl_name2id(name); | |
5449 vim_free(name); | |
5450 } | |
5451 return id; | |
5452 } | |
5453 | |
5454 /* | |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5455 * Find syntax cluster name in the table and return its ID. |
7 | 5456 * The argument is a pointer to the name and the length of the name. |
5457 * If it doesn't exist yet, a new entry is created. | |
5458 * Return 0 for failure. | |
5459 */ | |
5460 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5461 syn_check_cluster(char_u *pp, int len) |
7 | 5462 { |
5463 int id; | |
5464 char_u *name; | |
5465 | |
5466 name = vim_strnsave(pp, len); | |
5467 if (name == NULL) | |
5468 return 0; | |
5469 | |
5470 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
|
5471 if (id == 0) // doesn't exist yet |
7 | 5472 id = syn_add_cluster(name); |
5473 else | |
5474 vim_free(name); | |
5475 return id; | |
5476 } | |
5477 | |
5478 /* | |
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5479 * Add new syntax cluster and return its ID. |
7 | 5480 * "name" must be an allocated string, it will be consumed. |
5481 * Return 0 for failure. | |
5482 */ | |
5483 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5484 syn_add_cluster(char_u *name) |
221 | 5485 { |
5486 int len; | |
7 | 5487 |
5488 /* | |
5489 * First call for this growarray: init growing array. | |
5490 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5491 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
|
5492 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5493 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
|
5494 curwin->w_s->b_syn_clusters.ga_growsize = 10; |
7 | 5495 } |
5496 | |
2743 | 5497 len = curwin->w_s->b_syn_clusters.ga_len; |
5498 if (len >= MAX_CLUSTER_ID) | |
5499 { | |
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26958
diff
changeset
|
5500 emsg(_(e_too_many_syntax_clusters)); |
2743 | 5501 vim_free(name); |
5502 return 0; | |
5503 } | |
5504 | |
7 | 5505 /* |
5506 * Make room for at least one other cluster entry. | |
5507 */ | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5508 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL) |
7 | 5509 { |
5510 vim_free(name); | |
5511 return 0; | |
5512 } | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5513 |
20007
aadd1cae2ff5
patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents:
19934
diff
changeset
|
5514 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
|
5515 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
|
5516 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
|
5517 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
|
5518 ++curwin->w_s->b_syn_clusters.ga_len; |
7 | 5519 |
221 | 5520 if (STRICMP(name, "Spell") == 0) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5521 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER; |
227 | 5522 if (STRICMP(name, "NoSpell") == 0) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5523 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER; |
221 | 5524 |
7 | 5525 return len + SYNID_CLUSTER; |
5526 } | |
5527 | |
5528 /* | |
5529 * Handle ":syntax cluster {cluster-name} [contains={groupname},..] | |
5530 * [add={groupname},..] [remove={groupname},..]". | |
5531 */ | |
5532 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5533 syn_cmd_cluster(exarg_T *eap, int syncing UNUSED) |
7 | 5534 { |
5535 char_u *arg = eap->arg; | |
5536 char_u *group_name_end; | |
5537 char_u *rest; | |
5538 int scl_id; | |
5539 short *clstr_list; | |
5540 int got_clstr = FALSE; | |
5541 int opt_len; | |
5542 int list_op; | |
5543 | |
5544 eap->nextcmd = find_nextcmd(arg); | |
5545 if (eap->skip) | |
5546 return; | |
5547 | |
5548 rest = get_group_name(arg, &group_name_end); | |
5549 | |
5550 if (rest != NULL) | |
5551 { | |
2743 | 5552 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); |
5553 if (scl_id == 0) | |
5554 return; | |
5555 scl_id -= SYNID_CLUSTER; | |
7 | 5556 |
5557 for (;;) | |
5558 { | |
5559 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
|
5560 && (VIM_ISWHITE(rest[3]) || rest[3] == '=')) |
7 | 5561 { |
5562 opt_len = 3; | |
5563 list_op = CLUSTER_ADD; | |
5564 } | |
5565 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
|
5566 && (VIM_ISWHITE(rest[6]) || rest[6] == '=')) |
7 | 5567 { |
5568 opt_len = 6; | |
5569 list_op = CLUSTER_SUBTRACT; | |
5570 } | |
5571 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
|
5572 && (VIM_ISWHITE(rest[8]) || rest[8] == '=')) |
7 | 5573 { |
5574 opt_len = 8; | |
5575 list_op = CLUSTER_REPLACE; | |
5576 } | |
5577 else | |
5578 break; | |
5579 | |
5580 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
|
5581 if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) |
7 | 5582 { |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
5583 semsg(_(e_invalid_argument_str), rest); |
7 | 5584 break; |
5585 } | |
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5586 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
|
5587 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list, |
7 | 5588 &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
|
5589 else |
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
5590 vim_free(clstr_list); |
7 | 5591 got_clstr = TRUE; |
5592 } | |
5593 | |
5594 if (got_clstr) | |
5595 { | |
745 | 5596 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5597 syn_stack_free_all(curwin->w_s); // Need to recompute all. |
7 | 5598 } |
5599 } | |
5600 | |
5601 if (!got_clstr) | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5602 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
|
5603 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
|
5604 semsg(_(e_invalid_argument_str), arg); |
7 | 5605 } |
5606 | |
5607 /* | |
5608 * On first call for current buffer: Init growing array. | |
5609 */ | |
5610 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5611 init_syn_patterns(void) |
7 | 5612 { |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5613 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
|
5614 curwin->w_s->b_syn_patterns.ga_growsize = 10; |
7 | 5615 } |
5616 | |
5617 /* | |
5618 * Get one pattern for a ":syntax match" or ":syntax region" command. | |
5619 * Stores the pattern and program in a synpat_T. | |
5620 * Returns a pointer to the next argument, or NULL in case of an error. | |
5621 */ | |
5622 static char_u * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5623 get_syn_pattern(char_u *arg, synpat_T *ci) |
7 | 5624 { |
5625 char_u *end; | |
5626 int *p; | |
5627 int idx; | |
5628 char_u *cpo_save; | |
5629 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5630 // need at least three chars |
6993 | 5631 if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL) |
7 | 5632 return NULL; |
5633 | |
19892
5feb426d2ea1
patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents:
19181
diff
changeset
|
5634 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
|
5635 if (*end != *arg) // end delimiter not found |
7 | 5636 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5637 semsg(_(e_pattern_delimiter_not_found_str), arg); |
7 | 5638 return NULL; |
5639 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5640 // 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
|
5641 if ((ci->sp_pattern = vim_strnsave(arg + 1, end - arg - 1)) == NULL) |
7 | 5642 return NULL; |
5643 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5644 // Make 'cpoptions' empty, to avoid the 'l' flag |
7 | 5645 cpo_save = p_cpo; |
23493
f8382c4e6551
patch 8.2.2289: Vim9: 'cpo' can become empty
Bram Moolenaar <Bram@vim.org>
parents:
23043
diff
changeset
|
5646 p_cpo = empty_option; |
7 | 5647 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC); |
5648 p_cpo = cpo_save; | |
5649 | |
5650 if (ci->sp_prog == NULL) | |
5651 return NULL; | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5652 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
|
5653 #ifdef FEAT_PROFILE |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5654 syn_clear_time(&ci->sp_time); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5655 #endif |
7 | 5656 |
5657 /* | |
5658 * Check for a match, highlight or region offset. | |
5659 */ | |
5660 ++end; | |
5661 do | |
5662 { | |
5663 for (idx = SPO_COUNT; --idx >= 0; ) | |
5664 if (STRNCMP(end, spo_name_tab[idx], 3) == 0) | |
5665 break; | |
5666 if (idx >= 0) | |
5667 { | |
5668 p = &(ci->sp_offsets[idx]); | |
5669 if (idx != SPO_LC_OFF) | |
5670 switch (end[3]) | |
5671 { | |
5672 case 's': break; | |
5673 case 'b': break; | |
5674 case 'e': idx += SPO_COUNT; break; | |
5675 default: idx = -1; break; | |
5676 } | |
5677 if (idx >= 0) | |
5678 { | |
5679 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
|
5680 if (idx == SPO_LC_OFF) // lc=99 |
7 | 5681 { |
5682 end += 3; | |
5683 *p = getdigits(&end); | |
5684 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5685 // "lc=" offset automatically sets "ms=" offset |
7 | 5686 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF))) |
5687 { | |
5688 ci->sp_off_flags |= (1 << SPO_MS_OFF); | |
5689 ci->sp_offsets[SPO_MS_OFF] = *p; | |
5690 } | |
5691 } | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5692 else // yy=x+99 |
7 | 5693 { |
5694 end += 4; | |
5695 if (*end == '+') | |
5696 { | |
5697 ++end; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5698 *p = getdigits(&end); // positive offset |
7 | 5699 } |
5700 else if (*end == '-') | |
5701 { | |
5702 ++end; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5703 *p = -getdigits(&end); // negative offset |
7 | 5704 } |
5705 } | |
5706 if (*end != ',') | |
5707 break; | |
5708 ++end; | |
5709 } | |
5710 } | |
5711 } while (idx >= 0); | |
5712 | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5713 if (!ends_excmd2(arg, end) && !VIM_ISWHITE(*end)) |
7 | 5714 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5715 semsg(_(e_garbage_after_pattern_str), arg); |
7 | 5716 return NULL; |
5717 } | |
5718 return skipwhite(end); | |
5719 } | |
5720 | |
5721 /* | |
5722 * Handle ":syntax sync .." command. | |
5723 */ | |
5724 static void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5725 syn_cmd_sync(exarg_T *eap, int syncing UNUSED) |
7 | 5726 { |
5727 char_u *arg_start = eap->arg; | |
5728 char_u *arg_end; | |
5729 char_u *key = NULL; | |
5730 char_u *next_arg; | |
5731 int illegal = FALSE; | |
5732 int finished = FALSE; | |
5733 long n; | |
5734 char_u *cpo_save; | |
5735 | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5736 if (ends_excmd2(eap->cmd, arg_start)) |
7 | 5737 { |
5738 syn_cmd_list(eap, TRUE); | |
5739 return; | |
5740 } | |
5741 | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5742 while (!ends_excmd2(eap->cmd, arg_start)) |
7 | 5743 { |
5744 arg_end = skiptowhite(arg_start); | |
5745 next_arg = skipwhite(arg_end); | |
5746 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
|
5747 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
|
5748 if (key == NULL) |
e35955a787a8
patch 8.2.1171: possible crash when out of memory
Bram Moolenaar <Bram@vim.org>
parents:
20830
diff
changeset
|
5749 break; |
7 | 5750 if (STRCMP(key, "CCOMMENT") == 0) |
5751 { | |
5752 if (!eap->skip) | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5753 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
|
5754 if (!ends_excmd2(eap->cmd, next_arg)) |
7 | 5755 { |
5756 arg_end = skiptowhite(next_arg); | |
5757 if (!eap->skip) | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5758 curwin->w_s->b_syn_sync_id = syn_check_group(next_arg, |
7 | 5759 (int)(arg_end - next_arg)); |
5760 next_arg = skipwhite(arg_end); | |
5761 } | |
5762 else if (!eap->skip) | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5763 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment"); |
7 | 5764 } |
5765 else if ( STRNCMP(key, "LINES", 5) == 0 | |
5766 || STRNCMP(key, "MINLINES", 8) == 0 | |
5767 || STRNCMP(key, "MAXLINES", 8) == 0 | |
5768 || STRNCMP(key, "LINEBREAKS", 10) == 0) | |
5769 { | |
5770 if (key[4] == 'S') | |
5771 arg_end = key + 6; | |
5772 else if (key[0] == 'L') | |
5773 arg_end = key + 11; | |
5774 else | |
5775 arg_end = key + 9; | |
5776 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end)) | |
5777 { | |
5778 illegal = TRUE; | |
5779 break; | |
5780 } | |
5781 n = getdigits(&arg_end); | |
5782 if (!eap->skip) | |
5783 { | |
5784 if (key[4] == 'B') | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5785 curwin->w_s->b_syn_sync_linebreaks = n; |
7 | 5786 else if (key[1] == 'A') |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5787 curwin->w_s->b_syn_sync_maxlines = n; |
7 | 5788 else |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5789 curwin->w_s->b_syn_sync_minlines = n; |
7 | 5790 } |
5791 } | |
5792 else if (STRCMP(key, "FROMSTART") == 0) | |
5793 { | |
5794 if (!eap->skip) | |
5795 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5796 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
|
5797 curwin->w_s->b_syn_sync_maxlines = 0; |
7 | 5798 } |
5799 } | |
5800 else if (STRCMP(key, "LINECONT") == 0) | |
5801 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5802 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
|
5803 { |
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5804 illegal = TRUE; |
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5805 break; |
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5806 } |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5807 if (curwin->w_s->b_syn_linecont_pat != NULL) |
7 | 5808 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5809 emsg(_(e_syntax_sync_line_continuations_pattern_specified_twice)); |
7 | 5810 finished = TRUE; |
5811 break; | |
5812 } | |
19892
5feb426d2ea1
patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents:
19181
diff
changeset
|
5813 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
|
5814 if (*arg_end != *next_arg) // end delimiter not found |
7 | 5815 { |
5816 illegal = TRUE; | |
5817 break; | |
5818 } | |
5819 | |
5820 if (!eap->skip) | |
5821 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5822 // 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
|
5823 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
|
5824 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
|
5825 arg_end - next_arg - 1)) == NULL) |
7 | 5826 { |
5827 finished = TRUE; | |
5828 break; | |
5829 } | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5830 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic; |
7 | 5831 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5832 // Make 'cpoptions' empty, to avoid the 'l' flag |
7 | 5833 cpo_save = p_cpo; |
23493
f8382c4e6551
patch 8.2.2289: Vim9: 'cpo' can become empty
Bram Moolenaar <Bram@vim.org>
parents:
23043
diff
changeset
|
5834 p_cpo = empty_option; |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5835 curwin->w_s->b_syn_linecont_prog = |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5836 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); |
7 | 5837 p_cpo = cpo_save; |
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
5838 #ifdef FEAT_PROFILE |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5839 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
|
5840 #endif |
7 | 5841 |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5842 if (curwin->w_s->b_syn_linecont_prog == NULL) |
7 | 5843 { |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
5844 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat); |
7 | 5845 finished = TRUE; |
5846 break; | |
5847 } | |
5848 } | |
5849 next_arg = skipwhite(arg_end + 1); | |
5850 } | |
5851 else | |
5852 { | |
5853 eap->arg = next_arg; | |
5854 if (STRCMP(key, "MATCH") == 0) | |
5855 syn_cmd_match(eap, TRUE); | |
5856 else if (STRCMP(key, "REGION") == 0) | |
5857 syn_cmd_region(eap, TRUE); | |
5858 else if (STRCMP(key, "CLEAR") == 0) | |
5859 syn_cmd_clear(eap, TRUE); | |
5860 else | |
5861 illegal = TRUE; | |
5862 finished = TRUE; | |
5863 break; | |
5864 } | |
5865 arg_start = next_arg; | |
5866 } | |
5867 vim_free(key); | |
5868 if (illegal) | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5869 semsg(_(e_illegal_arguments_str), arg_start); |
7 | 5870 else if (!finished) |
5871 { | |
25521
2063b858cad9
patch 8.2.3297: cannot use all commands inside a {} block
Bram Moolenaar <Bram@vim.org>
parents:
25306
diff
changeset
|
5872 set_nextcmd(eap, arg_start); |
745 | 5873 redraw_curbuf_later(SOME_VALID); |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5874 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax. |
7 | 5875 } |
5876 } | |
5877 | |
5878 /* | |
5879 * Convert a line of highlight group names into a list of group ID numbers. | |
5880 * "arg" should point to the "contains" or "nextgroup" keyword. | |
5881 * "arg" is advanced to after the last group name. | |
5882 * Careful: the argument is modified (NULs added). | |
5883 * returns FAIL for some error, OK for success. | |
5884 */ | |
5885 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5886 get_id_list( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5887 char_u **arg, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5888 int keylen, // length of keyword |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5889 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
|
5890 // 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
|
5891 int skip) |
7 | 5892 { |
5893 char_u *p = NULL; | |
5894 char_u *end; | |
5895 int round; | |
5896 int count; | |
5897 int total_count = 0; | |
5898 short *retval = NULL; | |
5899 char_u *name; | |
5900 regmatch_T regmatch; | |
5901 int id; | |
5902 int i; | |
5903 int failed = FALSE; | |
5904 | |
5905 /* | |
5906 * We parse the list twice: | |
5907 * round == 1: count the number of items, allocate the array. | |
5908 * round == 2: fill the array with the items. | |
5909 * In round 1 new groups may be added, causing the number of items to | |
5910 * grow when a regexp is used. In that case round 1 is done once again. | |
5911 */ | |
5912 for (round = 1; round <= 2; ++round) | |
5913 { | |
5914 /* | |
5915 * skip "contains" | |
5916 */ | |
5917 p = skipwhite(*arg + keylen); | |
5918 if (*p != '=') | |
5919 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5920 semsg(_(e_missing_equal_sign_str), *arg); |
7 | 5921 break; |
5922 } | |
5923 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
|
5924 if (ends_excmd2(*arg, p)) |
7 | 5925 { |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5926 semsg(_(e_empty_argument_str), *arg); |
7 | 5927 break; |
5928 } | |
5929 | |
5930 /* | |
5931 * parse the arguments after "contains" | |
5932 */ | |
5933 count = 0; | |
20116
513c62184ed8
patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents:
20007
diff
changeset
|
5934 while (!ends_excmd2(*arg, p)) |
7 | 5935 { |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5936 for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end) |
7 | 5937 ; |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
5938 name = alloc(end - p + 3); // leave room for "^$" |
7 | 5939 if (name == NULL) |
5940 { | |
5941 failed = TRUE; | |
5942 break; | |
5943 } | |
419 | 5944 vim_strncpy(name + 1, p, end - p); |
7 | 5945 if ( STRCMP(name + 1, "ALLBUT") == 0 |
5946 || STRCMP(name + 1, "ALL") == 0 | |
5947 || STRCMP(name + 1, "TOP") == 0 | |
5948 || STRCMP(name + 1, "CONTAINED") == 0) | |
5949 { | |
5950 if (TOUPPER_ASC(**arg) != 'C') | |
5951 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5952 semsg(_(e_str_not_allowed_here), name + 1); |
7 | 5953 failed = TRUE; |
5954 vim_free(name); | |
5955 break; | |
5956 } | |
5957 if (count != 0) | |
5958 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
5959 semsg(_(e_str_must_be_first_in_contains_list), name + 1); |
7 | 5960 failed = TRUE; |
5961 vim_free(name); | |
5962 break; | |
5963 } | |
5964 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
|
5965 id = SYNID_ALLBUT + current_syn_inc_tag; |
7 | 5966 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
|
5967 { |
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5968 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
|
5969 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
|
5970 else |
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5971 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
|
5972 } |
7 | 5973 else |
24442
d16a69f718b5
patch 8.2.2761: using "syn include" does not work properly
Bram Moolenaar <Bram@vim.org>
parents:
23493
diff
changeset
|
5974 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
|
5975 |
7 | 5976 } |
5977 else if (name[1] == '@') | |
5978 { | |
10629
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5979 if (skip) |
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5980 id = -1; |
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
5981 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
|
5982 id = syn_check_cluster(name + 2, (int)(end - p - 1)); |
7 | 5983 } |
5984 else | |
5985 { | |
5986 /* | |
5987 * Handle full group name. | |
5988 */ | |
5989 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL) | |
5990 id = syn_check_group(name + 1, (int)(end - p)); | |
5991 else | |
5992 { | |
5993 /* | |
5994 * Handle match of regexp with group names. | |
5995 */ | |
5996 *name = '^'; | |
5997 STRCAT(name, "$"); | |
5998 regmatch.regprog = vim_regcomp(name, RE_MAGIC); | |
5999 if (regmatch.regprog == NULL) | |
6000 { | |
6001 failed = TRUE; | |
6002 vim_free(name); | |
6003 break; | |
6004 } | |
6005 | |
6006 regmatch.rm_ic = TRUE; | |
6007 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
|
6008 for (i = highlight_num_groups(); --i >= 0; ) |
7 | 6009 { |
17401
5462bb963075
patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents:
17389
diff
changeset
|
6010 if (vim_regexec(®match, highlight_group_name(i), |
7 | 6011 (colnr_T)0)) |
6012 { | |
6013 if (round == 2) | |
6014 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6015 // 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
|
6016 // when adding items that match: |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6017 // "contains=a.*b,axb". |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6018 // Go back to first round |
7 | 6019 if (count >= total_count) |
6020 { | |
6021 vim_free(retval); | |
6022 round = 1; | |
6023 } | |
6024 else | |
6025 retval[count] = i + 1; | |
6026 } | |
6027 ++count; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6028 id = -1; // remember that we found one |
7 | 6029 } |
6030 } | |
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
6031 vim_regfree(regmatch.regprog); |
7 | 6032 } |
6033 } | |
6034 vim_free(name); | |
6035 if (id == 0) | |
6036 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
6037 semsg(_(e_unknown_group_name_str), p); |
7 | 6038 failed = TRUE; |
6039 break; | |
6040 } | |
6041 if (id > 0) | |
6042 { | |
6043 if (round == 2) | |
6044 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6045 // Got more items than expected, go back to first round |
7 | 6046 if (count >= total_count) |
6047 { | |
6048 vim_free(retval); | |
6049 round = 1; | |
6050 } | |
6051 else | |
6052 retval[count] = id; | |
6053 } | |
6054 ++count; | |
6055 } | |
6056 p = skipwhite(end); | |
6057 if (*p != ',') | |
6058 break; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6059 p = skipwhite(p + 1); // skip comma in between arguments |
7 | 6060 } |
6061 if (failed) | |
6062 break; | |
6063 if (round == 1) | |
6064 { | |
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
|
6065 retval = ALLOC_MULT(short, count + 1); |
7 | 6066 if (retval == NULL) |
6067 break; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6068 retval[count] = 0; // zero means end of the list |
7 | 6069 total_count = count; |
6070 } | |
6071 } | |
6072 | |
6073 *arg = p; | |
6074 if (failed || retval == NULL) | |
6075 { | |
6076 vim_free(retval); | |
6077 return FAIL; | |
6078 } | |
6079 | |
6080 if (*list == NULL) | |
6081 *list = retval; | |
6082 else | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6083 vim_free(retval); // list already found, don't overwrite it |
7 | 6084 |
6085 return OK; | |
6086 } | |
6087 | |
6088 /* | |
6089 * Make a copy of an ID list. | |
6090 */ | |
6091 static short * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6092 copy_id_list(short *list) |
7 | 6093 { |
6094 int len; | |
6095 int count; | |
6096 short *retval; | |
6097 | |
6098 if (list == NULL) | |
6099 return NULL; | |
6100 | |
6101 for (count = 0; list[count]; ++count) | |
6102 ; | |
6103 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
|
6104 retval = alloc(len); |
7 | 6105 if (retval != NULL) |
6106 mch_memmove(retval, list, (size_t)len); | |
6107 | |
6108 return retval; | |
6109 } | |
6110 | |
6111 /* | |
6112 * Check if syntax group "ssp" is in the ID list "list" of "cur_si". | |
6113 * "cur_si" can be NULL if not checking the "containedin" list. | |
6114 * Used to check if a syntax item is in the "contains" or "nextgroup" list of | |
6115 * the current item. | |
6116 * This function is called very often, keep it fast!! | |
6117 */ | |
6118 static int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6119 in_id_list( |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6120 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
|
6121 short *list, // id list |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6122 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
|
6123 int contained) // group id is contained |
7 | 6124 { |
6125 int retval; | |
6126 short *scl_list; | |
6127 short item; | |
6128 short id = ssp->id; | |
6129 static int depth = 0; | |
6130 int r; | |
6131 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6132 // If ssp has a "containedin" list and "cur_si" is in it, return TRUE. |
36 | 6133 if (cur_si != NULL && ssp->cont_in_list != NULL |
6134 && !(cur_si->si_flags & HL_MATCH)) | |
7 | 6135 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6136 // 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
|
6137 // that we don't go back past the first one. |
7 | 6138 while ((cur_si->si_flags & HL_TRANS_CONT) |
6139 && cur_si > (stateitem_T *)(current_state.ga_data)) | |
6140 --cur_si; | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6141 // cur_si->si_idx is -1 for keywords, these never contain anything. |
7 | 6142 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
|
6143 &(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
|
6144 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED)) |
7 | 6145 return TRUE; |
6146 } | |
6147 | |
6148 if (list == NULL) | |
6149 return FALSE; | |
6150 | |
6151 /* | |
6152 * If list is ID_LIST_ALL, we are in a transparent item that isn't | |
6153 * inside anything. Only allow not-contained groups. | |
6154 */ | |
6155 if (list == ID_LIST_ALL) | |
6156 return !contained; | |
6157 | |
6158 /* | |
6159 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the | |
6160 * contains list. We also require that "id" is at the same ":syn include" | |
6161 * level as the list. | |
6162 */ | |
6163 item = *list; | |
6164 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) | |
6165 { | |
6166 if (item < SYNID_TOP) | |
6167 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6168 // ALL or ALLBUT: accept all groups in the same file |
7 | 6169 if (item - SYNID_ALLBUT != ssp->inc_tag) |
6170 return FALSE; | |
6171 } | |
6172 else if (item < SYNID_CONTAINED) | |
6173 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6174 // TOP: accept all not-contained groups in the same file |
7 | 6175 if (item - SYNID_TOP != ssp->inc_tag || contained) |
6176 return FALSE; | |
6177 } | |
6178 else | |
6179 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6180 // CONTAINED: accept all contained groups in the same file |
7 | 6181 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) |
6182 return FALSE; | |
6183 } | |
6184 item = *++list; | |
6185 retval = FALSE; | |
6186 } | |
6187 else | |
6188 retval = TRUE; | |
6189 | |
6190 /* | |
6191 * Return "retval" if id is in the contains list. | |
6192 */ | |
6193 while (item != 0) | |
6194 { | |
6195 if (item == id) | |
6196 return retval; | |
6197 if (item >= SYNID_CLUSTER) | |
6198 { | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6199 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
|
6200 // 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
|
6201 // cluster that includes itself (indirectly) |
7 | 6202 if (scl_list != NULL && depth < 30) |
6203 { | |
6204 ++depth; | |
6205 r = in_id_list(NULL, scl_list, ssp, contained); | |
6206 --depth; | |
6207 if (r) | |
6208 return retval; | |
6209 } | |
6210 } | |
6211 item = *++list; | |
6212 } | |
6213 return !retval; | |
6214 } | |
6215 | |
6216 struct subcommand | |
6217 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6218 char *name; // subcommand name |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6219 void (*func)(exarg_T *, int); // function to call |
7 | 6220 }; |
6221 | |
6222 static struct subcommand subcommands[] = | |
6223 { | |
6224 {"case", syn_cmd_case}, | |
6225 {"clear", syn_cmd_clear}, | |
6226 {"cluster", syn_cmd_cluster}, | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6227 {"conceal", syn_cmd_conceal}, |
7 | 6228 {"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
|
6229 {"foldlevel", syn_cmd_foldlevel}, |
7 | 6230 {"include", syn_cmd_include}, |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6231 {"iskeyword", syn_cmd_iskeyword}, |
7 | 6232 {"keyword", syn_cmd_keyword}, |
6233 {"list", syn_cmd_list}, | |
6234 {"manual", syn_cmd_manual}, | |
6235 {"match", syn_cmd_match}, | |
6236 {"on", syn_cmd_on}, | |
6237 {"off", syn_cmd_off}, | |
6238 {"region", syn_cmd_region}, | |
6239 {"reset", syn_cmd_reset}, | |
419 | 6240 {"spell", syn_cmd_spell}, |
7 | 6241 {"sync", syn_cmd_sync}, |
6242 {"", syn_cmd_list}, | |
6243 {NULL, NULL} | |
6244 }; | |
6245 | |
6246 /* | |
6247 * ":syntax". | |
6248 * This searches the subcommands[] table for the subcommand name, and calls a | |
6249 * syntax_subcommand() function to do the rest. | |
6250 */ | |
6251 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6252 ex_syntax(exarg_T *eap) |
7 | 6253 { |
6254 char_u *arg = eap->arg; | |
6255 char_u *subcmd_end; | |
6256 char_u *subcmd_name; | |
6257 int i; | |
6258 | |
6259 syn_cmdlinep = eap->cmdlinep; | |
6260 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6261 // isolate subcommand name |
7 | 6262 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end) |
6263 ; | |
20830
9064044fd4f6
patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents:
20751
diff
changeset
|
6264 subcmd_name = vim_strnsave(arg, subcmd_end - arg); |
7 | 6265 if (subcmd_name != NULL) |
6266 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6267 if (eap->skip) // skip error messages for all subcommands |
7 | 6268 ++emsg_skip; |
6269 for (i = 0; ; ++i) | |
6270 { | |
6271 if (subcommands[i].name == NULL) | |
6272 { | |
26913
d4e61d61afd9
patch 8.2.3985: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
6273 semsg(_(e_invalid_syntax_subcommand_str), subcmd_name); |
7 | 6274 break; |
6275 } | |
6276 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0) | |
6277 { | |
6278 eap->arg = skipwhite(subcmd_end); | |
6279 (subcommands[i].func)(eap, FALSE); | |
6280 break; | |
6281 } | |
6282 } | |
6283 vim_free(subcmd_name); | |
6284 if (eap->skip) | |
6285 --emsg_skip; | |
6286 } | |
6287 } | |
6288 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6289 void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6290 ex_ownsyntax(exarg_T *eap) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6291 { |
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6292 char_u *old_value; |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6293 char_u *new_value; |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6294 |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6295 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
|
6296 { |
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
|
6297 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
|
6298 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
|
6299 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
|
6300 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
|
6301 #ifdef FEAT_SPELL |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6302 // 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
|
6303 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
|
6304 // 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
|
6305 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
|
6306 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
|
6307 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
|
6308 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
|
6309 #endif |
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6310 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
|
6311 } |
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6312 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6313 // save value of b:current_syntax |
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6314 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
|
6315 if (old_value != NULL) |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6316 old_value = vim_strsave(old_value); |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6317 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6318 // 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
|
6319 // file. |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6320 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
|
6321 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6322 // 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
|
6323 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
|
6324 if (new_value != NULL) |
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6325 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
|
6326 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6327 // restore value of b:current_syntax |
2256
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6328 if (old_value == NULL) |
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6329 do_unlet((char_u *)"b:current_syntax", TRUE); |
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6330 else |
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6331 { |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6332 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
|
6333 vim_free(old_value); |
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6334 } |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6335 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6336 |
7 | 6337 int |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6338 syntax_present(win_T *win) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6339 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6340 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
|
6341 || 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
|
6342 || 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
|
6343 || win->w_s->b_keywtab_ic.ht_used > 0); |
7 | 6344 } |
6345 | |
6346 | |
6347 static enum | |
6348 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6349 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
|
6350 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
|
6351 EXP_SPELL, // expand ":syn spell" arguments |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6352 EXP_SYNC // expand ":syn sync" arguments |
7 | 6353 } expand_what; |
6354 | |
1322 | 6355 /* |
6356 * Reset include_link, include_default, include_none to 0. | |
6357 * Called when we are done expanding. | |
6358 */ | |
6359 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6360 reset_expand_highlight(void) |
1322 | 6361 { |
6362 include_link = include_default = include_none = 0; | |
6363 } | |
6364 | |
6365 /* | |
6366 * Handle command line completion for :match and :echohl command: Add "None" | |
6367 * as highlight group. | |
6368 */ | |
6369 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6370 set_context_in_echohl_cmd(expand_T *xp, char_u *arg) |
1322 | 6371 { |
6372 xp->xp_context = EXPAND_HIGHLIGHT; | |
6373 xp->xp_pattern = arg; | |
6374 include_none = 1; | |
6375 } | |
7 | 6376 |
6377 /* | |
6378 * Handle command line completion for :syntax command. | |
6379 */ | |
6380 void | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6381 set_context_in_syntax_cmd(expand_T *xp, char_u *arg) |
7 | 6382 { |
6383 char_u *p; | |
6384 | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6385 // Default: expand subcommands |
7 | 6386 xp->xp_context = EXPAND_SYNTAX; |
6387 expand_what = EXP_SUBCMD; | |
6388 xp->xp_pattern = arg; | |
1322 | 6389 include_link = 0; |
6390 include_default = 0; | |
7 | 6391 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6392 // (part of) subcommand already typed |
7 | 6393 if (*arg != NUL) |
6394 { | |
6395 p = skiptowhite(arg); | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6396 if (*p != NUL) // past first word |
7 | 6397 { |
6398 xp->xp_pattern = skipwhite(p); | |
6399 if (*skiptowhite(xp->xp_pattern) != NUL) | |
6400 xp->xp_context = EXPAND_NOTHING; | |
6401 else if (STRNICMP(arg, "case", p - arg) == 0) | |
6402 expand_what = EXP_CASE; | |
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6403 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
|
6404 expand_what = EXP_SPELL; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6405 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
|
6406 expand_what = EXP_SYNC; |
7 | 6407 else if ( STRNICMP(arg, "keyword", p - arg) == 0 |
6408 || STRNICMP(arg, "region", p - arg) == 0 | |
6409 || STRNICMP(arg, "match", p - arg) == 0 | |
6410 || STRNICMP(arg, "list", p - arg) == 0) | |
6411 xp->xp_context = EXPAND_HIGHLIGHT; | |
6412 else | |
6413 xp->xp_context = EXPAND_NOTHING; | |
6414 } | |
6415 } | |
6416 } | |
6417 | |
6418 /* | |
6419 * Function given to ExpandGeneric() to obtain the list syntax names for | |
6420 * expansion. | |
6421 */ | |
6422 char_u * | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6423 get_syntax_name(expand_T *xp UNUSED, int idx) |
7 | 6424 { |
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6425 switch (expand_what) |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6426 { |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6427 case EXP_SUBCMD: |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6428 return (char_u *)subcommands[idx].name; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6429 case EXP_CASE: |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6430 { |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6431 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
|
6432 return (char_u *)case_args[idx]; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6433 } |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6434 case EXP_SPELL: |
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 static char *spell_args[] = |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6437 {"toplevel", "notoplevel", "default", NULL}; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6438 return (char_u *)spell_args[idx]; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6439 } |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6440 case EXP_SYNC: |
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 static char *sync_args[] = |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6443 {"ccomment", "clear", "fromstart", |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6444 "linebreaks=", "linecont", "lines=", "match", |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6445 "maxlines=", "minlines=", "region", NULL}; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6446 return (char_u *)sync_args[idx]; |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6447 } |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6448 } |
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6449 return NULL; |
7 | 6450 } |
6451 | |
6452 | |
6453 /* | |
6454 * Function called for expression evaluation: get syntax ID at file position. | |
6455 */ | |
6456 int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6457 syn_get_id( |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6458 win_T *wp, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6459 long lnum, |
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6460 colnr_T col, |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6461 int trans, // remove transparency |
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6462 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
|
6463 int keep_state) // keep state of char at "col" |
7 | 6464 { |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6465 // 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
|
6466 // 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
|
6467 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
|
6468 || wp->w_buffer != syn_buf |
7 | 6469 || lnum != current_lnum |
253 | 6470 || col < current_col) |
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6471 syntax_start(wp, lnum); |
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6472 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
|
6473 && lnum == current_lnum |
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6474 && col > current_col) |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6475 // 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
|
6476 // "skip" expression in searchpair() |
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6477 next_match_idx = -1; |
7 | 6478 |
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6479 (void)get_syntax_attr(col, spellp, keep_state); |
7 | 6480 |
6481 return (trans ? current_trans_id : current_id); | |
6482 } | |
6483 | |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6484 #if defined(FEAT_CONCEAL) || defined(PROTO) |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6485 /* |
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6486 * 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
|
6487 * 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
|
6488 * 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
|
6489 * 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
|
6490 */ |
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6491 int |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6492 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
|
6493 { |
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
|
6494 *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
|
6495 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
|
6496 } |
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6497 |
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6498 /* |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6499 * Return conceal substitution character |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6500 */ |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6501 int |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6502 syn_get_sub_char(void) |
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6503 { |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6504 return current_sub_char; |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6505 } |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6506 #endif |
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6507 |
1500 | 6508 #if defined(FEAT_EVAL) || defined(PROTO) |
6509 /* | |
6510 * Return the syntax ID at position "i" in the current stack. | |
6511 * The caller must have called syn_get_id() before to fill the stack. | |
6512 * Returns -1 when "i" is out of range. | |
6513 */ | |
6514 int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6515 syn_get_stack_item(int i) |
1500 | 6516 { |
1504 | 6517 if (i >= current_state.ga_len) |
6518 { | |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6519 // 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
|
6520 // for the last character, "keep_state" was TRUE. |
1504 | 6521 invalidate_current_state(); |
6522 current_col = MAXCOL; | |
1500 | 6523 return -1; |
1504 | 6524 } |
1500 | 6525 return CUR_STATE(i).si_id; |
6526 } | |
6527 #endif | |
6528 | |
7 | 6529 #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
|
6530 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
|
6531 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
|
6532 { |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6533 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
|
6534 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
|
6535 |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6536 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
|
6537 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
|
6538 ++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
|
6539 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
|
6540 } |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6541 |
7 | 6542 /* |
6543 * Function called to get folding level for line "lnum" in window "wp". | |
6544 */ | |
6545 int | |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6546 syn_get_foldlevel(win_T *wp, long lnum) |
7 | 6547 { |
6548 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
|
6549 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
|
6550 int cur_level; |
7 | 6551 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6552 // 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
|
6553 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
|
6554 && !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
|
6555 # 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
|
6556 && !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
|
6557 # endif |
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6558 ) |
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6559 { |
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6560 syntax_start(wp, lnum); |
7 | 6561 |
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 // 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
|
6563 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
|
6564 |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6565 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
|
6566 { |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6567 // 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
|
6568 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
|
6569 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
|
6570 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
|
6571 { |
99b6e6bf48bf
patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents:
20116
diff
changeset
|
6572 (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
|
6573 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
|
6574 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
|
6575 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
|
6576 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
|
6577 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
|
6578 ++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
|
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 } |
7 | 6581 } |
6582 if (level > wp->w_p_fdn) | |
1028 | 6583 { |
7 | 6584 level = wp->w_p_fdn; |
1028 | 6585 if (level < 0) |
6586 level = 0; | |
6587 } | |
7 | 6588 return level; |
6589 } | |
6590 #endif | |
6591 | |
6567 | 6592 #if defined(FEAT_PROFILE) || defined(PROTO) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6593 /* |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6594 * ":syntime". |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6595 */ |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6596 void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6597 ex_syntime(exarg_T *eap) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6598 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6599 if (STRCMP(eap->arg, "on") == 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6600 syn_time_on = TRUE; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6601 else if (STRCMP(eap->arg, "off") == 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6602 syn_time_on = FALSE; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6603 else if (STRCMP(eap->arg, "clear") == 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6604 syntime_clear(); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6605 else if (STRCMP(eap->arg, "report") == 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6606 syntime_report(); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6607 else |
26865
bce848ec8b1b
patch 8.2.3961: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26199
diff
changeset
|
6608 semsg(_(e_invalid_argument_str), eap->arg); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6609 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6610 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6611 static void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6612 syn_clear_time(syn_time_T *st) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6613 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6614 profile_zero(&st->total); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6615 profile_zero(&st->slowest); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6616 st->count = 0; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6617 st->match = 0; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6618 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6619 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6620 /* |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6621 * Clear the syntax timing for the current buffer. |
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 static void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6624 syntime_clear(void) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6625 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6626 int idx; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6627 synpat_T *spp; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6628 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6629 if (!syntax_present(curwin)) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6630 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6631 msg(_(msg_no_items)); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6632 return; |
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 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
|
6635 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6636 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6637 syn_clear_time(&spp->sp_time); |
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 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6640 |
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6641 /* |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6642 * 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
|
6643 * ":syntime {on,off,clear,report}" command. |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6644 */ |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6645 char_u * |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6646 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
|
6647 { |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6648 switch (idx) |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6649 { |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6650 case 0: return (char_u *)"on"; |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6651 case 1: return (char_u *)"off"; |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6652 case 2: return (char_u *)"clear"; |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6653 case 3: return (char_u *)"report"; |
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 return NULL; |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6656 } |
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6657 |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6658 typedef struct |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6659 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6660 proftime_T total; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6661 int count; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6662 int match; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6663 proftime_T slowest; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6664 proftime_T average; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6665 int id; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6666 char_u *pattern; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6667 } time_entry_T; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6668 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6669 static int |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6670 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
|
6671 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6672 const time_entry_T *s1 = v1; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6673 const time_entry_T *s2 = v2; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6674 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6675 return profile_cmp(&s1->total, &s2->total); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6676 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6677 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6678 /* |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6679 * Clear the syntax timing for the current buffer. |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6680 */ |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6681 static void |
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6682 syntime_report(void) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6683 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6684 int idx; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6685 synpat_T *spp; |
22991
cb7df44afe7e
patch 8.2.2042: build failure with +profile but without +reltime
Bram Moolenaar <Bram@vim.org>
parents:
22928
diff
changeset
|
6686 # if defined(FEAT_RELTIME) && defined(FEAT_FLOAT) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6687 proftime_T tm; |
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6688 # endif |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6689 int len; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6690 proftime_T total_total; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6691 int total_count = 0; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6692 garray_T ga; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6693 time_entry_T *p; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6694 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6695 if (!syntax_present(curwin)) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6696 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6697 msg(_(msg_no_items)); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6698 return; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6699 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6700 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6701 ga_init2(&ga, sizeof(time_entry_T), 50); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6702 profile_zero(&total_total); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6703 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
|
6704 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6705 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6706 if (spp->sp_time.count > 0) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6707 { |
7009 | 6708 (void)ga_grow(&ga, 1); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6709 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
|
6710 p->total = spp->sp_time.total; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6711 profile_add(&total_total, &spp->sp_time.total); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6712 p->count = spp->sp_time.count; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6713 p->match = spp->sp_time.match; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6714 total_count += spp->sp_time.count; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6715 p->slowest = spp->sp_time.slowest; |
22991
cb7df44afe7e
patch 8.2.2042: build failure with +profile but without +reltime
Bram Moolenaar <Bram@vim.org>
parents:
22928
diff
changeset
|
6716 # if defined(FEAT_RELTIME) && defined(FEAT_FLOAT) |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6717 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
|
6718 p->average = tm; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6719 # endif |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6720 p->id = spp->sp_syn.id; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6721 p->pattern = spp->sp_pattern; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6722 ++ga.ga_len; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6723 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6724 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6725 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6726 // 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
|
6727 // pointer to qsort(). |
10530
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6728 if (ga.ga_len > 1) |
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6729 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
|
6730 syn_compare_syntime); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6731 |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6732 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
|
6733 msg_puts("\n"); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6734 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
|
6735 { |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6736 p = ((time_entry_T *)ga.ga_data) + idx; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6737 |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6738 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
|
6739 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
|
6740 msg_advance(13); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6741 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
|
6742 msg_puts(" "); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6743 msg_advance(20); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6744 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
|
6745 msg_puts(" "); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6746 msg_advance(26); |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6747 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
|
6748 msg_puts(" "); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6749 msg_advance(38); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6750 # ifdef FEAT_FLOAT |
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->average)); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6752 msg_puts(" "); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6753 # endif |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6754 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
|
6755 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
|
6756 msg_puts(" "); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6757 |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6758 msg_advance(69); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6759 if (Columns < 80) |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6760 len = 20; // will wrap anyway |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6761 else |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6762 len = Columns - 70; |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6763 if (len > (int)STRLEN(p->pattern)) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6764 len = (int)STRLEN(p->pattern); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6765 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
|
6766 msg_puts("\n"); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6767 } |
4791
65cef998f860
updated for version 7.3.1142
Bram Moolenaar <bram@vim.org>
parents:
4776
diff
changeset
|
6768 ga_clear(&ga); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6769 if (!got_int) |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6770 { |
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6771 msg_puts("\n"); |
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
6772 msg_puts(profile_msg(&total_total)); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6773 msg_advance(13); |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6774 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
|
6775 msg_puts("\n"); |
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6776 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6777 } |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6778 #endif |
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6779 |
18814
7e7ec935e7c8
patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
17907
diff
changeset
|
6780 #endif // FEAT_SYN_HL |