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