annotate src/syntax.c @ 21788:acd6c7f8b633

Added tag v8.2.1443 for changeset 837e6a429950e6d4eb6ab657e01379306bdc694d
author Bram Moolenaar <Bram@vim.org>
date Thu, 13 Aug 2020 21:45:06 +0200
parents e35955a787a8
children a6af570dad75
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 * syntax.c: code for syntax highlighting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 #if defined(FEAT_SYN_HL) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 #define SPO_COUNT 7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 static char *(spo_name_tab[SPO_COUNT]) =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 {"ms=", "me=", "hs=", "he=", "rs=", "re=", "lc="};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32
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
33 static char e_illegal_arg[] = N_("E390: Illegal argument: %s");
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
34
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 * The patterns that are being searched for are stored in a syn_pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 * A match item consists of one pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 * A start/end item consists of n start patterns and m end patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 * A start/skip/end item consists of n start patterns, one skip pattern and m
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 * end patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 * For the latter two, the patterns are always consecutive: start-skip-end.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 * A character offset can be given for the matched text (_m_start and _m_end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 * 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
45 *
b4e7082de11d patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents: 13314
diff changeset
46 * Note that ordering of members is optimized to reduce padding.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 typedef struct syn_pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
50 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
51 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
52 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
53 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
54 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
55 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
56 #ifdef FEAT_CONCEAL
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
57 int sp_cchar; // conceal substitute character
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
58 #endif
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
59 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
60 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
61 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
62 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
63 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
64 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
65 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
66 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
67 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
68 #ifdef FEAT_PROFILE
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
69 syn_time_T sp_time;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
70 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
71 } synpat_T;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
72
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
73 // 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
74 // 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
75 // 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
76 // 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
77
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
78 #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
79 #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
80 #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
81 #define SPTYPE_SKIP 4 // match a regexp, skip within item
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
84 #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
85
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
86 #define NONE_IDX -2 // value of sp_sync_idx for "NONE"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
87
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89 * Flags for b_syn_sync_flags:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
90 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
91 #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
92 #define SF_MATCH 0x02 // sync by matching a pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 #define SYN_STATE_P(ssp) ((bufstate_T *)((ssp)->ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
96 #define MAXKEYWLEN 80 // maximum length of a keyword
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99 * The attributes of the syntax item that has been recognized.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
101 static int current_attr = 0; // attr of current syntax word
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 #ifdef FEAT_EVAL
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
103 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
104 static int current_trans_id = 0; // idem, transparency removed
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
105 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
106 #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
107 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
108 static int current_seqnr = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
109 static int current_sub_char = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
110 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
112 typedef struct syn_cluster_S
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
114 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
115 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
116 short *scl_list; // IDs in this syntax cluster
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
117 } syn_cluster_T;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
119 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 * Methods of combining two clusters
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
122 #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
123 #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
124 #define CLUSTER_SUBTRACT 3 // subtract second list from first
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
126 #define SYN_CLSTR(buf) ((syn_cluster_T *)((buf)->b_syn_clusters.ga_data))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 * Syntax group IDs have different types:
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
130 * 0 - 19999 normal syntax groups
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
131 * 20000 - 20999 ALLBUT indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
132 * 21000 - 21999 TOP indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
133 * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
134 * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
135 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
136 #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
137 #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
138 #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
139 #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
140
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
141 #define MAX_SYN_INC_TAG 999 // maximum before the above overflow
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
142 #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
145 * Annoying Hack(TM): ":syn include" needs this pointer to pass to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146 * expand_filename(). Most of the other syntax commands don't need it, so
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 * instead of passing it to them, we stow it here.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
149 static char_u **syn_cmdlinep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
150
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
151 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
152 * 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
153 * files from leaking into ALLBUT lists, we assign a unique ID to the
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 * rules in each ":syn include"'d file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
155 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
156 static int current_syn_inc_tag = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157 static int running_syn_inc_tag = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
158
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
159 /*
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
160 * In a hashtable item "hi_key" points to "keyword" in a keyentry.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
161 * This avoids adding a pointer to the hashtable item.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
162 * KE2HIKEY() converts a var pointer to a hashitem key pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
163 * HIKEY2KE() converts a hashitem key pointer to a var pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
164 * HI2KE() converts a hashitem pointer to a var pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
165 */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
166 static keyentry_T dumkey;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
167 #define KE2HIKEY(kp) ((kp)->keyword)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
168 #define HIKEY2KE(p) ((keyentry_T *)((p) - (dumkey.keyword - (char_u *)&dumkey)))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
169 #define HI2KE(hi) HIKEY2KE((hi)->hi_key)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
170
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
171 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
172 * To reduce the time spent in keepend(), remember at which level in the state
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
173 * stack the first item with "keepend" is present. When "-1", there is no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 * "keepend" on the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
176 static int keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
178 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
179
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
180 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
181 * For the current state we need to remember more than just the idx.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
182 * When si_m_endpos.lnum is 0, the items other than si_idx are unknown.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
183 * (The end positions have the column number of the next char)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
184 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
185 typedef struct state_item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
186 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
187 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
188 // KEYWORD_IDX
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
189 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
190 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
191 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
192 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
193 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
194 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
195 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
196 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
197 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
198 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
199 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
200 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
201 // HL_SKIP* for si_next_list
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
202 #ifdef FEAT_CONCEAL
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
203 int si_seqnr; // sequence number
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
204 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
205 #endif
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
206 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
207 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
208 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
209 // pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
210 } stateitem_T;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
211
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
212 #define KEYWORD_IDX -1 // value of si_idx for keywords
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
213 #define ID_LIST_ALL (short *)-1 // valid of si_cont_list for containing all
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
214 // but contained groups
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
215
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 #ifdef FEAT_CONCEAL
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
217 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
218 #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
219
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
220 /*
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
221 * Struct to reduce the number of arguments to get_syn_options(), it's used
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
222 * very often.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
223 */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
224 typedef struct
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
225 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
226 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
227 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
228 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
229 // if not allowed
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
230 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
231 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
232 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
233 short *next_list; // group IDs for "nextgroup" argument
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
234 } syn_opt_arg_T;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
235
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
236 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
237 * The next possible match in the current line for any pattern is remembered,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
238 * to avoid having to try for a match in each column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
239 * If next_match_idx == -1, not tried (in this line) yet.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240 * If next_match_col == MAXCOL, no match found in this line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 * (All end positions have the column of the char after the end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
243 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
244 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
245 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
246 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
247 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
248 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
249 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
250 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
251 static int next_match_end_idx; // ID of group for end pattn or zero
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252 static reg_extmatch_T *next_match_extmatch = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
254 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
255 * 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
256 * garray_T. A state stack is invalid if its itemsize entry is zero.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
257 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
258 #define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
259 #define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
260
19934
3ff714d765ba patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents: 19892
diff changeset
261 #define FOR_ALL_SYNSTATES(sb, sst) \
3ff714d765ba patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents: 19892
diff changeset
262 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
263
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
264 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
265 * The current state (within the line) of the recognition engine.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
266 * When current_state.ga_itemsize is 0 the current state is invalid.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
267 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
268 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
269 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
270 static synblock_T *syn_block; // current buffer for highlighting
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
271 #ifdef FEAT_RELTIME
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
272 static proftime_T *syn_tm; // timeout limit
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
273 #endif
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
274 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
275 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
276 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
277 // after setting current_finished
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
278 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
279 static garray_T current_state // current stack of state_items
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
280 = {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
281 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
282 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
283 static int current_line_id = 0; // unique number for current line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 #define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
287 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
288 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
289 static void syn_start_line(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
290 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
291 static void syn_stack_alloc(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
292 static int syn_stack_cleanup(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
293 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
294 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
295 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
296 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
297 static void invalidate_current_state(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
298 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
299 static void validate_current_state(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
300 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
301 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
302 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
303 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
304 static void check_state_ends(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
305 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
306 static void check_keepend(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
307 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
308 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
309 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
310 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
311 static void pop_current_state(void);
4766
ec24ff78a79c updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents: 4764
diff changeset
312 #ifdef FEAT_PROFILE
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
313 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
314 static void syntime_clear(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
315 static void syntime_report(void);
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
316 static int syn_time_on = FALSE;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
317 # define IF_SYN_TIME(p) (p)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
318 #else
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
319 # define IF_SYN_TIME(p) NULL
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
320 typedef int syn_time_T;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
321 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
322
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
323 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
324 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
325
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
326 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
327 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
328 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
329 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
330 static char_u *syn_getcurline(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
331 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
332 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
333 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
334 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
335 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
336 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
337 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
338 static void syn_lines_msg(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
339 static void syn_match_msg(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
340 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
341 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
342 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
343 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
344 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
345 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
346 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
347 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
348 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
349 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
350 static void init_syn_patterns(void);
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
351 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
352 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
353 static void syn_combine_list(short **clstr1, short **clstr2, int list_op);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354
12510
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
355 #if defined(FEAT_RELTIME) || defined(PROTO)
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
356 /*
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
357 * Set the timeout used for syntax highlighting.
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
358 * Use NULL to reset, no timeout.
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
359 */
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
360 void
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
361 syn_set_timeout(proftime_T *tm)
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
362 {
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
363 syn_tm = tm;
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
364 }
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
365 #endif
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
366
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 * Start the syntax recognition for a line. This function is normally called
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 * from the screen updating, once for each displayed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370 * The buffer is remembered in syn_buf, because get_syntax_attr() doesn't get
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 * it. Careful: curbuf and curwin are likely to point to another buffer and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372 * window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 void
12510
7a887dccd13a patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents: 12487
diff changeset
375 syntax_start(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 synstate_T *last_valid = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
379 synstate_T *last_min_valid = NULL;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
380 synstate_T *sp, *prev = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 linenr_T parsed_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 linenr_T first_stored;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 int dist;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
384 static varnumber_T changedtick = 0; // remember the last change ID
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385
2401
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
386 #ifdef FEAT_CONCEAL
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
387 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
388 #endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
389
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 * After switching buffers, invalidate current_state.
26
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
392 * Also do this when a change was made, the current state may be invalid
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
393 * then.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
394 */
8806
8fff73f17ff1 commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents: 8643
diff changeset
395 if (syn_block != wp->w_s
8fff73f17ff1 commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents: 8643
diff changeset
396 || 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
397 || changedtick != CHANGEDTICK(syn_buf))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
399 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 syn_buf = wp->w_buffer;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
401 syn_block = wp->w_s;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 }
10952
835604f3c37a patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents: 10889
diff changeset
403 changedtick = CHANGEDTICK(syn_buf);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 syn_win = wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 * Allocate syntax stack when needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 syn_stack_alloc();
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
410 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
411 return; // out of memory
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
412 syn_block->b_sst_lasttick = display_tick;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
414 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
415 * If the state of the end of the previous line is useful, store it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
416 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
417 if (VALID_STATE(&current_state)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
418 && current_lnum < lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
419 && current_lnum < syn_buf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 if (!current_state_stored)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 ++current_lnum;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
425 (void)store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
426 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
429 * If the current_lnum is now the same as "lnum", keep the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 * state (this happens very often!). Otherwise invalidate
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 * current_state and figure it out below.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 if (current_lnum != lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
434 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
435 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
436 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
439 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 * Try to synchronize from a saved state in b_sst_array[].
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
441 * Only do this if lnum is not before and not to far beyond a saved state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
442 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
443 if (INVALID_STATE(&current_state) && syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
445 // 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
446 FOR_ALL_SYNSTATES(syn_block, p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
447 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
448 if (p->sst_lnum > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 if (p->sst_lnum <= lnum && p->sst_change_lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 last_valid = p;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
453 if (p->sst_lnum >= lnum - syn_block->b_syn_sync_minlines)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 last_min_valid = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457 if (last_min_valid != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 load_current_state(last_min_valid);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
459 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
462 * If "lnum" is before or far beyond a line with a saved state, need to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 * re-synchronize.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
464 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 if (INVALID_STATE(&current_state))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
466 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
467 syn_sync(wp, lnum, last_valid);
2906
8477b2cc2b81 updated for version 7.3.226
Bram Moolenaar <bram@vim.org>
parents: 2863
diff changeset
468 if (current_lnum == 1)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
469 // First line is always valid, no matter "minlines".
2906
8477b2cc2b81 updated for version 7.3.226
Bram Moolenaar <bram@vim.org>
parents: 2863
diff changeset
470 first_stored = 1;
8477b2cc2b81 updated for version 7.3.226
Bram Moolenaar <bram@vim.org>
parents: 2863
diff changeset
471 else
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
472 // 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
473 // valid to store.
2906
8477b2cc2b81 updated for version 7.3.226
Bram Moolenaar <bram@vim.org>
parents: 2863
diff changeset
474 first_stored = current_lnum + syn_block->b_syn_sync_minlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
475 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
476 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
477 first_stored = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
480 * Advance from the sync point or saved state until the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481 * Save some entries for syncing with later on.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
482 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
483 if (syn_block->b_sst_len <= Rows)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
484 dist = 999999;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
485 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
486 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 while (current_lnum < lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
489 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491 ++current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
493 // 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
494 // state, the current state is considered valid.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
495 if (current_lnum >= first_stored)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
497 // 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
498 // 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
499 // states that depended on a change before the parsed line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500 if (prev == NULL)
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
501 prev = syn_stack_find_entry(current_lnum - 1);
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
502 if (prev == NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
503 sp = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 else
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
505 sp = prev;
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
506 while (sp != NULL && sp->sst_lnum < current_lnum)
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
507 sp = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
508 if (sp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
509 && sp->sst_lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 && syn_stack_equal(sp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 parsed_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513 prev = sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 while (sp != NULL && sp->sst_change_lnum <= parsed_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 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
517 // valid state before desired line, use this one
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518 prev = sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 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
520 // past saved states depending on change, break here.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
521 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 sp->sst_change_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 sp = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525 load_current_state(prev);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
526 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
527 // 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
528 // 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
529 // saved state. But only when parsed at least 'minlines'.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 else if (prev == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531 || current_lnum == lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532 || current_lnum >= prev->sst_lnum + dist)
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
533 prev = store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
535
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
536 // 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
537 // state will be wrong then.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 line_breakcheck();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539 if (got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
540 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
541 current_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
542 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
545
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
547 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 * We cannot simply discard growarrays full of state_items or buf_states; we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551 * have to manually release their extmatch pointers first.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
554 clear_syn_state(synstate_T *p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
557 garray_T *gap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559 if (p->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 gap = &(p->sst_union.sst_ga);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 for (i = 0; i < gap->ga_len; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563 unref_extmatch(SYN_STATE_P(gap)[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 ga_clear(gap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 for (i = 0; i < p->sst_stacksize; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 unref_extmatch(p->sst_union.sst_stack[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
572
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
573 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574 * Cleanup the current_state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
577 clear_current_state(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
579 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580 stateitem_T *sip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 sip = (stateitem_T *)(current_state.ga_data);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 for (i = 0; i < current_state.ga_len; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
584 unref_extmatch(sip[i].si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
585 ga_clear(&current_state);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
589 * Try to find a synchronisation point for line "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
590 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
591 * This sets current_lnum and the current state. One of three methods is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
592 * used:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
593 * 1. Search backwards for the end of a C-comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
594 * 2. Search backwards for given sync patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 * 3. Simply start on a given number of lines above "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
597 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
598 syn_sync(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
599 win_T *wp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
600 linenr_T start_lnum,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
601 synstate_T *last_valid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
603 buf_T *curbuf_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
604 win_T *curwin_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
605 pos_T cursor_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
607 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608 linenr_T end_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
609 linenr_T break_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
610 int had_sync_point;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
611 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 int found_flags = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
615 int found_match_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
616 linenr_T found_current_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 int found_current_col= 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 lpos_T found_m_endpos;
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
619 colnr_T prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
621 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
622 * Clear any current state that might be hanging around.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
627 * Start at least "minlines" back. Default starting point for parsing is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
628 * there.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
629 * Start further back, to avoid that scrolling backwards will result in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
630 * resyncing for every line. Now it resyncs only one out of N lines,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
631 * where N is minlines * 1.5, or minlines * 2 if minlines is small.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 * Watch out for overflow when minlines is MAXLNUM.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
633 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
634 if (syn_block->b_syn_sync_minlines > start_lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635 start_lnum = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
636 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
638 if (syn_block->b_syn_sync_minlines == 1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
639 lnum = 1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
640 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
641 lnum = syn_block->b_syn_sync_minlines * 2;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
643 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
644 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
645 && lnum > syn_block->b_syn_sync_maxlines)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
646 lnum = syn_block->b_syn_sync_maxlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
647 if (lnum >= start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
648 start_lnum = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
649 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
650 start_lnum -= lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
654 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
655 * 1. Search backwards for the end of a C-style comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
657 if (syn_block->b_syn_sync_flags & SF_CCOMMENT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
658 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
659 // 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
660 // use find_start_comment().
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
661 curwin_save = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
662 curwin = wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
663 curbuf_save = curbuf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 curbuf = syn_buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
665
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
666 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
667 * Skip lines that end in a backslash.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
669 for ( ; start_lnum > 1; --start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
670 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
671 line = ml_get(start_lnum - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
672 if (*line == NUL || *(line + STRLEN(line) - 1) != '\\')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
673 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
675 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
676
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
677 // set cursor to start of search
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
678 cursor_save = wp->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
679 wp->w_cursor.lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
680 wp->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
681
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
682 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
683 * If the line is inside a comment, need to find the syntax item that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
684 * defines the comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
685 * Restrict the search for the end of a comment to b_syn_sync_maxlines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
686 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
687 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
688 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
689 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
690 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
691 == syn_block->b_syn_sync_id
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
692 && SYN_ITEMS(syn_block)[idx].sp_type == SPTYPE_START)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
693 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
694 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
695 if (push_current_state(idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
696 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
697 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
698 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
699 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
700
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
701 // restore cursor and buffer
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 wp->w_cursor = cursor_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
703 curwin = curwin_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
704 curbuf = curbuf_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
705 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
706
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
707 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
708 * 2. Search backwards for given sync patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
709 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
710 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
711 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
712 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
713 && 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
714 break_lnum = start_lnum - syn_block->b_syn_sync_maxlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
715 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
716 break_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
717
699
2af8de31a3a8 updated for version 7.0211
vimboss
parents: 697
diff changeset
718 found_m_endpos.lnum = 0;
2af8de31a3a8 updated for version 7.0211
vimboss
parents: 697
diff changeset
719 found_m_endpos.col = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
720 end_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
721 lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
722 while (--lnum > break_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
723 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
724 // This can take a long time: break when CTRL-C pressed.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
725 line_breakcheck();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
726 if (got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
727 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
728 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
729 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
730 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
731 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
732
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
733 // Check if we have run into a valid saved state stack now.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
734 if (last_valid != NULL && lnum == last_valid->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
735 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
736 load_current_state(last_valid);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
737 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
738 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
739
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
740 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
741 * Check if the previous line has the line-continuation pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
742 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
743 if (lnum > 1 && syn_match_linecont(lnum - 1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
744 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
746 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
747 * Start with nothing on the state stack
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
748 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
749 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
750
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
751 for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
752 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
753 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
754 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
755 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
756 had_sync_point = syn_finish_line(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
757 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
758 * When a sync point has been found, remember where, and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
759 * continue to look for another one, further on in the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
760 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
761 if (had_sync_point && current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
762 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
763 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
764 if (cur_si->si_m_endpos.lnum > start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
765 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
766 // ignore match that goes to after where started
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
767 current_lnum = end_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
768 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
769 }
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
770 if (cur_si->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
771 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
772 // Cannot happen?
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
773 found_flags = 0;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
774 found_match_idx = KEYWORD_IDX;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
775 }
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
776 else
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
777 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
778 spp = &(SYN_ITEMS(syn_block)[cur_si->si_idx]);
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
779 found_flags = spp->sp_flags;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
780 found_match_idx = spp->sp_sync_idx;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
781 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
782 found_current_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
783 found_current_col = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
784 found_m_endpos = cur_si->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
785 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786 * Continue after the match (be aware of a zero-length
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
787 * match).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
789 if (found_m_endpos.lnum > current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
790 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
791 current_lnum = found_m_endpos.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
792 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793 if (current_lnum >= end_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
794 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796 else if (found_m_endpos.col > current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
797 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
799 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
800
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
801 // 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
802 // 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
803 // careful not to go past the NUL.
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
804 prev_current_col = current_col;
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
805 if (syn_getcurline()[current_col] != NUL)
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
806 ++current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
807 check_state_ends();
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
808 current_col = prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
809 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
810 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
812 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
813 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
814
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816 * If a sync point was encountered, break here.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
817 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
818 if (found_flags)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
819 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
820 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
821 * Put the item that was specified by the sync point on the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
822 * state stack. If there was no item specified, make the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
823 * state stack empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
825 clear_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
826 if (found_match_idx >= 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
827 && push_current_state(found_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
828 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
829
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 * When using "grouphere", continue from the sync point
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
832 * match, until the end of the line. Parsing starts at
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833 * the next line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
834 * For "groupthere" the parsing starts at start_lnum.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
835 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
836 if (found_flags & HL_SYNC_HERE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
838 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
839 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
840 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
841 cur_si->si_h_startpos.lnum = found_current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
842 cur_si->si_h_startpos.col = found_current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
843 update_si_end(cur_si, (int)current_col, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
844 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
845 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
846 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847 current_lnum = found_m_endpos.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
848 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 ++current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
850 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
856
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
857 end_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
858 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
859 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
860
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
861 // Ran into start of the file or exceeded maximum number of lines
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
862 if (lnum <= break_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
863 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
864 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
865 current_lnum = break_lnum + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
866 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
867 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
868
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
869 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
870 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
872 static void
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
873 save_chartab(char_u *chartab)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
874 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
875 if (syn_block->b_syn_isk != empty_option)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
876 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
877 mch_memmove(chartab, syn_buf->b_chartab, (size_t)32);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
878 mch_memmove(syn_buf->b_chartab, syn_win->w_s->b_syn_chartab,
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
879 (size_t)32);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
880 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
881 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
882
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
883 static void
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
884 restore_chartab(char_u *chartab)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
885 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
886 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
887 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
888 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
889
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
891 * Return TRUE if the line-continuation pattern matches in line "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
892 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
893 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
894 syn_match_linecont(linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
895 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
896 regmmatch_T regmatch;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
897 int r;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
898 char_u buf_chartab[32]; // chartab array for syn iskyeyword
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
900 if (syn_block->b_syn_linecont_prog != NULL)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
901 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
902 // use syntax iskeyword option
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
903 save_chartab(buf_chartab);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
904 regmatch.rmm_ic = syn_block->b_syn_linecont_ic;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
905 regmatch.regprog = syn_block->b_syn_linecont_prog;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
906 r = syn_regexec(&regmatch, lnum, (colnr_T)0,
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
907 IF_SYN_TIME(&syn_block->b_syn_linecont_time));
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
908 syn_block->b_syn_linecont_prog = regmatch.regprog;
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
909 restore_chartab(buf_chartab);
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
910 return r;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
912 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
916 * Prepare the current state for the start of a line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
918 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
919 syn_start_line(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
921 current_finished = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922 current_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
923
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
925 * Need to update the end of a start/skip/end that continues from the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
926 * previous line and regions that have "keepend".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
928 if (current_state.ga_len > 0)
2863
8d8bd6307b1a updated for version 7.3.205
Bram Moolenaar <bram@vim.org>
parents: 2831
diff changeset
929 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
930 syn_update_ends(TRUE);
2863
8d8bd6307b1a updated for version 7.3.205
Bram Moolenaar <bram@vim.org>
parents: 2831
diff changeset
931 check_state_ends();
8d8bd6307b1a updated for version 7.3.205
Bram Moolenaar <bram@vim.org>
parents: 2831
diff changeset
932 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
933
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
935 ++current_line_id;
11581
2298fda621d3 patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents: 11579
diff changeset
936 #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
937 next_seqnr = 1;
11581
2298fda621d3 patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents: 11579
diff changeset
938 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
939 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
940
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
942 * Check for items in the stack that need their end updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
943 * When "startofline" is TRUE the last item is always updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944 * When "startofline" is FALSE the item with "keepend" is forcefully updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
945 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
946 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
947 syn_update_ends(int startofline)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
948 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
949 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
950 int i;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
951 int seen_keepend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 if (startofline)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
955 // 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
956 // contained region. The match ends as soon as the region ends.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957 for (i = 0; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
960 if (cur_si->si_idx >= 0
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
961 && (SYN_ITEMS(syn_block)[cur_si->si_idx]).sp_type
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 == SPTYPE_MATCH
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
963 && cur_si->si_m_endpos.lnum < current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
964 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 cur_si->si_flags |= HL_MATCHCONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 cur_si->si_m_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 cur_si->si_m_endpos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 cur_si->si_h_endpos = cur_si->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
969 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
970 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
971 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
972 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
973
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
974 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
975 * Need to update the end of a start/skip/end that continues from the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
976 * previous line. And regions that have "keepend", because they may
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
977 * influence contained items. If we've just removed "extend"
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
978 * (startofline == 0) then we should update ends of normal regions
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
979 * contained inside "keepend" because "extend" could have extended
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
980 * these "keepend" regions as well as contained normal regions.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
981 * Then check for items ending in column 0.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
982 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
983 i = current_state.ga_len - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
984 if (keepend_level >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
985 for ( ; i > keepend_level; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986 if (CUR_STATE(i).si_flags & HL_EXTEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987 break;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
988
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
989 seen_keepend = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
990 for ( ; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
991 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 if ((cur_si->si_flags & HL_KEEPEND)
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
994 || (seen_keepend && !startofline)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995 || (i == current_state.ga_len - 1 && startofline))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
997 cur_si->si_h_startpos.col = 0; // start highl. in col 0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
998 cur_si->si_h_startpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
999
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1000 if (!(cur_si->si_flags & HL_MATCHCONT))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1001 update_si_end(cur_si, (int)current_col, !startofline);
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1002
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1003 if (!startofline && (cur_si->si_flags & HL_KEEPEND))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1004 seen_keepend = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1005 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1006 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1007 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1008 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1009
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1010 /////////////////////////////////////////
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1011 // Handling of the state stack cache.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1012
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1013 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1014 * EXPLANATION OF THE SYNTAX STATE STACK CACHE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 * To speed up syntax highlighting, the state stack for the start of some
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1017 * lines is cached. These entries can be used to start parsing at that point.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1018 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1019 * The stack is kept in b_sst_array[] for each buffer. There is a list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1020 * valid entries. b_sst_first points to the first one, then follow sst_next.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1021 * The entries are sorted on line number. The first entry is often for line 2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1022 * (line 1 always starts with an empty stack).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023 * There is also a list for free entries. This construction is used to avoid
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1024 * having to allocate and free memory blocks too often.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1025 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1026 * When making changes to the buffer, this is logged in b_mod_*. When calling
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1027 * update_screen() to update the display, it will call
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028 * syn_stack_apply_changes() for each displayed buffer to adjust the cached
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1029 * entries. The entries which are inside the changed area are removed,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1030 * because they must be recomputed. Entries below the changed have their line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1031 * number adjusted for deleted/inserted lines, and have their sst_change_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1032 * set to indicate that a check must be made if the changed lines would change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1033 * the cached entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1034 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1035 * When later displaying lines, an entry is stored for each line. Displayed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1036 * lines are likely to be displayed again, in which case the state at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1037 * start of the line is needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1038 * For not displayed lines, an entry is stored for every so many lines. These
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1039 * entries will be used e.g., when scrolling backwards. The distance between
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1040 * entries depends on the number of lines in the buffer. For small buffers
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 * the distance is fixed at SST_DIST, for large buffers there is a fixed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 * number of entries SST_MAX_ENTRIES, and the distance is computed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1044
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1045 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1046 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
1047 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1048 synstate_T *p;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1049
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1050 if (block->b_sst_array != NULL)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1051 {
19934
3ff714d765ba patch 8.2.0523: loops are repeated
Bram Moolenaar <Bram@vim.org>
parents: 19892
diff changeset
1052 FOR_ALL_SYNSTATES(block, p)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1053 clear_syn_state(p);
13244
ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents: 12973
diff changeset
1054 VIM_CLEAR(block->b_sst_array);
14850
85ef79b16181 patch 8.1.0437: may access freed memory when syntax HL times out
Christian Brabandt <cb@256bit.org>
parents: 14700
diff changeset
1055 block->b_sst_first = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1056 block->b_sst_len = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1057 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1058 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1059 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1060 * Free b_sst_array[] for buffer "buf".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1061 * Used when syntax items changed to force resyncing everywhere.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1062 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1063 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1064 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
1065 {
11073
d2178a6cc9f3 patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents: 10952
diff changeset
1066 #ifdef FEAT_FOLDING
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1067 win_T *wp;
11073
d2178a6cc9f3 patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents: 10952
diff changeset
1068 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1069
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1070 syn_stack_free_block(block);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1071
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1072 #ifdef FEAT_FOLDING
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1073 // When using "syntax" fold method, must update all folds.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1074 FOR_ALL_WINDOWS(wp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1075 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1076 if (wp->w_s == block && foldmethodIsSyntax(wp))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1077 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1078 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1079 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1080 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1082 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1083 * Allocate the syntax state stack for syn_buf when needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1084 * If the number of entries in b_sst_array[] is much too big or a bit too
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1085 * small, reallocate it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1086 * Also used to allocate b_sst_array[] for the first time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1089 syn_stack_alloc(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1090 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1091 long len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1092 synstate_T *to, *from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1093 synstate_T *sstp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1094
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 len = syn_buf->b_ml.ml_line_count / SST_DIST + Rows * 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1096 if (len < SST_MIN_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1097 len = SST_MIN_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1098 else if (len > SST_MAX_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1099 len = SST_MAX_ENTRIES;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1100 if (syn_block->b_sst_len > len * 2 || syn_block->b_sst_len < len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1101 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1102 // Allocate 50% too much, to avoid reallocating too often.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1103 len = syn_buf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1104 len = (len + len / 2) / SST_DIST + Rows * 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1105 if (len < SST_MIN_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1106 len = SST_MIN_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1107 else if (len > SST_MAX_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1108 len = SST_MAX_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1109
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1110 if (syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1111 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1112 // 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
1113 // 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
1114 while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1115 && syn_stack_cleanup())
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1116 ;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1117 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
1118 len = syn_block->b_sst_len - syn_block->b_sst_freecount + 2;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1119 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1120
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
1121 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
1122 if (sstp == NULL) // out of memory!
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1123 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1124
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1125 to = sstp - 1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1126 if (syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1127 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1128 // 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
1129 for (from = syn_block->b_sst_first; from != NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1130 from = from->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1131 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1132 ++to;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1133 *to = *from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1134 to->sst_next = to + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1135 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1136 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1137 if (to != sstp - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1138 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1139 to->sst_next = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1140 syn_block->b_sst_first = sstp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1141 syn_block->b_sst_freecount = len - (int)(to - sstp) - 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1142 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1143 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1144 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1145 syn_block->b_sst_first = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1146 syn_block->b_sst_freecount = len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1147 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1148
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1149 // Create the list of free entries.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1150 syn_block->b_sst_firstfree = to + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1151 while (++to < sstp + len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1152 to->sst_next = to + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1153 (sstp + len - 1)->sst_next = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1154
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1155 vim_free(syn_block->b_sst_array);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1156 syn_block->b_sst_array = sstp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1157 syn_block->b_sst_len = len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1162 * Check for changes in a buffer to affect stored syntax states. Uses the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1163 * b_mod_* fields.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1164 * Called from update_screen(), before screen is being updated, once for each
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1165 * displayed buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1166 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1167 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1168 syn_stack_apply_changes(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1169 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1170 win_T *wp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1171
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1172 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
1173
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1174 FOR_ALL_WINDOWS(wp)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1175 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1176 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
1177 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
1178 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1179 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1180
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1181 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1182 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
1183 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 synstate_T *p, *prev, *np;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 linenr_T n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1187 prev = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1188 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
1189 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1190 if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1191 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1192 n = p->sst_lnum + buf->b_mod_xlines;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1193 if (n <= buf->b_mod_bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1194 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1195 // this state is inside the changed area, remove it
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1196 np = p->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1197 if (prev == NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1198 block->b_sst_first = np;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1199 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1200 prev->sst_next = np;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1201 syn_stack_free_entry(block, p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1202 p = np;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1203 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1204 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1205 // 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
1206 // 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
1207 // again.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1208 if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1209 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1210 if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1211 p->sst_change_lnum += buf->b_mod_xlines;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1212 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1213 p->sst_change_lnum = buf->b_mod_top;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1214 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1215 if (p->sst_change_lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1216 || p->sst_change_lnum < buf->b_mod_bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1217 p->sst_change_lnum = buf->b_mod_bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1218
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1219 p->sst_lnum = n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1220 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1221 prev = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222 p = p->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1223 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1224 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1226 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227 * Reduce the number of entries in the state stack for syn_buf.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1228 * Returns TRUE if at least one entry was freed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1229 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1230 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1231 syn_stack_cleanup(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1232 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1233 synstate_T *p, *prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1234 disptick_T tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1235 int above;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1236 int dist;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1237 int retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1238
14850
85ef79b16181 patch 8.1.0437: may access freed memory when syntax HL times out
Christian Brabandt <cb@256bit.org>
parents: 14700
diff changeset
1239 if (syn_block->b_sst_first == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1240 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1241
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1242 // 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
1243 if (syn_block->b_sst_len <= Rows)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
1244 dist = 999999;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
1245 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1246 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1247
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1248 /*
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
1249 * Go through the list to find the "tick" for the oldest entry that can
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1250 * be removed. Set "above" when the "tick" for the oldest entry is above
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1251 * "b_sst_lasttick" (the display tick wraps around).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1252 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1253 tick = syn_block->b_sst_lasttick;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1254 above = FALSE;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1255 prev = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1256 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1257 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1258 if (prev->sst_lnum + dist > p->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1259 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1260 if (p->sst_tick > syn_block->b_sst_lasttick)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1261 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1262 if (!above || p->sst_tick < tick)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1263 tick = p->sst_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1264 above = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1265 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1266 else if (!above && p->sst_tick < tick)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 tick = p->sst_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1269 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 * Go through the list to make the entries for the oldest tick at an
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273 * interval of several lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1275 prev = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278 if (p->sst_tick == tick && prev->sst_lnum + dist > p->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1279 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1280 // Move this entry from used list to free list
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1281 prev->sst_next = p->sst_next;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1282 syn_stack_free_entry(syn_block, p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283 p = prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284 retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1285 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1286 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1287 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1288 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1290 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 * Free the allocated memory for a syn_state item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1292 * Move the entry into the free list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1294 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1295 syn_stack_free_entry(synblock_T *block, synstate_T *p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1296 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297 clear_syn_state(p);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1298 p->sst_next = block->b_sst_firstfree;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1299 block->b_sst_firstfree = p;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1300 ++block->b_sst_freecount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 * Find an entry in the list of state stacks at or before "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1305 * Returns NULL when there is no entry or the first entry is after "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1306 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1307 static synstate_T *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1308 syn_stack_find_entry(linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 synstate_T *p, *prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1311
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1312 prev = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1313 for (p = syn_block->b_sst_first; p != NULL; prev = p, p = p->sst_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1314 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315 if (p->sst_lnum == lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1316 return p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317 if (p->sst_lnum > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 return prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1321 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1323 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 * Try saving the current state in b_sst_array[].
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325 * The current state must be valid for the start of the current_lnum line!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1326 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1327 static synstate_T *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1328 store_current_state(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 stateitem_T *cur_si;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
1334 synstate_T *sp = syn_stack_find_entry(current_lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 * If the current state contains a start or end pattern that continues
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 * from the previous line, we can't use it. Don't store it then.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1339 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1340 for (i = current_state.ga_len - 1; i >= 0; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1341 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1342 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1343 if (cur_si->si_h_startpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1344 || cur_si->si_m_endpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 || cur_si->si_h_endpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 || (cur_si->si_end_idx
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347 && cur_si->si_eoe_pos.lnum >= current_lnum))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1350 if (i >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 if (sp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1354 // 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
1355 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
1356 // it's the first entry
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1357 syn_block->b_sst_first = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1358 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1360 // 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
1361 FOR_ALL_SYNSTATES(syn_block, p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 if (p->sst_next == sp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1363 break;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1364 if (p != NULL) // just in case
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 838
diff changeset
1365 p->sst_next = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1366 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1367 syn_stack_free_entry(syn_block, sp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1368 sp = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1369 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1370 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 else if (sp == NULL || sp->sst_lnum != current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 * Add a new entry
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1375 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1376 // 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
1377 if (syn_block->b_sst_freecount == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 (void)syn_stack_cleanup();
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1380 // "sp" may have been moved to the freelist now
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 sp = syn_stack_find_entry(current_lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1383 // 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
1384 if (syn_block->b_sst_freecount == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1385 sp = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1386 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1387 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1388 // 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
1389 // list, after *sp
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1390 p = syn_block->b_sst_firstfree;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1391 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
1392 --syn_block->b_sst_freecount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1393 if (sp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1394 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1395 // Insert in front of the list
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1396 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
1397 syn_block->b_sst_first = p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1398 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1399 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1400 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1401 // insert in list after *sp
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1402 p->sst_next = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 sp->sst_next = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1405 sp = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406 sp->sst_stacksize = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407 sp->sst_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1408 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1409 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1410 if (sp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1411 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1412 // When overwriting an existing state stack, clear it first
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1413 clear_syn_state(sp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1414 sp->sst_stacksize = current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1415 if (current_state.ga_len > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1416 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1417 // 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
1418 // length was less than SST_FIX_STATES.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1419 ga_init2(&sp->sst_union.sst_ga, (int)sizeof(bufstate_T), 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1420 if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1421 sp->sst_stacksize = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423 sp->sst_union.sst_ga.ga_len = current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 bp = SYN_STATE_P(&(sp->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1425 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1426 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427 bp = sp->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1428 for (i = 0; i < sp->sst_stacksize; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1430 bp[i].bs_idx = CUR_STATE(i).si_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1431 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
1432 #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
1433 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
1434 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
1435 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1436 bp[i].bs_extmatch = ref_extmatch(CUR_STATE(i).si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1438 sp->sst_next_flags = current_next_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 sp->sst_next_list = current_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 sp->sst_tick = display_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1441 sp->sst_change_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443 current_state_stored = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 return sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1445 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1448 * Copy a state stack from "from" in b_sst_array[] to current_state;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1450 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1451 load_current_state(synstate_T *from)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1453 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1455
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1456 clear_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1457 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1458 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1459 if (from->sst_stacksize
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1460 && ga_grow(&current_state, from->sst_stacksize) != FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1461 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1462 if (from->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1463 bp = SYN_STATE_P(&(from->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1465 bp = from->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466 for (i = 0; i < from->sst_stacksize; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1467 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1468 CUR_STATE(i).si_idx = bp[i].bs_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 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
1470 #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
1471 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
1472 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
1473 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474 CUR_STATE(i).si_extmatch = ref_extmatch(bp[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1476 keepend_level = i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1477 CUR_STATE(i).si_ends = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1478 CUR_STATE(i).si_m_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479 if (CUR_STATE(i).si_idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480 CUR_STATE(i).si_next_list =
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1481 (SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_next_list;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 CUR_STATE(i).si_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 update_si_attr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1486 current_state.ga_len = from->sst_stacksize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488 current_next_list = from->sst_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1489 current_next_flags = from->sst_next_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 current_lnum = from->sst_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1491 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1492
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1493 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 * Compare saved state stack "*sp" with the current state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495 * Return TRUE when they are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1498 syn_stack_equal(synstate_T *sp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1499 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 int i, j;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1501 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 reg_extmatch_T *six, *bsx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1503
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1504 // First a quick check if the stacks have the same size end nextlist.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1505 if (sp->sst_stacksize == current_state.ga_len
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1506 && sp->sst_next_list == current_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1508 // Need to compare all states on both stacks.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 if (sp->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1510 bp = SYN_STATE_P(&(sp->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1511 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1512 bp = sp->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1513
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 for (i = current_state.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1515 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1516 // If the item has another index the state is different.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1517 if (bp[i].bs_idx != CUR_STATE(i).si_idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1519 if (bp[i].bs_extmatch != CUR_STATE(i).si_extmatch)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1520 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1521 // When the extmatch pointers are different, the strings in
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1522 // them can still be the same. Check if the extmatch
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1523 // references are equal.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1524 bsx = bp[i].bs_extmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1525 six = CUR_STATE(i).si_extmatch;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1526 // If one of the extmatch pointers is NULL the states are
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1527 // different.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1528 if (bsx == NULL || six == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1529 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1530 for (j = 0; j < NSUBEXP; ++j)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1531 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1532 // Check each referenced match string. They must all be
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1533 // equal.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534 if (bsx->matches[j] != six->matches[j])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1536 // If the pointer is different it can still be the
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1537 // same text. Compare the strings, ignore case when
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1538 // the start item has the sp_ic flag set.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1539 if (bsx->matches[j] == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1540 || six->matches[j] == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541 break;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1542 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1543 ? MB_STRICMP(bsx->matches[j],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1544 six->matches[j]) != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1545 : STRCMP(bsx->matches[j], six->matches[j]) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1546 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1547 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1548 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1549 if (j != NSUBEXP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1550 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1551 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1552 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1553 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1554 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1555 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1556 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1559 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1560 * We stop parsing syntax above line "lnum". If the stored state at or below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1561 * this line depended on a change before it, it now depends on the line below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1562 * the last parsed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1563 * The window looks like this:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564 * line which changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1565 * displayed line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1566 * displayed line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1567 * lnum -> line below window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1568 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1570 syntax_end_parsing(linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1571 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 synstate_T *sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 sp = syn_stack_find_entry(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575 if (sp != NULL && sp->sst_lnum < lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576 sp = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1577
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1578 if (sp != NULL && sp->sst_change_lnum != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1579 sp->sst_change_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1580 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1581
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1582 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1583 * End of handling of the state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1584 ****************************************/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1587 invalidate_current_state(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589 clear_current_state();
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1590 current_state.ga_itemsize = 0; // mark current_state invalid
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1591 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1596 validate_current_state(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 current_state.ga_itemsize = sizeof(stateitem_T);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1599 current_state.ga_growsize = 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1603 * Return TRUE if the syntax at start of lnum changed since last time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 * This will only be called just after get_syntax_attr() for the previous
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 * line, to check if the next line needs to be redrawn too.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1607 int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1608 syntax_check_changed(linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1609 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 int retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1611 synstate_T *sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1612
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1614 * Check the state stack when:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1615 * - lnum is just below the previously syntaxed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1616 * - lnum is not before the lines with saved states.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1617 * - lnum is not past the lines with saved states.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 * - lnum is at or before the last changed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1619 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 if (VALID_STATE(&current_state) && lnum == current_lnum + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1621 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1622 sp = syn_stack_find_entry(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 if (sp != NULL && sp->sst_lnum == lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 * finish the previous line (needed when not all of the line was
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627 * drawn)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632 * Compare the current state with the previously saved state of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633 * the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635 if (syn_stack_equal(sp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1637
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 * Store the current state in b_sst_array[] for later use.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641 ++current_lnum;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
1642 (void)store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1643 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1646 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1647 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1648
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1649 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1650 * Finish the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651 * This doesn't return any attributes, it only gets the state at the end of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 * the line. It can start anywhere in the line, as long as the current state
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653 * is valid.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1656 syn_finish_line(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1657 int syncing) // called for syncing
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659 stateitem_T *cur_si;
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1660 colnr_T prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1662 while (!current_finished)
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1663 {
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1664 (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
1665 /*
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1666 * 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
1667 */
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1668 if (syncing && current_state.ga_len)
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1669 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1670 /*
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1671 * Check for match with sync item.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1672 */
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1673 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
1674 if (cur_si->si_idx >= 0
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1675 && (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
1676 & (HL_SYNC_HERE|HL_SYNC_THERE)))
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1677 return TRUE;
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1678
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1679 // 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
1680 // 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
1681 // past the NUL.
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1682 prev_current_col = current_col;
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1683 if (syn_getcurline()[current_col] != NUL)
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1684 ++current_col;
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1685 check_state_ends();
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1686 current_col = prev_current_col;
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1687 }
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
1688 ++current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 * Return highlight attributes for next character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 * Must first call syntax_start() once for the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1696 * "col" is normally 0 for the first use in a line, and increments by one each
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1697 * time. It's allowed to skip characters and to stop before the end of the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 * line. But only a "col" after a previously used column is allowed.
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1699 * When "can_spell" is not NULL set it to TRUE when spell-checking should be
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1700 * done.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1702 int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1703 get_syntax_attr(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1704 colnr_T col,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1705 int *can_spell,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1706 int keep_state) // keep state of char at "col"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1707 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1708 int attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1709
1363
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1710 if (can_spell != NULL)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1711 // 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
1712 // ":syn spell toplevel" was used.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1713 *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
1714 ? (syn_block->b_spell_cluster_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1715 : (syn_block->b_syn_spell == SYNSPL_TOP);
1363
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1716
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1717 // check for out of memory situation
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1718 if (syn_block->b_sst_array == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1719 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1720
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1721 // After 'synmaxcol' the attribute is always zero.
431
8b77f61b399b updated for version 7.0111
vimboss
parents: 419
diff changeset
1722 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc)
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1723 {
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1724 clear_current_state();
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1725 #ifdef FEAT_EVAL
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1726 current_id = 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1727 current_trans_id = 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1728 #endif
2401
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
1729 #ifdef FEAT_CONCEAL
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
1730 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
1731 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
1732 #endif
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1733 return 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1734 }
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1735
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1736 // Make sure current_state is valid
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1737 if (INVALID_STATE(&current_state))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1738 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1739
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1740 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1741 * Skip from the current column to "col", get the attributes for "col".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1742 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1743 while (current_col <= col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1744 {
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1745 attr = syn_current_attr(FALSE, TRUE, can_spell,
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1746 current_col == col ? keep_state : FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1747 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1748 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1749
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1750 return attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1751 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1752
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1753 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1754 * Get syntax attributes for current_lnum, current_col.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
1757 syn_current_attr(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1758 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
1759 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
1760 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
1761 int keep_state) // keep syntax stack afterwards
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1763 int syn_id;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1764 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
1765 lpos_T hl_startpos; // was: int hl_startcol;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1766 lpos_T hl_endpos;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1767 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
1768 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
1769 int end_idx; // group ID for end pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 synpat_T *spp;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1772 stateitem_T *cur_si, *sip = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 int startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 int endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1775 long flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1776 int cchar;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1777 short *next_list;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1778 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
1779 static int try_next_column = FALSE; // must try in next col
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1780 int do_keywords;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1781 regmmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1782 lpos_T pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1783 int lc_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1784 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
1785 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
1786 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
1787 // looking for a pattern match!
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1788
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1789 // variables for zero-width matches that have a "nextgroup" argument
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1790 int keep_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1791 int zero_width_next_list = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1792 garray_T zero_width_next_ga;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1793
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1794 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1795 * No character, no attributes! Past end of line?
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1796 * Do try matching with an empty line (could be the start of a region).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 line = syn_getcurline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799 if (line[current_col] == NUL && current_col != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1800 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1801 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1802 * If we found a match after the last column, use it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1803 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1804 if (next_match_idx >= 0 && next_match_col >= (int)current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1805 && next_match_col != MAXCOL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1806 (void)push_next_match(NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1807
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1808 current_finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1809 current_state_stored = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1810 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1811 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1812
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1813 // if the current or next character is NUL, we will finish the line now
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 if (line[current_col] == NUL || line[current_col + 1] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816 current_finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817 current_state_stored = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1818 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1819
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1820 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1821 * When in the previous column there was a match but it could not be used
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1822 * (empty match or already matched in this column) need to try again in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1823 * the next column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1824 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1825 if (try_next_column)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1826 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1827 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1828 try_next_column = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1829 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1830
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1831 // Only check for keywords when not syncing and there are some.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1832 do_keywords = !syncing
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1833 && (syn_block->b_keywtab.ht_used > 0
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1834 || syn_block->b_keywtab_ic.ht_used > 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1835
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1836 // 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
1837 // avoid matching the same item in the same position twice.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1838 ga_init2(&zero_width_next_ga, (int)sizeof(int), 10);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1839
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1840 // use syntax iskeyword option
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
1841 save_chartab(buf_chartab);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
1842
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1843 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1844 * Repeat matching keywords and patterns, to find contained items at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1845 * same column. This stops when there are no extra matches at the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1846 * column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1847 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1848 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1849 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1850 found_match = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1851 keep_next_list = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1852 syn_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1853
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
1854
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1855 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1856 * 1. Check for a current state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1857 * Only when there is no current state, or if the current state may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1858 * contain other things, we need to check for keywords and patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1859 * Always need to check for contained items if some item has the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1860 * "containedin" argument (takes extra time!).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1861 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1862 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1863 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1864 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1865 cur_si = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1866
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1867 if (syn_block->b_syn_containedin || cur_si == NULL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1868 || cur_si->si_cont_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1869 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1870 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1871 * 2. Check for keywords, if on a keyword char after a non-keyword
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1872 * char. Don't do this when syncing.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1873 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1874 if (do_keywords)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1875 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1876 line = syn_getcurline();
4043
80b041b994d1 updated for version 7.3.776
Bram Moolenaar <bram@vim.org>
parents: 3900
diff changeset
1877 if (vim_iswordp_buf(line + current_col, syn_buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 && (current_col == 0
4043
80b041b994d1 updated for version 7.3.776
Bram Moolenaar <bram@vim.org>
parents: 3900
diff changeset
1879 || !vim_iswordp_buf(line + current_col - 1
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1880 - (has_mbyte
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1881 ? (*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
1882 : 0) , syn_buf)))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1883 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1884 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
1885 &endcol, &flags, &next_list, cur_si,
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1886 &cchar);
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
1887 if (syn_id != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1888 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 if (push_current_state(KEYWORD_IDX) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1890 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1891 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1892 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1893 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
1894 cur_si->si_h_startpos.col = 0; // starts right away
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1895 cur_si->si_m_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896 cur_si->si_m_endpos.col = endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1897 cur_si->si_h_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1898 cur_si->si_h_endpos.col = endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1899 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1900 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1901 cur_si->si_flags = flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1902 #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
1903 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
1904 cur_si->si_cchar = cchar;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1905 if (current_state.ga_len > 1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1906 cur_si->si_flags |=
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1907 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
1908 & HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1909 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1910 cur_si->si_id = syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1911 cur_si->si_trans_id = syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1912 if (flags & HL_TRANSP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1913 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1914 if (current_state.ga_len < 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1915 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1916 cur_si->si_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1917 cur_si->si_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1918 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1919 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1920 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1921 cur_si->si_attr = CUR_STATE(
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1922 current_state.ga_len - 2).si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1923 cur_si->si_trans_id = CUR_STATE(
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1924 current_state.ga_len - 2).si_trans_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1925 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1926 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1927 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1928 cur_si->si_attr = syn_id2attr(syn_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1929 cur_si->si_cont_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1930 cur_si->si_next_list = next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1931 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1932 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1933 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1934 vim_free(next_list);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1935 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1936 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1937 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1938
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1939 /*
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
1940 * 3. Check for patterns (only if no keyword found).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1941 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1942 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1943 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1944 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1945 * If we didn't check for a match yet, or we are past it, check
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1946 * for any match with a pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1947 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1948 if (next_match_idx < 0 || next_match_col < (int)current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1949 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1950 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1951 * Check all relevant patterns for a match at this
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1952 * position. This is complicated, because matching with a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1953 * pattern takes quite a bit of time, thus we want to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1954 * avoid doing it when it's not needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1955 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1956 next_match_idx = 0; // no match in this line yet
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1957 next_match_col = MAXCOL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1958 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1959 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1960 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1961 if ( spp->sp_syncing == syncing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1962 && (displaying || !(spp->sp_flags & HL_DISPLAY))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1963 && (spp->sp_type == SPTYPE_MATCH
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1964 || spp->sp_type == SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1965 && (current_next_list != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1966 ? in_id_list(NULL, current_next_list,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1967 &spp->sp_syn, 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1968 : (cur_si == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1969 ? !(spp->sp_flags & HL_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1970 : in_id_list(cur_si,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1971 cur_si->si_cont_list, &spp->sp_syn,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1972 spp->sp_flags & HL_CONTAINED))))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1973 {
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
1974 int r;
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
1975
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1976 // 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
1977 // 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
1978 // this item.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1979 if (spp->sp_line_id == current_line_id
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1980 && spp->sp_startcol >= next_match_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1981 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1982 spp->sp_line_id = current_line_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1983
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1984 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1985 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1986 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1987
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1988 regmatch.rmm_ic = spp->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1989 regmatch.regprog = spp->sp_prog;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
1990 r = syn_regexec(&regmatch,
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1991 current_lnum,
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1992 (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
1993 IF_SYN_TIME(&spp->sp_time));
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
1994 spp->sp_prog = regmatch.regprog;
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
1995 if (!r)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1996 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
1997 // no match in this line, try another one
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1998 spp->sp_startcol = MAXCOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1999 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2000 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2001
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2002 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2003 * Compute the first column of the match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2004 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2005 syn_add_start_off(&pos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2006 spp, SPO_MS_OFF, -1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2007 if (pos.lnum > current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2008 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2009 // 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
2010 // we can't handle that
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2011 spp->sp_startcol = MAXCOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2012 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2013 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2014 startcol = pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2015
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2016 // 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
2017 // matches in the current line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2018 spp->sp_startcol = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2019
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2020 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2021 * If a previously found match starts at a lower
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2022 * column number, don't use this one.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2023 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2024 if (startcol >= next_match_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2025 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2026
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2027 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2028 * If we matched this pattern at this position
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2029 * before, skip it. Must retry in the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2030 * column, because it may match from there.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2031 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2032 if (did_match_already(idx, &zero_width_next_ga))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2033 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2034 try_next_column = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2035 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2036 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2037
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2038 endpos.lnum = regmatch.endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2039 endpos.col = regmatch.endpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2040
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2041 // Compute the highlight start.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2042 syn_add_start_off(&hl_startpos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2043 spp, SPO_HS_OFF, -1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2044
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2045 // Compute the region start.
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2046 // Default is to use the end of the match.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2047 syn_add_end_off(&eos_pos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2048 spp, SPO_RS_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2049
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2050 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2051 * Grab the external submatches before they get
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2052 * overwritten. Reference count doesn't change.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2053 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2054 unref_extmatch(cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2055 cur_extmatch = re_extmatch_out;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2056 re_extmatch_out = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2057
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2058 flags = 0;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2059 eoe_pos.lnum = 0; // avoid warning
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2060 eoe_pos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2061 end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2062 hl_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2063
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2064 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2065 * For a "oneline" the end must be found in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2066 * same line too. Search for it after the end of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2067 * the match with the start pattern. Set the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2068 * resulting end positions at the same time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2069 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2070 if (spp->sp_type == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2071 && (spp->sp_flags & HL_ONELINE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2072 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2073 lpos_T startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2074
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2075 startpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2076 find_endpos(idx, &startpos, &endpos, &hl_endpos,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2077 &flags, &eoe_pos, &end_idx, cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2078 if (endpos.lnum == 0)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2079 continue; // not found
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2080 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2081
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2082 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2083 * For a "match" the size must be > 0 after the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2084 * end offset needs has been added. Except when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2085 * syncing.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2086 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2087 else if (spp->sp_type == SPTYPE_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2088 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2089 syn_add_end_off(&hl_endpos, &regmatch, spp,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2090 SPO_HE_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2091 syn_add_end_off(&endpos, &regmatch, spp,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2092 SPO_ME_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2093 if (endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 && (int)endpos.col + syncing < startcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2095 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2096 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2097 * If an empty string is matched, may need
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2098 * to try matching again at next column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2099 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2100 if (regmatch.startpos[0].col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2101 == regmatch.endpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2102 try_next_column = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2103 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2104 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2105 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2106
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2107 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2108 * keep the best match so far in next_match_*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2109 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2110 // 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
2111 // before endpos.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2112 if (hl_startpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2113 && (int)hl_startpos.col < startcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2114 hl_startpos.col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2115 limit_pos_zero(&hl_endpos, &endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2116
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2117 next_match_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2118 next_match_col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2119 next_match_m_endpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2120 next_match_h_endpos = hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2121 next_match_h_startpos = hl_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2122 next_match_flags = flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2123 next_match_eos_pos = eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2124 next_match_eoe_pos = eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2125 next_match_end_idx = end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2126 unref_extmatch(next_match_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2127 next_match_extmatch = cur_extmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2128 cur_extmatch = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2133 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 * If we found a match at the current column, use it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 if (next_match_idx >= 0 && next_match_col == (int)current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2138 synpat_T *lspp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2139
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2140 // 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
2141 // 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
2142 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2143 if (next_match_m_endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2144 && next_match_m_endpos.col == current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2145 && lspp->sp_next_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2146 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2147 current_next_list = lspp->sp_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2148 current_next_flags = lspp->sp_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2149 keep_next_list = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150 zero_width_next_list = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2151
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2152 // 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
2153 // 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
2154 // endless loop).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2155 if (ga_grow(&zero_width_next_ga, 1) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2156 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 ((int *)(zero_width_next_ga.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158 [zero_width_next_ga.ga_len++] = next_match_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2160 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2161 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2162 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2163 cur_si = push_next_match(cur_si);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 found_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2165 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2166 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2167 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2168
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 * Handle searching for nextgroup match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 if (current_next_list != NULL && !keep_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2174 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2175 * If a nextgroup was not found, continue looking for one if:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 * - this is an empty line and the "skipempty" option was given
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2177 * - we are on white space and the "skipwhite" option was given
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179 if (!found_match)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2181 line = syn_getcurline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 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
2183 && VIM_ISWHITE(line[current_col]))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2184 || ((current_next_flags & HL_SKIPEMPTY)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2185 && *line == NUL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2186 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2187 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2188
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 * If a nextgroup was found: Use it, and continue looking for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2191 * contained matches.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2192 * If a nextgroup was not found: Continue looking for a normal
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2193 * match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2194 * When did set current_next_list for a zero-width item and no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2195 * match was found don't loop (would get stuck).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2196 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2197 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2198 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2199 if (!zero_width_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2200 found_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2201 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2202
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2203 } while (found_match);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2204
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
2205 restore_chartab(buf_chartab);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
2206
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2207 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2208 * Use attributes from the current state, if within its highlighting.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2209 * If not, use attributes from the current-but-one state, etc.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2210 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2211 current_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2212 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2213 current_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2214 current_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2215 #endif
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 = 0;
11579
52e3a77c097b patch 8.0.0672: third item of synconcealed() changes too often
Christian Brabandt <cb@256bit.org>
parents: 11541
diff changeset
2218 current_seqnr = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2219 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2220 if (cur_si != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2221 {
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2222 #ifndef FEAT_EVAL
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2223 int current_trans_id = 0;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2224 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2225 for (idx = current_state.ga_len - 1; idx >= 0; --idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2226 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2227 sip = &CUR_STATE(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2228 if ((current_lnum > sip->si_h_startpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2229 || (current_lnum == sip->si_h_startpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2230 && current_col >= sip->si_h_startpos.col))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2231 && (sip->si_h_endpos.lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2232 || current_lnum < sip->si_h_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2233 || (current_lnum == sip->si_h_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2234 && current_col < sip->si_h_endpos.col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2235 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2236 current_attr = sip->si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2237 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2238 current_id = sip->si_id;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2239 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2240 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
2241 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2242 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
2243 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
2244 current_sub_char = sip->si_cchar;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2245 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2246 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2247 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2248 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2249
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2250 if (can_spell != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2251 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2252 struct sp_syn sps;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2253
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2254 /*
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2255 * set "can_spell" to TRUE if spell checking is supposed to be
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2256 * done in the current item.
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2257 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2258 if (syn_block->b_spell_cluster_id == 0)
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2259 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2260 // 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
2261 // @NoSpell cluster.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2262 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
2263 || current_trans_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2264 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP);
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2265 else
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2266 {
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2267 sps.inc_tag = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2268 sps.id = syn_block->b_nospell_cluster_id;
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2269 sps.cont_in_list = NULL;
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2270 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0);
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2271 }
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2272 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2273 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2274 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2275 // 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
2276 // 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
2277 // 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
2278 // was used.
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2279 if (current_trans_id == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2280 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP);
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2281 else
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2282 {
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2283 sps.inc_tag = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2284 sps.id = syn_block->b_spell_cluster_id;
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2285 sps.cont_in_list = NULL;
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2286 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0);
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2287
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2288 if (syn_block->b_nospell_cluster_id != 0)
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2289 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2290 sps.id = syn_block->b_nospell_cluster_id;
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2291 if (in_id_list(sip, sip->si_cont_list, &sps, 0))
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2292 *can_spell = FALSE;
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2293 }
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2294 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2295 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2296 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2297
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2298
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2299 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2300 * Check for end of current state (and the states before it) at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2301 * next column. Don't do this for syncing, because we would miss a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2302 * single character match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2303 * First check if the current state ends at the current column. It
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2304 * may be for an empty match and a containing item might end in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2305 * current column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2306 */
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
2307 if (!syncing && !keep_state)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2308 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2309 check_state_ends();
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
2310 if (current_state.ga_len > 0
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
2311 && syn_getcurline()[current_col] != NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2312 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2313 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2314 check_state_ends();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2315 --current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2316 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2317 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2318 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2319 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
2320 // 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
2321 // ":syn spell toplevel" was used.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2322 *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
2323 ? (syn_block->b_spell_cluster_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2324 : (syn_block->b_syn_spell == SYNSPL_TOP);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2325
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2326 // nextgroup ends at end of line, unless "skipnl" or "skipempty" present
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2327 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
2328 && (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
2329 && line[current_col + 1] == NUL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2330 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2331 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2332
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2333 if (zero_width_next_ga.ga_len > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2334 ga_clear(&zero_width_next_ga);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2335
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2336 // No longer need external matches. But keep next_match_extmatch.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2337 unref_extmatch(re_extmatch_out);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2338 re_extmatch_out = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2339 unref_extmatch(cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2340
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2341 return current_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2342 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2343
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2344
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2345 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2346 * Check if we already matched pattern "idx" at the current column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2347 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2348 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2349 did_match_already(int idx, garray_T *gap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2350 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2351 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2352
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2353 for (i = current_state.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2354 if (CUR_STATE(i).si_m_startcol == (int)current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2355 && CUR_STATE(i).si_m_lnum == (int)current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2356 && CUR_STATE(i).si_idx == idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2357 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2358
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2359 // 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
2360 // stack, and can only be matched once anyway.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2361 for (i = gap->ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2362 if (((int *)(gap->ga_data))[i] == idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2363 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2364
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2365 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2366 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2367
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2368 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2369 * Push the next match onto the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2370 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2371 static stateitem_T *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2372 push_next_match(stateitem_T *cur_si)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2373 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2374 synpat_T *spp;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2375 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2376 int save_flags;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2377 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2378
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2379 spp = &(SYN_ITEMS(syn_block)[next_match_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2380
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2381 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2382 * Push the item in current_state stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2383 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2384 if (push_current_state(next_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2385 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2386 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2387 * If it's a start-skip-end type that crosses lines, figure out how
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2388 * much it continues in this line. Otherwise just fill in the length.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2389 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2390 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2391 cur_si->si_h_startpos = next_match_h_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2392 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2393 cur_si->si_m_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2394 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
2395 #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
2396 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
2397 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
2398 if (current_state.ga_len > 1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2399 cur_si->si_flags |=
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2400 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
2401 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2402 cur_si->si_next_list = spp->sp_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2403 cur_si->si_extmatch = ref_extmatch(next_match_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2404 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2405 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2406 // Try to find the end pattern in the current line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2407 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2408 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2409 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2410 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2411 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2412 cur_si->si_m_endpos = next_match_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2413 cur_si->si_h_endpos = next_match_h_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2414 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2415 cur_si->si_flags |= next_match_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2416 cur_si->si_eoe_pos = next_match_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2417 cur_si->si_end_idx = next_match_end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2418 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2419 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2420 keepend_level = current_state.ga_len - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2421 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2422 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2423
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2424 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2425 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
2426 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2427 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2428 * If the start pattern has another highlight group, push another item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2429 * on the stack for the start pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2430 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2431 if ( spp->sp_type == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2432 && spp->sp_syn_match_id != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2433 && push_current_state(next_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2434 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2435 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2436 cur_si->si_h_startpos = next_match_h_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2437 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2438 cur_si->si_m_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439 cur_si->si_m_endpos = next_match_eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2440 cur_si->si_h_endpos = next_match_eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2441 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2442 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2443 cur_si->si_flags = HL_MATCH;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2444 #ifdef FEAT_CONCEAL
2418
da067045878f Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents: 2401
diff changeset
2445 cur_si->si_seqnr = next_seqnr++;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2446 cur_si->si_flags |= save_flags;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2447 if (cur_si->si_flags & HL_CONCEALENDS)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2448 cur_si->si_flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2449 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2450 cur_si->si_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2451 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2452 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2454 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2455
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2456 next_match_idx = -1; // try other match next time
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2457
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2458 return cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2459 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2460
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2461 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2462 * Check for end of current state (and the states before it).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2463 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2464 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2465 check_state_ends(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2466 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2467 stateitem_T *cur_si;
2863
8d8bd6307b1a updated for version 7.3.205
Bram Moolenaar <bram@vim.org>
parents: 2831
diff changeset
2468 int had_extend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2469
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2470 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2472 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2473 if (cur_si->si_ends
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2474 && (cur_si->si_m_endpos.lnum < current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2475 || (cur_si->si_m_endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2476 && cur_si->si_m_endpos.col <= current_col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2477 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2478 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2479 * If there is an end pattern group ID, highlight the end pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2480 * now. No need to pop the current item from the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2481 * Only do this if the end pattern continues beyond the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2482 * position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2483 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2484 if (cur_si->si_end_idx
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2485 && (cur_si->si_eoe_pos.lnum > current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2486 || (cur_si->si_eoe_pos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2487 && cur_si->si_eoe_pos.col > current_col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2488 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2489 cur_si->si_idx = cur_si->si_end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2490 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2491 cur_si->si_m_endpos = cur_si->si_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2492 cur_si->si_h_endpos = cur_si->si_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2493 cur_si->si_flags |= HL_MATCH;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2494 #ifdef FEAT_CONCEAL
2418
da067045878f Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents: 2401
diff changeset
2495 cur_si->si_seqnr = next_seqnr++;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2496 if (cur_si->si_flags & HL_CONCEALENDS)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2497 cur_si->si_flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2498 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2499 update_si_attr(current_state.ga_len - 1);
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2500
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2501 // nextgroup= should not match in the end pattern
2831
30b7cde21940 updated for version 7.3.190
Bram Moolenaar <bram@vim.org>
parents: 2768
diff changeset
2502 current_next_list = NULL;
30b7cde21940 updated for version 7.3.190
Bram Moolenaar <bram@vim.org>
parents: 2768
diff changeset
2503
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2504 // what matches next may be different now, clear it
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2505 next_match_idx = 0;
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2506 next_match_col = MAXCOL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2507 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2508 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2509 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2510 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2511 // handle next_list, unless at end of line and no "skipnl" or
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2512 // "skipempty"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2513 current_next_list = cur_si->si_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2514 current_next_flags = cur_si->si_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2515 if (!(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2516 && syn_getcurline()[current_col] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2517 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2518
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2519 // When the ended item has "extend", another item with
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2520 // "keepend" now needs to check for its end.
2863
8d8bd6307b1a updated for version 7.3.205
Bram Moolenaar <bram@vim.org>
parents: 2831
diff changeset
2521 had_extend = (cur_si->si_flags & HL_EXTEND);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2522
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2523 pop_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2524
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2525 if (current_state.ga_len == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2526 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2527
1503
995536cad50e updated for version 7.1-218
vimboss
parents: 1500
diff changeset
2528 if (had_extend && keepend_level >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2529 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2530 syn_update_ends(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2531 if (current_state.ga_len == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2532 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2533 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2534
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2535 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2536
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2537 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2538 * Only for a region the search for the end continues after
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2539 * the end of the contained item. If the contained match
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2540 * included the end-of-line, break here, the region continues.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2541 * Don't do this when:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2542 * - "keepend" is used for the contained item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2543 * - not at the end of the line (could be end="x$"me=e-1).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2544 * - "excludenl" is used (HL_HAS_EOL won't be set)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2545 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2546 if (cur_si->si_idx >= 0
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2547 && SYN_ITEMS(syn_block)[cur_si->si_idx].sp_type
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2548 == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2549 && !(cur_si->si_flags & (HL_MATCH | HL_KEEPEND)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2550 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2551 update_si_end(cur_si, (int)current_col, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2552 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2553 if ((current_next_flags & HL_HAS_EOL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2554 && keepend_level < 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2555 && syn_getcurline()[current_col] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2556 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2557 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2558 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2559 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2560 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2561 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2562 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2563 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2564
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2565 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2566 * Update an entry in the current_state stack for a match or region. This
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2567 * fills in si_attr, si_next_list and si_cont_list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2568 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2569 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2570 update_si_attr(int idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2571 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2572 stateitem_T *sip = &CUR_STATE(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2573 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2574
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2575 // This should not happen...
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2576 if (sip->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2577 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2578
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2579 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2580 if (sip->si_flags & HL_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2581 sip->si_id = spp->sp_syn_match_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2582 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2583 sip->si_id = spp->sp_syn.id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2584 sip->si_attr = syn_id2attr(sip->si_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2585 sip->si_trans_id = sip->si_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2586 if (sip->si_flags & HL_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2587 sip->si_cont_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2588 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2589 sip->si_cont_list = spp->sp_cont_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2590
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2591 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2592 * For transparent items, take attr from outer item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2593 * Also take cont_list, if there is none.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2594 * Don't do this for the matchgroup of a start or end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2595 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2596 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2597 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2598 if (idx == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2599 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2600 sip->si_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2601 sip->si_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2602 if (sip->si_cont_list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2603 sip->si_cont_list = ID_LIST_ALL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2604 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2605 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2606 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2607 sip->si_attr = CUR_STATE(idx - 1).si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2608 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id;
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2609 sip->si_h_startpos = CUR_STATE(idx - 1).si_h_startpos;
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2610 sip->si_h_endpos = CUR_STATE(idx - 1).si_h_endpos;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2611 if (sip->si_cont_list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2612 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2613 sip->si_flags |= HL_TRANS_CONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2614 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2615 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2616 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2617 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2618 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2619
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2620 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2621 * Check the current stack for patterns with "keepend" flag.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2622 * Propagate the match-end to contained items, until a "skipend" item is found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2623 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2624 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2625 check_keepend(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2626 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2627 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2628 lpos_T maxpos;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2629 lpos_T maxpos_h;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2630 stateitem_T *sip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2631
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2632 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2633 * This check can consume a lot of time; only do it from the level where
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2634 * there really is a keepend.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2635 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2636 if (keepend_level < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2637 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2638
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2639 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2640 * Find the last index of an "extend" item. "keepend" items before that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2641 * won't do anything. If there is no "extend" item "i" will be
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2642 * "keepend_level" and all "keepend" items will work normally.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2643 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2644 for (i = current_state.ga_len - 1; i > keepend_level; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2645 if (CUR_STATE(i).si_flags & HL_EXTEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2646 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2647
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2648 maxpos.lnum = 0;
1702
5232b9862f23 updated for version 7.2-000
vimboss
parents: 1697
diff changeset
2649 maxpos.col = 0;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2650 maxpos_h.lnum = 0;
1702
5232b9862f23 updated for version 7.2-000
vimboss
parents: 1697
diff changeset
2651 maxpos_h.col = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2652 for ( ; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2653 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2654 sip = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2655 if (maxpos.lnum != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2656 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2657 limit_pos_zero(&sip->si_m_endpos, &maxpos);
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2658 limit_pos_zero(&sip->si_h_endpos, &maxpos_h);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2659 limit_pos_zero(&sip->si_eoe_pos, &maxpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2660 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2661 }
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2662 if (sip->si_ends && (sip->si_flags & HL_KEEPEND))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2663 {
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2664 if (maxpos.lnum == 0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2665 || maxpos.lnum > sip->si_m_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2666 || (maxpos.lnum == sip->si_m_endpos.lnum
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2667 && maxpos.col > sip->si_m_endpos.col))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2668 maxpos = sip->si_m_endpos;
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2669 if (maxpos_h.lnum == 0
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2670 || maxpos_h.lnum > sip->si_h_endpos.lnum
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2671 || (maxpos_h.lnum == sip->si_h_endpos.lnum
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2672 && maxpos_h.col > sip->si_h_endpos.col))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2673 maxpos_h = sip->si_h_endpos;
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2674 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2675 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2676 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2677
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2678 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2679 * Update an entry in the current_state stack for a start-skip-end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2680 * This finds the end of the current item, if it's in the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2681 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2682 * Return the flags for the matched END.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2683 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2684 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2685 update_si_end(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2686 stateitem_T *sip,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2687 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
2688 int force) // when TRUE overrule a previous end
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2689 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2690 lpos_T startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2691 lpos_T endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2692 lpos_T hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2693 lpos_T end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2694 int end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2695
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2696 // return quickly for a keyword
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2697 if (sip->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2698 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2699
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2700 // 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
2701 // 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
2702 // from a containing item.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2703 if (!force && sip->si_m_endpos.lnum >= current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2704 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2705
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2706 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2707 * We need to find the end of the region. It may continue in the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2708 * line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2709 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2710 end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2711 startpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2712 startpos.col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2713 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2714 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2715
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2716 if (endpos.lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2717 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2718 // No end pattern matched.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2719 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2720 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2721 // a "oneline" never continues in the next line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2722 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2723 sip->si_m_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2724 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline());
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2725 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2726 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2727 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2728 // continues in the next line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2729 sip->si_ends = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2730 sip->si_m_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2731 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2732 sip->si_h_endpos = sip->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2733 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2734 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2735 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2736 // match within this line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2737 sip->si_m_endpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2738 sip->si_h_endpos = hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2739 sip->si_eoe_pos = end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2740 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2741 sip->si_end_idx = end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2742 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2743 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2744
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2745 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2746 * Add a new state to the current state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2747 * It is cleared and the index set to "idx".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2748 * Return FAIL if it's not possible (out of memory).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2749 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2750 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2751 push_current_state(int idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2752 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2753 if (ga_grow(&current_state, 1) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2754 return FAIL;
20007
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents: 19934
diff changeset
2755 CLEAR_POINTER(&CUR_STATE(current_state.ga_len));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2756 CUR_STATE(current_state.ga_len).si_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2757 ++current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2758 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2759 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2760
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2761 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2762 * Remove a state from the current_state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2763 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2764 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2765 pop_current_state(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2766 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2767 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2768 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2769 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2770 --current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2771 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2772 // after the end of a pattern, try matching a keyword or pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2773 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2774
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2775 // if first state with "keepend" is popped, reset keepend_level
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2776 if (keepend_level >= current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2777 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2778 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2779
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2780 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2781 * Find the end of a start/skip/end syntax region after "startpos".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2782 * Only checks one line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2783 * Also handles a match item that continued from a previous line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2784 * If not found, the syntax item continues in the next line. m_endpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2785 * will be 0.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2786 * If found, the end of the region and the end of the highlighting is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2787 * computed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2788 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2789 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
2790 find_endpos(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2791 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
2792 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
2793 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
2794 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
2795 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
2796 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
2797 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
2798 reg_extmatch_T *start_ext) // submatches from the start pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2799 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2800 colnr_T matchcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2801 synpat_T *spp, *spp_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2802 int start_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2803 int best_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2804 regmmatch_T regmatch;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2805 regmmatch_T best_regmatch; // startpos/endpos of best match
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2806 lpos_T pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2807 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2808 int had_match = FALSE;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2809 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
2810
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2811 // just in case we are invoked for a keyword
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2812 if (idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2813 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2814
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2815 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2816 * Check for being called with a START pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2817 * Can happen with a match that continues to the next line, because it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2818 * contained a region.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2819 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2820 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2821 if (spp->sp_type != SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2822 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2823 *hl_endpos = *startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2824 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2825 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2826
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2827 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2828 * Find the SKIP or first END pattern after the last START pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2829 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2830 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2831 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2832 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2833 if (spp->sp_type != SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2834 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2835 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2836 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2837
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2838 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2839 * Lookup the SKIP pattern (if present)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2840 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2841 if (spp->sp_type == SPTYPE_SKIP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2842 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2843 spp_skip = spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2844 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2845 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2846 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2847 spp_skip = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2848
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2849 // Setup external matches for syn_regexec().
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2850 unref_extmatch(re_extmatch_in);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2851 re_extmatch_in = ref_extmatch(start_ext);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2852
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2853 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
2854 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
2855 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
2856
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2857 // use syntax iskeyword option
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
2858 save_chartab(buf_chartab);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
2859
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2860 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2861 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2862 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2863 * Find end pattern that matches first after "matchcol".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2864 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2865 best_idx = -1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2866 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2867 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2868 int lc_col = matchcol;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2869 int r;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2870
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2871 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
2872 if (spp->sp_type != SPTYPE_END) // past last END pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2873 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2874 lc_col -= spp->sp_offsets[SPO_LC_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2875 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2876 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2877
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2878 regmatch.rmm_ic = spp->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2879 regmatch.regprog = spp->sp_prog;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2880 r = syn_regexec(&regmatch, startpos->lnum, lc_col,
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2881 IF_SYN_TIME(&spp->sp_time));
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2882 spp->sp_prog = regmatch.regprog;
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2883 if (r)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2884 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2885 if (best_idx == -1 || regmatch.startpos[0].col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2886 < best_regmatch.startpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2887 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2888 best_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2889 best_regmatch.startpos[0] = regmatch.startpos[0];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2890 best_regmatch.endpos[0] = regmatch.endpos[0];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2891 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2892 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2893 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2894
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2895 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2896 * If all end patterns have been tried, and there is no match, the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2897 * item continues until end-of-line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2898 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2899 if (best_idx == -1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2900 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2901
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2902 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2903 * If the skip pattern matches before the end pattern,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2904 * continue searching after the skip pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2905 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2906 if (spp_skip != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2907 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2908 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF];
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2909 int r;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2910
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2911 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2912 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2913 regmatch.rmm_ic = spp_skip->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2914 regmatch.regprog = spp_skip->sp_prog;
6375
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2915 r = syn_regexec(&regmatch, startpos->lnum, lc_col,
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2916 IF_SYN_TIME(&spp_skip->sp_time));
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2917 spp_skip->sp_prog = regmatch.regprog;
27a36d1013a6 updated for version 7.4.519
Bram Moolenaar <bram@vim.org>
parents: 5954
diff changeset
2918 if (r && regmatch.startpos[0].col
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2919 <= best_regmatch.startpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2920 {
7500
ef568437e49a commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents: 7467
diff changeset
2921 int line_len;
ef568437e49a commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents: 7467
diff changeset
2922
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2923 // Add offset to skip pattern match
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2924 syn_add_end_off(&pos, &regmatch, spp_skip, SPO_ME_OFF, 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2925
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2926 // 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
2927 // match with an end pattern in this line.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2928 if (pos.lnum > startpos->lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2929 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2930
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2931 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
2932 line_len = (int)STRLEN(line);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2933
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2934 // take care of an empty match or negative offset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2935 if (pos.col <= matchcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2936 ++matchcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2937 else if (pos.col <= regmatch.endpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2938 matchcol = pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2939 else
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2940 // Be careful not to jump over the NUL at the end-of-line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2941 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
2942 matchcol < line_len && matchcol < pos.col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2943 ++matchcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2944 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2945
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2946 // 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
2947 if (matchcol >= line_len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2948 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2949
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2950 continue; // start with first end pattern again
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2951 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2953
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2954 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2955 * Match from start pattern to end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2956 * Correct for match and highlight offset of end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2957 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2958 spp = &(SYN_ITEMS(syn_block)[best_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2959 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
2960 // can't end before the start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2961 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2962 m_endpos->col = startpos->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2963
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2964 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
2965 // can't end before the start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2966 if (end_endpos->lnum == startpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2967 && end_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2968 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
2969 // can't end after the match
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2970 limit_pos(end_endpos, m_endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2971
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2972 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2973 * If the end group is highlighted differently, adjust the pointers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2974 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2975 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2976 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2977 *end_idx = best_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2978 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2979 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2980 hl_endpos->lnum = best_regmatch.endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2981 hl_endpos->col = best_regmatch.endpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2982 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2983 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2984 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2985 hl_endpos->lnum = best_regmatch.startpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2986 hl_endpos->col = best_regmatch.startpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2987 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2988 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2989
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2990 // can't end before the start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2991 if (hl_endpos->lnum == startpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2992 && hl_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2993 hl_endpos->col = startpos->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2994 limit_pos(hl_endpos, m_endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2995
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
2996 // 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
2997 // into the matchgroup for the end
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2998 *m_endpos = *hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2999 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3000 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3001 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3002 *end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3003 *hl_endpos = *end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3004 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3005
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3006 *flagsp = spp->sp_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3007
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3008 had_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3009 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3010 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3011
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3012 // no match for an END pattern in this line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3013 if (!had_match)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3014 m_endpos->lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3015
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3016 restore_chartab(buf_chartab);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3017
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3018 // Remove external matches.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3019 unref_extmatch(re_extmatch_in);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3020 re_extmatch_in = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3021 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3022
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3023 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3024 * Limit "pos" not to be after "limit".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3025 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3026 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3027 limit_pos(lpos_T *pos, lpos_T *limit)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3028 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3029 if (pos->lnum > limit->lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3030 *pos = *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3031 else if (pos->lnum == limit->lnum && pos->col > limit->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3032 pos->col = limit->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3033 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3034
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3035 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3036 * Limit "pos" not to be after "limit", unless pos->lnum is zero.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3037 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3038 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3039 limit_pos_zero(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3040 lpos_T *pos,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3041 lpos_T *limit)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3042 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3043 if (pos->lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3044 *pos = *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3045 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3046 limit_pos(pos, limit);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3047 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3048
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3049 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3050 * Add offset to matched text for end of match or highlight.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3051 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3052 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3053 syn_add_end_off(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3054 lpos_T *result, // returned position
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3055 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
3056 synpat_T *spp, // matched pattern
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3057 int idx, // index of offset
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3058 int extra) // extra chars for offset to start
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3059 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3060 int col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3061 int off;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3062 char_u *base;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3063 char_u *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3064
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3065 if (spp->sp_off_flags & (1 << idx))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3066 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3067 result->lnum = regmatch->startpos[0].lnum;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3068 col = regmatch->startpos[0].col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3069 off = spp->sp_offsets[idx] + extra;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3070 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3071 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3072 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3073 result->lnum = regmatch->endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3074 col = regmatch->endpos[0].col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3075 off = spp->sp_offsets[idx];
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3076 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3077 // 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
3078 // is a matchgroup. Watch out for match with last NL in the buffer.
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3079 if (result->lnum > syn_buf->b_ml.ml_line_count)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3080 col = 0;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3081 else if (off != 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3082 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3083 base = ml_get_buf(syn_buf, result->lnum, FALSE);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3084 p = base + col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3085 if (off > 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3086 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3087 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
3088 MB_PTR_ADV(p);
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3089 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3090 else if (off < 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3091 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3092 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
3093 MB_PTR_BACK(base, p);
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3094 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3095 col = (int)(p - base);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3096 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3097 result->col = col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3098 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3099
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3100 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3101 * Add offset to matched text for start of match or highlight.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3102 * Avoid resulting column to become negative.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3103 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3104 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3105 syn_add_start_off(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3106 lpos_T *result, // returned position
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3107 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
3108 synpat_T *spp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3109 int idx,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3110 int extra) // extra chars for offset to end
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3111 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3112 int col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3113 int off;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3114 char_u *base;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3115 char_u *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3116
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3117 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3118 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3119 result->lnum = regmatch->endpos[0].lnum;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3120 col = regmatch->endpos[0].col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3121 off = spp->sp_offsets[idx] + extra;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3122 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3123 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3124 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3125 result->lnum = regmatch->startpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3126 col = regmatch->startpos[0].col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3127 off = spp->sp_offsets[idx];
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3128 }
2092
98cc757f7e3d updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents: 2047
diff changeset
3129 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
3130 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3131 // 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
3132 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
3133 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
3134 }
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3135 if (off != 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3136 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3137 base = ml_get_buf(syn_buf, result->lnum, FALSE);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3138 p = base + col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3139 if (off > 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3140 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3141 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
3142 MB_PTR_ADV(p);
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3143 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3144 else if (off < 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3145 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3146 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
3147 MB_PTR_BACK(base, p);
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3148 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3149 col = (int)(p - base);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3150 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3151 result->col = col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3152 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3153
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3154 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3155 * Get current line in syntax buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3156 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3157 static char_u *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3158 syn_getcurline(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3159 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3160 return ml_get_buf(syn_buf, current_lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3161 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3162
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3163 /*
410
c60ba877860b updated for version 7.0107
vimboss
parents: 386
diff changeset
3164 * Call vim_regexec() to find a match with "rmp" in "syn_buf".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3165 * Returns TRUE when there is a match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3166 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3167 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3168 syn_regexec(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3169 regmmatch_T *rmp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3170 linenr_T lnum,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3171 colnr_T col,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3172 syn_time_T *st UNUSED)
4764
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 int r;
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
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3176 int timed_out = FALSE;
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3177 #endif
4766
ec24ff78a79c updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents: 4764
diff changeset
3178 #ifdef FEAT_PROFILE
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3179 proftime_T pt;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3180
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3181 if (syn_time_on)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3182 profile_start(&pt);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3183 #endif
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3184
14161
7cac4646c552 patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents: 13976
diff changeset
3185 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
3186 // 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
3187 // 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
3188 // 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
3189 return FALSE;
7cac4646c552 patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents: 13976
diff changeset
3190
410
c60ba877860b updated for version 7.0107
vimboss
parents: 386
diff changeset
3191 rmp->rmm_maxcol = syn_buf->b_p_smc;
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3192 r = vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col,
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3193 #ifdef FEAT_RELTIME
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3194 syn_tm, &timed_out
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3195 #else
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3196 NULL, NULL
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3197 #endif
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3198 );
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3199
4766
ec24ff78a79c updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents: 4764
diff changeset
3200 #ifdef FEAT_PROFILE
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3201 if (syn_time_on)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3202 {
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3203 profile_end(&pt);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3204 profile_add(&st->total, &pt);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3205 if (profile_cmp(&pt, &st->slowest) < 0)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3206 st->slowest = pt;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3207 ++st->count;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3208 if (r > 0)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3209 ++st->match;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3210 }
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3211 #endif
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3212 #ifdef FEAT_RELTIME
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
3213 if (timed_out && !syn_win->w_s->b_syn_slow)
1c79c92a642e patch 8.1.0198: there is no hint that syntax is disabled for 'redrawtime'
Christian Brabandt <cb@256bit.org>
parents: 14161
diff changeset
3214 {
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3215 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
3216 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
3217 }
11529
998d2cf59caa patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents: 11521
diff changeset
3218 #endif
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3219
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
3220 if (r > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3221 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3222 rmp->startpos[0].lnum += lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3223 rmp->endpos[0].lnum += lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3224 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3225 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3226 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3227 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3228
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3229 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3230 * Check one position in a line for a matching keyword.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3231 * 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
3232 * Return its ID if found, 0 otherwise.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3233 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3234 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3235 check_keyword_id(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3236 char_u *line,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3237 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
3238 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
3239 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
3240 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
3241 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
3242 int *ccharp UNUSED) // conceal substitution char
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3243 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3244 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3245 char_u *kwp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3246 int round;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3247 int kwlen;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3248 char_u keyword[MAXKEYWLEN + 1]; // assume max. keyword len is 80
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3249 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3250 hashitem_T *hi;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3251
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3252 // 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
3253 // checked.
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3254 kwp = line + startcol;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3255 kwlen = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3256 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3257 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3258 if (has_mbyte)
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 448
diff changeset
3259 kwlen += (*mb_ptr2len)(kwp + kwlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3260 else
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3261 ++kwlen;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3262 }
4043
80b041b994d1 updated for version 7.3.776
Bram Moolenaar <bram@vim.org>
parents: 3900
diff changeset
3263 while (vim_iswordp_buf(kwp + kwlen, syn_buf));
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3264
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3265 if (kwlen > MAXKEYWLEN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3266 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3267
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3268 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3269 * Must make a copy of the keyword, so we can add a NUL and make it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3270 * lowercase.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3271 */
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3272 vim_strncpy(keyword, kwp, kwlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3273
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3274 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3275 * Try twice:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3276 * 1. matching case
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3277 * 2. ignoring case
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3278 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3279 for (round = 1; round <= 2; ++round)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3280 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3281 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3282 if (ht->ht_used == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3283 continue;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3284 if (round == 2) // ignore case
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3285 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3286
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3287 /*
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3288 * Find keywords that match. There can be several with different
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3289 * attributes.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3290 * When current_next_list is non-zero accept only that group, otherwise:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3291 * Accept a not-contained keyword at toplevel.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3292 * Accept a keyword at other levels only if it is in the contains list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3293 */
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3294 hi = hash_find(ht, keyword);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3295 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3296 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3297 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3298 if (current_next_list != 0
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3299 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3300 : (cur_si == NULL
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3301 ? !(kp->flags & HL_CONTAINED)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3302 : in_id_list(cur_si, cur_si->si_cont_list,
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3303 &kp->k_syn, kp->flags & HL_CONTAINED)))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3304 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3305 *endcolp = startcol + kwlen;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3306 *flagsp = kp->flags;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3307 *next_listp = kp->next_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3308 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3309 *ccharp = kp->k_char;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3310 #endif
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3311 return kp->k_syn.id;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3312 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3313 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3314 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3315 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3316 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3317
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3318 /*
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3319 * Handle ":syntax conceal" command.
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3320 */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3321 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3322 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
3323 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3324 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3325 char_u *arg = eap->arg;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3326 char_u *next;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3327
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3328 eap->nextcmd = find_nextcmd(arg);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3329 if (eap->skip)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3330 return;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3331
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3332 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
3333 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
3334 {
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3335 if (curwin->w_s->b_syn_conceal)
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3336 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
3337 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3338 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
3339 }
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3340 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
3341 curwin->w_s->b_syn_conceal = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3342 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
3343 curwin->w_s->b_syn_conceal = FALSE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3344 else
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
3345 semsg(_(e_illegal_arg), arg);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3346 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3347 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3348
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3349 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3350 * Handle ":syntax case" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3351 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3352 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3353 syn_cmd_case(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3354 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3355 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3356 char_u *next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3357
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3358 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3359 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3360 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3361
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3362 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
3363 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
3364 {
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3365 if (curwin->w_s->b_syn_ic)
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3366 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
3367 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3368 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
3369 }
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3370 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
3371 curwin->w_s->b_syn_ic = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3372 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
3373 curwin->w_s->b_syn_ic = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3374 else
20623
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3375 semsg(_(e_illegal_arg), 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
3376 }
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3377
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3378 /*
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3379 * 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
3380 */
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3381 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
3382 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
3383 {
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3384 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
3385 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
3386
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3387 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
3388 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
3389 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
3390
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3391 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
3392 {
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3393 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
3394 {
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3395 case SYNFLD_START: msg(_("syntax foldlevel start")); 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
3396 case SYNFLD_MINIMUM: msg(_("syntax foldlevel minimum")); 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
3397 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
3398 }
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3399 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
3400 }
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3401
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3402 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
3403 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
3404 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
3405 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
3406 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
3407 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
3408 {
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3409 semsg(_(e_illegal_arg), 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
3410 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
3411 }
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3412
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3413 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
3414 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
3415 {
99b6e6bf48bf patch 8.2.0865: syntax foldlevel is taken from the start of the line
Bram Moolenaar <Bram@vim.org>
parents: 20116
diff changeset
3416 semsg(_(e_illegal_arg), 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
3417 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3418 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3419
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3420 /*
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3421 * Handle ":syntax spell" command.
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3422 */
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3423 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3424 syn_cmd_spell(exarg_T *eap, int syncing UNUSED)
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3425 {
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3426 char_u *arg = eap->arg;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3427 char_u *next;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3428
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3429 eap->nextcmd = find_nextcmd(arg);
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3430 if (eap->skip)
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3431 return;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3432
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3433 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
3434 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
3435 {
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3436 if (curwin->w_s->b_syn_spell == SYNSPL_TOP)
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3437 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
3438 else if (curwin->w_s->b_syn_spell == SYNSPL_NOTOP)
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3439 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
3440 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3441 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
3442 }
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
3443 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
3444 curwin->w_s->b_syn_spell = SYNSPL_TOP;
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3445 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
3446 curwin->w_s->b_syn_spell = SYNSPL_NOTOP;
1064
a8bcc7553263 updated for version 7.0-190
vimboss
parents: 1028
diff changeset
3447 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
3448 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT;
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3449 else
6880
bcc0909b379e patch 7.4.760
Bram Moolenaar <bram@vim.org>
parents: 6698
diff changeset
3450 {
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
3451 semsg(_(e_illegal_arg), arg);
6880
bcc0909b379e patch 7.4.760
Bram Moolenaar <bram@vim.org>
parents: 6698
diff changeset
3452 return;
bcc0909b379e patch 7.4.760
Bram Moolenaar <bram@vim.org>
parents: 6698
diff changeset
3453 }
bcc0909b379e patch 7.4.760
Bram Moolenaar <bram@vim.org>
parents: 6698
diff changeset
3454
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3455 // assume spell checking changed, force a redraw
6880
bcc0909b379e patch 7.4.760
Bram Moolenaar <bram@vim.org>
parents: 6698
diff changeset
3456 redraw_win_later(curwin, NOT_VALID);
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3457 }
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3458
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3459 /*
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3460 * Handle ":syntax iskeyword" command.
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3461 */
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3462 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3463 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
3464 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3465 char_u *arg = eap->arg;
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3466 char_u save_chartab[32];
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3467 char_u *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 if (eap->skip)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3470 return;
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 arg = skipwhite(arg);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3473 if (*arg == NUL)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3474 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3475 msg_puts("\n");
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3476 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
3477 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3478 msg_puts(_("syntax iskeyword "));
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3479 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
3480 }
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3481 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
3482 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
3483 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3484 else
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3485 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3486 if (STRNICMP(arg, "clear", 5) == 0)
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3487 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3488 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
3489 (size_t)32);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3490 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
3491 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3492 else
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3493 {
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3494 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
3495 save_isk = curbuf->b_p_isk;
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3496 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
3497
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3498 buf_init_chartab(curbuf, FALSE);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3499 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
3500 (size_t)32);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3501 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
3502 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
3503 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
3504 curbuf->b_p_isk = save_isk;
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3505 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3506 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3507 redraw_win_later(curwin, NOT_VALID);
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3508 }
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3509
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3510 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3511 * Clear all syntax info for one buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3512 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3513 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3514 syntax_clear(synblock_T *block)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3515 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3516 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3517
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3518 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
3519 #ifdef FEAT_RELTIME
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3520 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
3521 #endif
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3522 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
3523 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
3524 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
3525 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
3526 #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
3527 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
3528 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3529
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3530 // free the keywords
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3531 clear_keywtab(&block->b_keywtab);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3532 clear_keywtab(&block->b_keywtab_ic);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3533
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3534 // free the syntax patterns
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3535 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
3536 syn_clear_pattern(block, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3537 ga_clear(&block->b_syn_patterns);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3538
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3539 // free the syntax clusters
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3540 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
3541 syn_clear_cluster(block, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3542 ga_clear(&block->b_syn_clusters);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3543 block->b_spell_cluster_id = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3544 block->b_nospell_cluster_id = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3545
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3546 block->b_syn_sync_flags = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3547 block->b_syn_sync_minlines = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3548 block->b_syn_sync_maxlines = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3549 block->b_syn_sync_linebreaks = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3550
4805
66803af09906 updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents: 4803
diff changeset
3551 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
3552 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
3553 VIM_CLEAR(block->b_syn_linecont_pat);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3554 #ifdef FEAT_FOLDING
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3555 block->b_syn_folditems = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3556 #endif
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
3557 clear_string_option(&block->b_syn_isk);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3558
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3559 // free the stored states
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3560 syn_stack_free_all(block);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3561 invalidate_current_state();
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
3562
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3563 // Reset the counter for ":syn include"
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
3564 running_syn_inc_tag = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3565 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3566
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3567 /*
2253
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3568 * 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
3569 */
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3570 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3571 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
3572 {
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3573 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
3574 {
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3575 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
3576 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
3577 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
3578 }
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3579 }
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3580
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3581 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3582 * Clear syncing info for one buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3583 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3584 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3585 syntax_sync_clear(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3586 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3587 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3588
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3589 // free the syntax patterns
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3590 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
3591 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
3592 syn_remove_pattern(curwin->w_s, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3593
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3594 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
3595 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
3596 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
3597 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
3598
4805
66803af09906 updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents: 4803
diff changeset
3599 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
3600 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
3601 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
3602 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
3603
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3604 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3605 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3606
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3607 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3608 * Remove one pattern from the buffer's pattern list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3609 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3610 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3611 syn_remove_pattern(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3612 synblock_T *block,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3613 int idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3614 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3615 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3616
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3617 spp = &(SYN_ITEMS(block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3618 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3619 if (spp->sp_flags & HL_FOLD)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3620 --block->b_syn_folditems;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3621 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3622 syn_clear_pattern(block, idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3623 mch_memmove(spp, spp + 1,
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3624 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
3625 --block->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3626 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3627
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3628 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3629 * Clear and free one syntax pattern. When clearing all, must be called from
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3630 * last to first!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3631 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3632 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3633 syn_clear_pattern(synblock_T *block, int i)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3634 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3635 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
3636 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
3637 // 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
3638 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
3639 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3640 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
3641 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
3642 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3643 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3644 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3645
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3646 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3647 * Clear and free one syntax cluster.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3648 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3649 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3650 syn_clear_cluster(synblock_T *block, int i)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3651 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3652 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
3653 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
3654 vim_free(SYN_CLSTR(block)[i].scl_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3655 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3656
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3657 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3658 * Handle ":syntax clear" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3659 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3660 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3661 syn_cmd_clear(exarg_T *eap, int syncing)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3662 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3663 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3664 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3665 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3666
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3667 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3668 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3669 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3670
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3671 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3672 * We have to disable this within ":syn include @group filename",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3673 * because otherwise @group would get deleted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3674 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3675 * clear".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3676 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3677 if (curwin->w_s->b_syn_topgrp != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3678 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3679
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
3680 if (ends_excmd2(eap->cmd, arg))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3681 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3682 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3683 * No argument: Clear all syntax items.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3684 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3685 if (syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3686 syntax_sync_clear();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3687 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3688 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3689 syntax_clear(curwin->w_s);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3690 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
3691 do_unlet((char_u *)"b:current_syntax", TRUE);
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
3692 do_unlet((char_u *)"w:current_syntax", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3693 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3694 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3695 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3696 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3697 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3698 * Clear the group IDs that are in the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3699 */
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
3700 while (!ends_excmd2(eap->cmd, arg))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3701 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3702 arg_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3703 if (*arg == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3704 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3705 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3706 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3707 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
3708 semsg(_("E391: No such syntax cluster: %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3709 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3710 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3711 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3712 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3713 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3714 * We can't physically delete a cluster without changing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3715 * the IDs of other clusters, so we do the next best thing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3716 * and make it empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3717 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3718 short scl_id = id - SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3719
13244
ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents: 12973
diff changeset
3720 VIM_CLEAR(SYN_CLSTR(curwin->w_s)[scl_id].scl_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3721 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3722 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3723 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3724 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3725 id = syn_namen2id(arg, (int)(arg_end - arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3726 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3727 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
3728 semsg(_(e_nogroup), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3729 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3730 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3731 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3732 syn_clear_one(id, syncing);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3733 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3734 arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3735 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3736 }
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
3737 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3738 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3739 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3740
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3741 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3742 * Clear one syntax group for the current buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3743 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3744 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3745 syn_clear_one(int id, int syncing)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3746 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3747 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3748 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3749
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3750 // Clear keywords only when not ":syn sync clear group-name"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3751 if (!syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3752 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3753 (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
3754 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3755 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3756
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3757 // clear the patterns for "id"
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3758 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
3759 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3760 spp = &(SYN_ITEMS(curwin->w_s)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3761 if (spp->sp_syn.id != id || spp->sp_syncing != syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3762 continue;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3763 syn_remove_pattern(curwin->w_s, idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3764 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3765 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3766
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3767 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3768 * Handle ":syntax on" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3769 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3770 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3771 syn_cmd_on(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3772 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3773 syn_cmd_onoff(eap, "syntax");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3774 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3775
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3776 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3777 * Handle ":syntax enable" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3778 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3779 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3780 syn_cmd_enable(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3781 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3782 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3783 syn_cmd_onoff(eap, "syntax");
148
72aefd4c1e0d updated for version 7.0046
vimboss
parents: 134
diff changeset
3784 do_unlet((char_u *)"g:syntax_cmd", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3785 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3786
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3787 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3788 * Handle ":syntax reset" command.
8815
50d9fb580ffe commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816
Christian Brabandt <cb@256bit.org>
parents: 8806
diff changeset
3789 * It actually resets highlighting, not syntax.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3790 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3791 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3792 syn_cmd_reset(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3793 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3794 eap->nextcmd = check_nextcmd(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3795 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3796 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3797 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3798 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim");
148
72aefd4c1e0d updated for version 7.0046
vimboss
parents: 134
diff changeset
3799 do_unlet((char_u *)"g:syntax_cmd", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3800 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3801 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3802
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3803 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3804 * Handle ":syntax manual" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3805 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3806 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3807 syn_cmd_manual(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3808 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3809 syn_cmd_onoff(eap, "manual");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3810 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3811
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3812 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3813 * Handle ":syntax off" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3814 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3815 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3816 syn_cmd_off(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3817 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3818 syn_cmd_onoff(eap, "nosyntax");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3819 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3820
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3821 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3822 syn_cmd_onoff(exarg_T *eap, char *name)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3824 char_u buf[100];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3825
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3826 eap->nextcmd = check_nextcmd(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3827 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3828 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3829 STRCPY(buf, "so ");
274
8fa8d7964cf1 updated for version 7.0073
vimboss
parents: 271
diff changeset
3830 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3831 do_cmdline_cmd(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3832 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3833 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3834
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3835 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3836 * Handle ":syntax [list]" command: list current syntax words.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3837 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3838 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3839 syn_cmd_list(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3840 exarg_T *eap,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3841 int syncing) // when TRUE: list syncing items
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3842 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3843 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3844 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3845 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3846
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3847 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3848 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3849 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3850
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3851 if (!syntax_present(curwin))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3852 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3853 msg(_(msg_no_items));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3854 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3855 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3856
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3857 if (syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3858 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3859 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3860 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3861 msg_puts(_("syncing on C-style comments"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3862 syn_lines_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3863 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3864 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3865 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3866 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
3867 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3868 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
3869 msg_puts(_("no syncing"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3870 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3871 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3872 msg_puts(_("syncing starts "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3873 msg_outnum(curwin->w_s->b_syn_sync_minlines);
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3874 msg_puts(_(" lines before top line"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3875 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3876 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3877 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3878 }
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3879 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
3880 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
3881 || 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
3882 || curwin->w_s->b_syn_sync_linebreaks > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3883 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3884 msg_puts(_("\nsyncing on items"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3885 syn_lines_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3886 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3887 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3888 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3889 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3890 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
3891 if (ends_excmd2(eap->cmd, arg))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3892 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3893 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3894 * No argument: List all group IDs and all syntax clusters.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3895 */
17401
5462bb963075 patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents: 17389
diff changeset
3896 for (id = 1; id <= highlight_num_groups() && !got_int; ++id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3897 syn_list_one(id, syncing, FALSE);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3898 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3899 syn_list_cluster(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3900 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3901 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3902 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3903 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3904 * List the group IDs and syntax clusters that are in the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3905 */
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
3906 while (!ends_excmd2(eap->cmd, arg) && !got_int)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3907 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3908 arg_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3909 if (*arg == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3910 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3911 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3912 if (id == 0)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
3913 semsg(_("E392: No such syntax cluster: %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3914 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3915 syn_list_cluster(id - SYNID_CLUSTER);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3916 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3917 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3918 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3919 id = syn_namen2id(arg, (int)(arg_end - arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3920 if (id == 0)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
3921 semsg(_(e_nogroup), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3922 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3923 syn_list_one(id, syncing, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3924 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3925 arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3926 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3927 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3928 eap->nextcmd = check_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3929 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3930
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3931 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3932 syn_lines_msg(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3933 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3934 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
3935 || curwin->w_s->b_syn_sync_minlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3936 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3937 msg_puts("; ");
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3938 if (curwin->w_s->b_syn_sync_minlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3939 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3940 msg_puts(_("minimal "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3941 msg_outnum(curwin->w_s->b_syn_sync_minlines);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3942 if (curwin->w_s->b_syn_sync_maxlines)
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3943 msg_puts(", ");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3944 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3945 if (curwin->w_s->b_syn_sync_maxlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3946 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3947 msg_puts(_("maximal "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3948 msg_outnum(curwin->w_s->b_syn_sync_maxlines);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3949 }
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3950 msg_puts(_(" lines before top line"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3951 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3953
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3954 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3955 syn_match_msg(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3956 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3957 if (curwin->w_s->b_syn_sync_linebreaks > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3958 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
3959 msg_puts(_("; match "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3960 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
3961 msg_puts(_(" line breaks"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3962 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3963 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3964
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3965 static int last_matchgroup;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3966
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3967 struct name_list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3968 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3969 int flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3970 char *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3971 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3972
7805
0b6c37dd858d commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents: 7687
diff changeset
3973 static void syn_list_flags(struct name_list *nl, int flags, int attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3974
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3975 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3976 * List one syntax item, for ":syntax" or "syntax list syntax_name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3977 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3978 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3979 syn_list_one(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
3980 int id,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
3981 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
3982 int link_only) // when TRUE; list link-only too
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3983 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3984 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3985 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3986 int did_header = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3987 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3988 static struct name_list namelist1[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3989 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3990 {HL_DISPLAY, "display"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3991 {HL_CONTAINED, "contained"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3992 {HL_ONELINE, "oneline"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3993 {HL_KEEPEND, "keepend"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3994 {HL_EXTEND, "extend"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3995 {HL_EXCLUDENL, "excludenl"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3996 {HL_TRANSP, "transparent"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3997 {HL_FOLD, "fold"},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3998 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3999 {HL_CONCEAL, "conceal"},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4000 {HL_CONCEALENDS, "concealends"},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4001 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4002 {0, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4003 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4004 static struct name_list namelist2[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4005 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4006 {HL_SKIPWHITE, "skipwhite"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4007 {HL_SKIPNL, "skipnl"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4008 {HL_SKIPEMPTY, "skipempty"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4009 {0, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4010 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4011
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4012 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
4013
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4014 // list the keywords for "id"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4015 if (!syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4016 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4017 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
4018 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4019 did_header, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4020 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4021
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4022 // list the patterns for "id"
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4023 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
4024 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4025 spp = &(SYN_ITEMS(curwin->w_s)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4026 if (spp->sp_syn.id != id || spp->sp_syncing != syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4027 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4028
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4029 (void)syn_list_header(did_header, 999, id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4030 did_header = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4031 last_matchgroup = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4032 if (spp->sp_type == SPTYPE_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4033 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4034 put_pattern("match", ' ', spp, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4035 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4036 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4037 else if (spp->sp_type == SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4038 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4039 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
4040 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
4041 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
4042 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
4043 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
4044 && 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
4045 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4046 --idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4047 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4048 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4049 syn_list_flags(namelist1, spp->sp_flags, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4050
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4051 if (spp->sp_cont_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4052 put_id_list((char_u *)"contains", spp->sp_cont_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4053
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4054 if (spp->sp_syn.cont_in_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4055 put_id_list((char_u *)"containedin",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4056 spp->sp_syn.cont_in_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4057
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4058 if (spp->sp_next_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4059 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4060 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4061 syn_list_flags(namelist2, spp->sp_flags, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4062 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4063 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4064 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4065 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
4066 msg_puts_attr("grouphere", attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4067 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4068 msg_puts_attr("groupthere", attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4069 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4070 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
4071 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
4072 [spp->sp_sync_idx].sp_syn.id - 1));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4073 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4074 msg_puts("NONE");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4075 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4076 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4077 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4078
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4079 // 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
4080 if (highlight_link_id(id - 1) && (did_header || link_only) && !got_int)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4081 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4082 (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
4083 msg_puts_attr("links to", attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4084 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
4085 msg_outtrans(highlight_group_name(highlight_link_id(id - 1) - 1));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4086 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4087 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4088
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4089 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4090 syn_list_flags(struct name_list *nlist, int flags, int attr)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4091 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4092 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4093
3263
320cc46d0eb0 updated for version 7.3.400
Bram Moolenaar <bram@vim.org>
parents: 2906
diff changeset
4094 for (i = 0; nlist[i].flag != 0; ++i)
320cc46d0eb0 updated for version 7.3.400
Bram Moolenaar <bram@vim.org>
parents: 2906
diff changeset
4095 if (flags & nlist[i].flag)
320cc46d0eb0 updated for version 7.3.400
Bram Moolenaar <bram@vim.org>
parents: 2906
diff changeset
4096 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4097 msg_puts_attr(nlist[i].name, attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4098 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4099 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4100 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4101
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4102 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4103 * List one syntax cluster, for ":syntax" or "syntax list syntax_name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4104 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4105 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4106 syn_list_cluster(int id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4107 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4108 int endcol = 15;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4109
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4110 // slight hack: roughly duplicate the guts of syn_list_header()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4111 msg_putchar('\n');
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4112 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4113
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4114 if (msg_col >= endcol) // output at least one space
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4115 endcol = msg_col + 1;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4116 if (Columns <= endcol) // avoid hang for tiny window
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4117 endcol = Columns - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4119 msg_advance(endcol);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4120 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
4121 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4122 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
4123 HL_ATTR(HLF_D));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4124 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4125 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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_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
4128 msg_puts("=NONE");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4129 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4131
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4132 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4133 put_id_list(char_u *name, short *list, int attr)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4134 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4135 short *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4136
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4137 msg_puts_attr((char *)name, attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4138 msg_putchar('=');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4139 for (p = list; *p; ++p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4140 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4141 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4142 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4143 if (p[1])
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4144 msg_puts("ALLBUT");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4145 else
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4146 msg_puts("ALL");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4147 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4148 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4149 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4150 msg_puts("TOP");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4151 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4152 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4153 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4154 msg_puts("CONTAINED");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4155 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4156 else if (*p >= SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4157 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4158 short scl_id = *p - SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4159
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4160 msg_putchar('@');
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4161 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4162 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4163 else
17401
5462bb963075 patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents: 17389
diff changeset
4164 msg_outtrans(highlight_group_name(*p - 1));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4165 if (p[1])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4166 msg_putchar(',');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4167 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4168 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4169 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4170
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4171 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4172 put_pattern(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4173 char *s,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4174 int c,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4175 synpat_T *spp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4176 int attr)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4177 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4178 long n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4179 int mask;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4180 int first;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4181 static char *sepchars = "/+=-#@\"|'^&";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4182 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4183
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4184 // May have to write "matchgroup=group"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4185 if (last_matchgroup != spp->sp_syn_match_id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4186 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4187 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
4188 msg_puts_attr("matchgroup", attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4189 msg_putchar('=');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4190 if (last_matchgroup == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4191 msg_outtrans((char_u *)"NONE");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4192 else
17401
5462bb963075 patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents: 17389
diff changeset
4193 msg_outtrans(highlight_group_name(last_matchgroup - 1));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4194 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4195 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4196
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4197 // 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
4198 msg_puts_attr(s, attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4199 msg_putchar(c);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4200
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4201 // output the pattern, in between a char that is not in the pattern
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4202 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4203 if (sepchars[++i] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4204 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4205 i = 0; // no good char found, just use the first one
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4206 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4207 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4208 msg_putchar(sepchars[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4209 msg_outtrans(spp->sp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4210 msg_putchar(sepchars[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4211
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4212 // output any pattern options
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4213 first = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4214 for (i = 0; i < SPO_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4215 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4216 mask = (1 << i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4217 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4218 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4219 if (!first)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4220 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
4221 msg_puts(spo_name_tab[i]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4222 n = spp->sp_offsets[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4223 if (i != SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4224 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4225 if (spp->sp_off_flags & mask)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4226 msg_putchar('s');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4227 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4228 msg_putchar('e');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4229 if (n > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4230 msg_putchar('+');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4231 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4232 if (n || i == SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4233 msg_outnum(n);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4234 first = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4235 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4236 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4237 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4238 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4239
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4240 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4241 * List or clear the keywords for one syntax group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4242 * Return TRUE if the header has been printed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4243 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4244 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4245 syn_list_keywords(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4246 int id,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4247 hashtab_T *ht,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4248 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
4249 int attr)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4250 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4251 int outlen;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4252 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4253 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4254 int todo;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4255 int prev_contained = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4256 short *prev_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4257 short *prev_cont_in_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4258 int prev_skipnl = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4259 int prev_skipwhite = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4260 int prev_skipempty = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4261
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4262 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4263 * Unfortunately, this list of keywords is not sorted on alphabet but on
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4264 * hash value...
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4265 */
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4266 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4267 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4268 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4269 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4270 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4271 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4272 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4273 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4274 if (kp->k_syn.id == id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4275 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4276 if (prev_contained != (kp->flags & HL_CONTAINED)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4277 || prev_skipnl != (kp->flags & HL_SKIPNL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4278 || prev_skipwhite != (kp->flags & HL_SKIPWHITE)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4279 || prev_skipempty != (kp->flags & HL_SKIPEMPTY)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4280 || prev_cont_in_list != kp->k_syn.cont_in_list
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4281 || prev_next_list != kp->next_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4282 outlen = 9999;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4283 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4284 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
4285 // output "contained" and "nextgroup" on each line
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4286 if (syn_list_header(did_header, outlen, id))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4287 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4288 prev_contained = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4289 prev_next_list = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4290 prev_cont_in_list = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4291 prev_skipnl = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4292 prev_skipwhite = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4293 prev_skipempty = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4294 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4295 did_header = TRUE;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4296 if (prev_contained != (kp->flags & HL_CONTAINED))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4297 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4298 msg_puts_attr("contained", attr);
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4299 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4300 prev_contained = (kp->flags & HL_CONTAINED);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4301 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4302 if (kp->k_syn.cont_in_list != prev_cont_in_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4303 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4304 put_id_list((char_u *)"containedin",
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4305 kp->k_syn.cont_in_list, attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4306 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4307 prev_cont_in_list = kp->k_syn.cont_in_list;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4308 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4309 if (kp->next_list != prev_next_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4310 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4311 put_id_list((char_u *)"nextgroup", kp->next_list, attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4312 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4313 prev_next_list = kp->next_list;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4314 if (kp->flags & HL_SKIPNL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4315 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4316 msg_puts_attr("skipnl", attr);
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4317 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4318 prev_skipnl = (kp->flags & HL_SKIPNL);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4319 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4320 if (kp->flags & HL_SKIPWHITE)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4321 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4322 msg_puts_attr("skipwhite", attr);
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4323 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4324 prev_skipwhite = (kp->flags & HL_SKIPWHITE);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4325 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4326 if (kp->flags & HL_SKIPEMPTY)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4327 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
4328 msg_puts_attr("skipempty", attr);
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4329 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4330 prev_skipempty = (kp->flags & HL_SKIPEMPTY);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4331 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4332 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4333 msg_outtrans(kp->keyword);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4334 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4335 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4337 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4338
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4339 return did_header;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4340 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4341
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4342 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4343 syn_clear_keyword(int id, hashtab_T *ht)
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4344 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4345 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4346 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4347 keyentry_T *kp_prev;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4348 keyentry_T *kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4349 int todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4350
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4351 hash_lock(ht);
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4352 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4353 for (hi = ht->ht_array; todo > 0; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4354 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4355 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4356 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4357 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4358 kp_prev = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4359 for (kp = HI2KE(hi); kp != NULL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4360 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4361 if (kp->k_syn.id == id)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4362 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4363 kp_next = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4364 if (kp_prev == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4365 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4366 if (kp_next == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4367 hash_remove(ht, hi);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4368 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4369 hi->hi_key = KE2HIKEY(kp_next);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4370 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4371 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4372 kp_prev->ke_next = kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4373 vim_free(kp->next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4374 vim_free(kp->k_syn.cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4375 vim_free(kp);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4376 kp = kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4377 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4378 else
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4379 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4380 kp_prev = kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4381 kp = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4382 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4383 }
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4384 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4385 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4386 hash_unlock(ht);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4387 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4388
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4389 /*
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4390 * Clear a whole keyword table.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4391 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4392 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4393 clear_keywtab(hashtab_T *ht)
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4394 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4395 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4396 int todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4397 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4398 keyentry_T *kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4399
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4400 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4401 for (hi = ht->ht_array; todo > 0; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4402 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4403 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4404 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4405 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4406 for (kp = HI2KE(hi); kp != NULL; kp = kp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4407 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4408 kp_next = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4409 vim_free(kp->next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4410 vim_free(kp->k_syn.cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4411 vim_free(kp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4412 }
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4413 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4414 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4415 hash_clear(ht);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4416 hash_init(ht);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4417 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4418
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4419 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4420 * Add a keyword to the list of keywords.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4421 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4422 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4423 add_keyword(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4424 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
4425 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
4426 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
4427 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
4428 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
4429 int conceal_char)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4430 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4431 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4432 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4433 hashitem_T *hi;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4434 char_u *name_ic;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4435 long_u hash;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4436 char_u name_folded[MAXKEYWLEN + 1];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4437
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4438 if (curwin->w_s->b_syn_ic)
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4439 name_ic = str_foldcase(name, (int)STRLEN(name),
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4440 name_folded, MAXKEYWLEN + 1);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4441 else
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4442 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
4443 kp = alloc(offsetof(keyentry_T, keyword) + STRLEN(name_ic) + 1);
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4444 if (kp == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4445 return;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4446 STRCPY(kp->keyword, name_ic);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4447 kp->k_syn.id = id;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4448 kp->k_syn.inc_tag = current_syn_inc_tag;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4449 kp->flags = flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4450 kp->k_char = conceal_char;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4451 kp->k_syn.cont_in_list = copy_id_list(cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4452 if (cont_in_list != NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4453 curwin->w_s->b_syn_containedin = TRUE;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4454 kp->next_list = copy_id_list(next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4455
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4456 if (curwin->w_s->b_syn_ic)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4457 ht = &curwin->w_s->b_keywtab_ic;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4458 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4459 ht = &curwin->w_s->b_keywtab;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4460
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4461 hash = hash_hash(kp->keyword);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4462 hi = hash_lookup(ht, kp->keyword, hash);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4463 if (HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4464 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4465 // new keyword, add to hashtable
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4466 kp->ke_next = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4467 hash_add_item(ht, hi, kp->keyword, hash);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4468 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4469 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4470 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4471 // keyword already exists, prepend to list
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4472 kp->ke_next = HI2KE(hi);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4473 hi->hi_key = KE2HIKEY(kp);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4474 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4475 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4476
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4477 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4478 * Get the start and end of the group name argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4479 * Return a pointer to the first argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4480 * Return NULL if the end of the command was found instead of further args.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4481 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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_group_name(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4484 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
4485 char_u **name_end) // pointer to end of the name
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4486 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4487 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4488
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4489 *name_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4490 rest = skipwhite(*name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4491
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4492 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4493 * Check if there are enough arguments. The first argument may be a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4494 * pattern, where '|' is allowed, so only check for NUL.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4495 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4496 if (ends_excmd(*arg) || *rest == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4497 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4498 return rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4499 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4500
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4501 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4502 * Check for syntax command option arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4503 * This can be called at any place in the list of arguments, and just picks
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4504 * out the arguments that are known. Can be called several times in a row to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4505 * collect all options in between other arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4506 * Return a pointer to the next argument (which isn't an option).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4507 * Return NULL for any error;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4508 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4509 static char_u *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4510 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
4511 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
4512 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
4513 int *conceal_char UNUSED,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4514 int skip) // TRUE if skipping over command
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4515 {
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
4516 char_u *arg = start;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4517 char_u *gname_start, *gname;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4518 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4519 int len;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4520 char *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4521 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4522 int fidx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4523 static struct flag
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4524 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4525 char *name;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4526 int argtype;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4527 int flags;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4528 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4529 {"oOnNeElLiInNeE", 0, HL_ONELINE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4530 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4531 {"eExXtTeEnNdD", 0, HL_EXTEND},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4532 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4533 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4534 {"sSkKiIpPnNlL", 0, HL_SKIPNL},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4535 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4536 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4537 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4538 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4539 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4540 {"fFoOlLdD", 0, HL_FOLD},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4541 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4542 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4543 {"cCcChHaArR", 11, 0},
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4544 {"cCoOnNtTaAiInNsS", 1, 0},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4545 {"cCoOnNtTaAiInNeEdDiInN", 2, 0},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4546 {"nNeExXtTgGrRoOuUpP", 3, 0},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4547 };
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4548 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN";
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4549
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4550 if (arg == NULL) // already detected error
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4551 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4552
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4553 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4554 if (curwin->w_s->b_syn_conceal)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4555 opt->flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4556 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4557
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4558 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4559 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4560 /*
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4561 * This is used very often when a large number of keywords is defined.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4562 * Need to skip quickly when no option name is found.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4563 * Also avoid tolower(), it's slow.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4564 */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4565 if (strchr(first_letters, *arg) == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4566 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4567
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4568 for (fidx = sizeof(flagtab) / sizeof(struct flag); --fidx >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4569 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4570 p = flagtab[fidx].name;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4571 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4572 if (arg[len] != p[i] && arg[len] != p[i + 1])
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4573 break;
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11127
diff changeset
4574 if (p[i] == NUL && (VIM_ISWHITE(arg[len])
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4575 || (flagtab[fidx].argtype > 0
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4576 ? arg[len] == '='
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
4577 : ends_excmd2(start, arg + len))))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4578 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4579 if (opt->keyword
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4580 && (flagtab[fidx].flags == HL_DISPLAY
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4581 || flagtab[fidx].flags == HL_FOLD
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4582 || 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
4583 // treat "display", "fold" and "extend" as a keyword
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4584 fidx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4585 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4586 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4587 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4588 if (fidx < 0) // no match found
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4589 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4590
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4591 if (flagtab[fidx].argtype == 1)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4592 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4593 if (!opt->has_cont_list)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4594 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4595 emsg(_("E395: contains argument not accepted here"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4596 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4597 }
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4598 if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4599 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4600 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4601 else if (flagtab[fidx].argtype == 2)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4602 {
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4603 if (get_id_list(&arg, 11, &opt->cont_in_list, skip) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4604 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4605 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4606 else if (flagtab[fidx].argtype == 3)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4607 {
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4608 if (get_id_list(&arg, 9, &opt->next_list, skip) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4609 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4610 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4611 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
4612 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4613 // cchar=?
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4614 if (has_mbyte)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4615 {
15605
62b3805506b3 patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15555
diff changeset
4616 #ifdef FEAT_CONCEAL
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4617 *conceal_char = mb_ptr2char(arg + 6);
15605
62b3805506b3 patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15555
diff changeset
4618 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4619 arg += mb_ptr2len(arg + 6) - 1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4620 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4621 else
2251
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
4622 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4623 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4624 *conceal_char = arg[6];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4625 #else
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4626 ;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4627 #endif
2251
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
4628 }
2686
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4629 #ifdef FEAT_CONCEAL
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4630 if (!vim_isprintc_strict(*conceal_char))
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4631 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4632 emsg(_("E844: invalid cchar value"));
2686
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4633 return NULL;
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4634 }
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4635 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4636 arg = skipwhite(arg + 7);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4637 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4638 else
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4639 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4640 opt->flags |= flagtab[fidx].flags;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4641 arg = skipwhite(arg + len);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4642
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4643 if (flagtab[fidx].flags == HL_SYNC_HERE
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4644 || flagtab[fidx].flags == HL_SYNC_THERE)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4645 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4646 if (opt->sync_idx == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4647 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4648 emsg(_("E393: group[t]here not accepted here"));
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4649 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4650 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4651 gname_start = arg;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4652 arg = skiptowhite(arg);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4653 if (gname_start == arg)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4654 return NULL;
20830
9064044fd4f6 patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents: 20751
diff changeset
4655 gname = vim_strnsave(gname_start, arg - gname_start);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4656 if (gname == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4657 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4658 if (STRCMP(gname, "NONE") == 0)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4659 *opt->sync_idx = NONE_IDX;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4660 else
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4661 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4662 syn_id = syn_name2id(gname);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4663 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
4664 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
4665 && 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
4666 == SPTYPE_START)
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4667 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4668 *opt->sync_idx = i;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4669 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4670 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4671 if (i < 0)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4672 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4673 semsg(_("E394: Didn't find region item for %s"), gname);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4674 vim_free(gname);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4675 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4676 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4677 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4678
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4679 vim_free(gname);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4680 arg = skipwhite(arg);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4681 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4682 #ifdef FEAT_FOLDING
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4683 else if (flagtab[fidx].flags == HL_FOLD
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4684 && foldmethodIsSyntax(curwin))
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4685 // Need to update folds later.
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4686 foldUpdateAll(curwin);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4687 #endif
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4688 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4689 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4690
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4691 return arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4692 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4693
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4694 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4695 * Adjustments to syntax item when declared in a ":syn include"'d file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4696 * Set the contained flag, and if the item is not already contained, add it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4697 * to the specified top-level group, if any.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4698 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4699 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4700 syn_incl_toplevel(int id, int *flagsp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4701 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4702 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4703 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4704 *flagsp |= HL_CONTAINED;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4705 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4706 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4707 // 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
4708 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
4709 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4710
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4711 if (grp_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4712 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4713 grp_list[0] = id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4714 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
4715 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
4716 &grp_list, CLUSTER_ADD);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4717 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4718 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4719 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4720
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4721 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4722 * Handle ":syntax include [@{group-name}] filename" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4723 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4724 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4725 syn_cmd_include(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4726 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4727 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4728 int sgl_id = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4729 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4730 char_u *rest;
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4731 char *errormsg = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4732 int prev_toplvl_grp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4733 int prev_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4734 int source = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4735
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4736 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4737 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4738 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4739
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4740 if (arg[0] == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4741 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4742 ++arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4743 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4744 if (rest == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4745 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4746 emsg(_("E397: Filename required"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4747 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4748 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4749 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4750 if (sgl_id == 0)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4751 return;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4752 // separate_nextcmd() and expand_filename() depend on this
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4753 eap->arg = rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4754 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4755
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4756 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4757 * Everything that's left, up to the next command, should be the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4758 * filename to include.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4759 */
17336
81705f4d9e03 patch 8.1.1667: flags for Ex commands may clash with other symbols
Bram Moolenaar <Bram@vim.org>
parents: 17227
diff changeset
4760 eap->argt |= (EX_XFILE | EX_NOSPC);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4761 separate_nextcmd(eap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4762 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4763 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4764 // 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
4765 // 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
4766 // ":runtime!" is used.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4767 source = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4768 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4769 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4770 if (errormsg != NULL)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4771 emsg(errormsg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4772 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4773 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4774 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4775
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4776 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4777 * Save and restore the existing top-level grouplist id and ":syn
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4778 * include" tag around the actual inclusion.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4779 */
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4780 if (running_syn_inc_tag >= MAX_SYN_INC_TAG)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4781 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4782 emsg(_("E847: Too many syntax includes"));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4783 return;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4784 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4785 prev_syn_inc_tag = current_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4786 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
4787 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
4788 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
4789 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
4790 : source_runtime(eap->arg, DIP_ALL) == FAIL)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4791 semsg(_(e_notopen), eap->arg);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4792 curwin->w_s->b_syn_topgrp = prev_toplvl_grp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4793 current_syn_inc_tag = prev_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4794 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4795
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4796 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4797 * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4798 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4799 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4800 syn_cmd_keyword(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4801 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4802 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4803 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4804 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4805 char_u *rest;
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4806 char_u *keyword_copy = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4807 char_u *p;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4808 char_u *kw;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4809 syn_opt_arg_T syn_opt_arg;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4810 int cnt;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4811 int conceal_char = NUL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4812
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4813 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4814
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4815 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4816 {
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4817 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
4818 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
4819 else
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4820 syn_id = syn_check_group(arg, (int)(group_name_end - arg));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4821 if (syn_id != 0)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4822 // 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
4823 keyword_copy = alloc(STRLEN(rest) + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4824 if (keyword_copy != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4825 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4826 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4827 syn_opt_arg.keyword = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4828 syn_opt_arg.sync_idx = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4829 syn_opt_arg.has_cont_list = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4830 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4831 syn_opt_arg.next_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4832
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4833 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4834 * The options given apply to ALL keywords, so all options must be
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4835 * found before keywords can be created.
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4836 * 1: collect the options and copy the keywords to keyword_copy.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4837 */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4838 cnt = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4839 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
4840 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
4841 rest = skipwhite(rest))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4842 {
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
4843 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
4844 eap->skip);
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
4845 if (rest == NULL || ends_excmd2(eap->arg, rest))
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4846 break;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4847 // 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
4848 while (*rest != NUL && !VIM_ISWHITE(*rest))
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4849 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4850 if (*rest == '\\' && rest[1] != NUL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4851 ++rest;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4852 *p++ = *rest++;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4853 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4854 *p++ = NUL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4855 ++cnt;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4856 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4857
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4858 if (!eap->skip)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4859 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4860 // Adjust flags for use of ":syn include".
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4861 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4862
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4863 /*
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4864 * 2: Add an entry for each keyword.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4865 */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4866 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4867 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4868 for (p = vim_strchr(kw, '['); ; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4869 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4870 if (p != NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4871 *p = NUL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4872 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
4873 syn_opt_arg.cont_in_list,
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4874 syn_opt_arg.next_list, conceal_char);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4875 if (p == NULL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4876 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4877 if (p[1] == NUL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4878 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4879 semsg(_("E789: Missing ']': %s"), kw);
7017
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4880 goto error;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4881 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4882 if (p[1] == ']')
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4883 {
7017
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4884 if (p[2] != NUL)
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4885 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4886 semsg(_("E890: trailing char after ']': %s]%s"),
7017
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4887 kw, &p[2]);
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4888 goto error;
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4889 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4890 kw = p + 1; // skip over the "]"
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4891 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4892 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4893 if (has_mbyte)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4894 {
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 448
diff changeset
4895 int l = (*mb_ptr2len)(p + 1);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4896
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4897 mch_memmove(p, p + 1, l);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4898 p += l;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4899 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4900 else
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4901 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4902 p[0] = p[1];
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4903 ++p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4904 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4905 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4906 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4907 }
7017
0dbbdcf13e03 patch 7.4.825
Bram Moolenaar <bram@vim.org>
parents: 7009
diff changeset
4908 error:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4909 vim_free(keyword_copy);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4910 vim_free(syn_opt_arg.cont_in_list);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4911 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4912 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4913 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4914
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4915 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4916 eap->nextcmd = check_nextcmd(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4917 else
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
4918 semsg(_(e_invarg2), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4919
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
4920 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4921 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4922 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4923
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4924 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4925 * Handle ":syntax match {name} [{options}] {pattern} [{options}]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4926 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4927 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .."
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4928 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4929 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4930 syn_cmd_match(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
4931 exarg_T *eap,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4932 int syncing) // TRUE for ":syntax sync match .. "
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4933 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4934 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4935 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4936 char_u *rest;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4937 synpat_T item; // the item found in the line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4938 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4939 int idx;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4940 syn_opt_arg_T syn_opt_arg;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4941 int sync_idx = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4942 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
4943 int orig_called_emsg = called_emsg;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4944
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4945 // Isolate the group name, check for validity
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4946 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4947
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4948 // Get options before the pattern
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4949 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4950 syn_opt_arg.keyword = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4951 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4952 syn_opt_arg.has_cont_list = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4953 syn_opt_arg.cont_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4954 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4955 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
4956 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4957
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4958 // get the pattern.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4959 init_syn_patterns();
20007
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents: 19934
diff changeset
4960 CLEAR_FIELD(item);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4961 rest = get_syn_pattern(rest, &item);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4962 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL))
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4963 syn_opt_arg.flags |= HL_HAS_EOL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4964
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4965 // 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
4966 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4967
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
4968 if (rest != NULL) // all arguments are valid
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4969 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4970 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4971 * Check for trailing command and illegal trailing arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4972 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4973 eap->nextcmd = check_nextcmd(rest);
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
4974 if (!ends_excmd2(eap->cmd, rest) || eap->skip)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4975 rest = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4976 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4977 && (syn_id = syn_check_group(arg,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4978 (int)(group_name_end - arg))) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4979 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4980 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4981 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4982 * Store the pattern in the syn_items list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4983 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4984 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
4985 SYN_ITEMS(curwin->w_s)[idx] = item;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4986 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
4987 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
4988 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
4989 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
4990 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
4991 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
4992 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
4993 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4994 syn_opt_arg.cont_in_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4995 #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
4996 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
4997 #endif
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4998 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
4999 curwin->w_s->b_syn_containedin = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5000 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
5001 ++curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5002
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5003 // remember that we found a match for syncing on
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5004 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
5005 curwin->w_s->b_syn_sync_flags |= SF_MATCH;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5006 #ifdef FEAT_FOLDING
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5007 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
5008 ++curwin->w_s->b_syn_folditems;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5009 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5010
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5011 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5012 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
5013 return; // don't free the progs and patterns now
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5014 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5015 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5016
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5017 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5018 * Something failed, free the allocated memory.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5019 */
4805
66803af09906 updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents: 4803
diff changeset
5020 vim_regfree(item.sp_prog);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5021 vim_free(item.sp_pattern);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5022 vim_free(syn_opt_arg.cont_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5023 vim_free(syn_opt_arg.cont_in_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5024 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5025
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5026 if (rest == NULL && called_emsg == orig_called_emsg)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5027 semsg(_(e_invarg2), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5028 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5029
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5030 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5031 * Handle ":syntax region {group-name} [matchgroup={group-name}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5032 * start {start} .. [skip {skip}] end {end} .. [{options}]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5033 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5034 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5035 syn_cmd_region(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5036 exarg_T *eap,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5037 int syncing) // TRUE for ":syntax sync region .."
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5038 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5039 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5040 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
5041 char_u *rest; // next arg, NULL on error
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5042 char_u *key_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5043 char_u *key = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5044 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5045 int item;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5046 #define ITEM_START 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5047 #define ITEM_SKIP 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5048 #define ITEM_END 2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5049 #define ITEM_MATCHGROUP 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5050 struct pat_ptr
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5051 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5052 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
5053 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
5054 struct pat_ptr *pp_next; // pointer to next pat_ptr
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5055 } *(pat_ptrs[3]);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5056 // patterns found in the line
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5057 struct pat_ptr *ppp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5058 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
5059 int pat_count = 0; // nr of syn_patterns found
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5060 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5061 int matchgroup_id = 0;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5062 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
5063 int illegal = FALSE; // illegal arguments
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5064 int success = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5065 int idx;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5066 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
5067 int conceal_char = NUL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5068
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5069 // Isolate the group name, check for validity
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5070 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5071
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5072 pat_ptrs[0] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5073 pat_ptrs[1] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5074 pat_ptrs[2] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5075
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5076 init_syn_patterns();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5077
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5078 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5079 syn_opt_arg.keyword = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5080 syn_opt_arg.sync_idx = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5081 syn_opt_arg.has_cont_list = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5082 syn_opt_arg.cont_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5083 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5084 syn_opt_arg.next_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5085
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5086 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5087 * get the options, patterns and matchgroup.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5088 */
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5089 while (rest != NULL && !ends_excmd2(eap->cmd, rest))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5090 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5091 // 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
5092 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
5093 if (rest == NULL || ends_excmd2(eap->cmd, rest))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5094 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5095
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5096 // must be a pattern or matchgroup then
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5097 key_end = rest;
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11127
diff changeset
5098 while (*key_end && !VIM_ISWHITE(*key_end) && *key_end != '=')
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5099 ++key_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5100 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
5101 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
5102 if (key == NULL) // out of memory
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5103 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5104 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5105 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5106 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5107 if (STRCMP(key, "MATCHGROUP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5108 item = ITEM_MATCHGROUP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5109 else if (STRCMP(key, "START") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5110 item = ITEM_START;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5111 else if (STRCMP(key, "END") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5112 item = ITEM_END;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5113 else if (STRCMP(key, "SKIP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5114 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5115 if (pat_ptrs[ITEM_SKIP] != NULL) // one skip pattern allowed
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5116 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5117 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5118 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5119 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5120 item = ITEM_SKIP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5121 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5122 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5123 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5124 rest = skipwhite(key_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5125 if (*rest != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5126 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5127 rest = NULL;
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5128 semsg(_("E398: Missing '=': %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5129 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5131 rest = skipwhite(rest + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5132 if (*rest == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5133 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5134 not_enough = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5135 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5136 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5137
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5138 if (item == ITEM_MATCHGROUP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5139 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5140 p = skiptowhite(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5141 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5142 matchgroup_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5143 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5144 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5145 matchgroup_id = syn_check_group(rest, (int)(p - rest));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5146 if (matchgroup_id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5147 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5148 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5149 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5150 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5151 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5152 rest = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5153 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5154 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5155 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5156 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5157 * Allocate room for a syn_pattern, and link it in the list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5158 * syn_patterns for this item, at the start (because the list is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5159 * used from end to start).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5160 */
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
5161 ppp = ALLOC_ONE(struct pat_ptr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5162 if (ppp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5163 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5164 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5165 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5166 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5167 ppp->pp_next = pat_ptrs[item];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5168 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
5169 ppp->pp_synp = ALLOC_CLEAR_ONE(synpat_T);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5170 if (ppp->pp_synp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5171 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5172 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5173 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5174 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5175
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5176 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5177 * Get the syntax pattern and the following offset(s).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5178 */
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5179 // Enable the appropriate \z specials.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5180 if (item == ITEM_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5181 reg_do_extmatch = REX_SET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5182 else if (item == ITEM_SKIP || item == ITEM_END)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5183 reg_do_extmatch = REX_USE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5184 rest = get_syn_pattern(rest, ppp->pp_synp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5185 reg_do_extmatch = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5186 if (item == ITEM_END && vim_regcomp_had_eol()
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5187 && !(syn_opt_arg.flags & HL_EXCLUDENL))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5188 ppp->pp_synp->sp_flags |= HL_HAS_EOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5189 ppp->pp_matchgroup_id = matchgroup_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5190 ++pat_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5191 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5192 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5193 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5194 if (illegal || not_enough)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5195 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5196
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5197 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5198 * Must have a "start" and "end" pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5199 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5200 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL ||
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5201 pat_ptrs[ITEM_END] == NULL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5202 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5203 not_enough = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5204 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5205 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5206
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5207 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5208 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5209 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5210 * Check for trailing garbage or command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5211 * If OK, add the item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5212 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5213 eap->nextcmd = check_nextcmd(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5214 if (!ends_excmd(*rest) || eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5215 rest = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5216 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5217 && (syn_id = syn_check_group(arg,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5218 (int)(group_name_end - arg))) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5219 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5220 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5221 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5222 * Store the start/skip/end in the syn_items list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5223 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5224 idx = curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5225 for (item = ITEM_START; item <= ITEM_END; ++item)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5226 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5227 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5228 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5229 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
5230 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
5231 SYN_ITEMS(curwin->w_s)[idx].sp_type =
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5232 (item == ITEM_START) ? SPTYPE_START :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5233 (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
5234 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
5235 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id;
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5236 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag =
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5237 current_syn_inc_tag;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5238 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id =
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5239 ppp->pp_matchgroup_id;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5240 #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
5241 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
5242 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5243 if (item == ITEM_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5244 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5245 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5246 syn_opt_arg.cont_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5247 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5248 syn_opt_arg.cont_in_list;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5249 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
5250 curwin->w_s->b_syn_containedin = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5251 SYN_ITEMS(curwin->w_s)[idx].sp_next_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5252 syn_opt_arg.next_list;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5253 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5254 ++curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5255 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5256 #ifdef FEAT_FOLDING
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5257 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
5258 ++curwin->w_s->b_syn_folditems;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5259 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5260 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5261 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5262
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5263 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5264 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
5265 success = TRUE; // don't free the progs and patterns now
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5266 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5267 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5268
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5269 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5270 * Free the allocated memory.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5271 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5272 for (item = ITEM_START; item <= ITEM_END; ++item)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5273 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5274 {
17907
4cf69f8d1ec6 patch 8.1.1950: using NULL pointer after an out-of-memory
Bram Moolenaar <Bram@vim.org>
parents: 17781
diff changeset
5275 if (!success && ppp->pp_synp != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5276 {
4805
66803af09906 updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents: 4803
diff changeset
5277 vim_regfree(ppp->pp_synp->sp_prog);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5278 vim_free(ppp->pp_synp->sp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5279 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5280 vim_free(ppp->pp_synp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5281 ppp_next = ppp->pp_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5282 vim_free(ppp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5283 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5284
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5285 if (!success)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5286 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5287 vim_free(syn_opt_arg.cont_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5288 vim_free(syn_opt_arg.cont_in_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5289 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5290 if (not_enough)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5291 semsg(_("E399: Not enough arguments: syntax region %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5292 else if (illegal || rest == NULL)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5293 semsg(_(e_invarg2), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5294 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5295 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5296
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5297 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5298 * A simple syntax group ID comparison function suitable for use in qsort()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5299 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5300 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5301 syn_compare_stub(const void *v1, const void *v2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5302 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5303 const short *s1 = v1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5304 const short *s2 = v2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5305
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5306 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5307 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5308
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5309 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5310 * Combines lists of syntax clusters.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5311 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5312 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5313 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5314 syn_combine_list(short **clstr1, short **clstr2, int list_op)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5315 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5316 int count1 = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5317 int count2 = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5318 short *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5319 short *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5320 short *clstr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5321 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5322 int round;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5323
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5324 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5325 * Handle degenerate cases.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5326 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5327 if (*clstr2 == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5328 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5329 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5330 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5331 if (list_op == CLUSTER_REPLACE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5332 vim_free(*clstr1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5333 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5334 *clstr1 = *clstr2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5335 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5336 vim_free(*clstr2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5337 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5338 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5339
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5340 for (g1 = *clstr1; *g1; g1++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5341 ++count1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5342 for (g2 = *clstr2; *g2; g2++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5343 ++count2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5344
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5345 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5346 * For speed purposes, sort both lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5347 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5348 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5349 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5350
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5351 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5352 * We proceed in two passes; in round 1, we count the elements to place
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5353 * in the new list, and in round 2, we allocate and populate the new
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5354 * list. For speed, we use a mergesort-like method, adding the smaller
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5355 * of the current elements in each list to the new list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5356 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5357 for (round = 1; round <= 2; round++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5358 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5359 g1 = *clstr1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5360 g2 = *clstr2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5361 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5362
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5363 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5364 * First, loop through the lists until one of them is empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5365 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5366 while (*g1 && *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5367 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5368 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5369 * We always want to add from the first list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5370 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5371 if (*g1 < *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5372 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5373 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5374 clstr[count] = *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5375 count++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5376 g1++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5377 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5378 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5379 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5380 * We only want to add from the second list if we're adding the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5381 * lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5382 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5383 if (list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5384 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5385 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5386 clstr[count] = *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5387 count++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5388 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5389 if (*g1 == *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5390 g1++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5391 g2++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5392 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5393
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5394 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5395 * Now add the leftovers from whichever list didn't get finished
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5396 * first. As before, we only want to add from the second list if
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5397 * we're adding the lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5398 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5399 for (; *g1; g1++, count++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5400 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5401 clstr[count] = *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5402 if (list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5403 for (; *g2; g2++, count++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5404 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5405 clstr[count] = *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5406
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5407 if (round == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5408 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5409 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5410 * If the group ended up empty, we don't need to allocate any
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5411 * space for it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5412 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5413 if (count == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5414 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5415 clstr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5416 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5417 }
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
5418 clstr = ALLOC_MULT(short, count + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5419 if (clstr == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5420 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5421 clstr[count] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5422 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5423 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5424
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5425 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5426 * Finally, put the new list in place.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5427 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5428 vim_free(*clstr1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5429 vim_free(*clstr2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5430 *clstr1 = clstr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5431 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5432
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5433 /*
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
5434 * Lookup a syntax cluster name and return its ID.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5435 * If it is not found, 0 is returned.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5436 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5437 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5438 syn_scl_name2id(char_u *name)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5439 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5440 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5441 char_u *name_u;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5442
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5443 // Avoid using stricmp() too much, it's slow on some systems
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5444 name_u = vim_strsave_up(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5445 if (name_u == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5446 return 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5447 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
5448 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
5449 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5450 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5451 vim_free(name_u);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5452 return (i < 0 ? 0 : i + SYNID_CLUSTER);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5454
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5455 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5456 * Like syn_scl_name2id(), but take a pointer + length argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5457 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5458 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5459 syn_scl_namen2id(char_u *linep, int len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5460 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5461 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5462 int id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5463
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5464 name = vim_strnsave(linep, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5465 if (name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5466 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5467 id = syn_scl_name2id(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5468 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5469 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5470 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5471 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5472
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5473 /*
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
5474 * Find syntax cluster name in the table and return its ID.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5475 * The argument is a pointer to the name and the length of the name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5476 * If it doesn't exist yet, a new entry is created.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5477 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5478 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5479 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5480 syn_check_cluster(char_u *pp, int len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5481 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5482 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5483 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5484
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5485 name = vim_strnsave(pp, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5486 if (name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5487 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5488
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5489 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
5490 if (id == 0) // doesn't exist yet
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5491 id = syn_add_cluster(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5492 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5493 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5494 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5495 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5496
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5497 /*
11189
e74af2aca96e patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents: 11158
diff changeset
5498 * Add new syntax cluster and return its ID.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5499 * "name" must be an allocated string, it will be consumed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5500 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5501 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5502 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5503 syn_add_cluster(char_u *name)
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5504 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5505 int len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5506
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5507 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5508 * First call for this growarray: init growing array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5509 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5510 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
5511 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5512 curwin->w_s->b_syn_clusters.ga_itemsize = sizeof(syn_cluster_T);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5513 curwin->w_s->b_syn_clusters.ga_growsize = 10;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5514 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5515
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5516 len = curwin->w_s->b_syn_clusters.ga_len;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5517 if (len >= MAX_CLUSTER_ID)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5518 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5519 emsg(_("E848: Too many syntax clusters"));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5520 vim_free(name);
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5521 return 0;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5522 }
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5523
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5524 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5525 * Make room for at least one other cluster entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5526 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5527 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5528 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5529 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5530 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5531 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5532
20007
aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose
Bram Moolenaar <Bram@vim.org>
parents: 19934
diff changeset
5533 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
5534 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
5535 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
5536 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
5537 ++curwin->w_s->b_syn_clusters.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5538
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5539 if (STRICMP(name, "Spell") == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5540 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER;
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
5541 if (STRICMP(name, "NoSpell") == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5542 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5543
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5544 return len + SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5545 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5546
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5547 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5548 * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5549 * [add={groupname},..] [remove={groupname},..]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5550 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5551 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5552 syn_cmd_cluster(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5553 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5554 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5555 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5556 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5557 int scl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5558 short *clstr_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5559 int got_clstr = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5560 int opt_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5561 int list_op;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5562
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5563 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5564 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5565 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5566
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5567 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5568
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5569 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5570 {
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5571 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5572 if (scl_id == 0)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5573 return;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5574 scl_id -= SYNID_CLUSTER;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5575
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5576 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5577 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5578 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
5579 && (VIM_ISWHITE(rest[3]) || rest[3] == '='))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5580 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5581 opt_len = 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5582 list_op = CLUSTER_ADD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5583 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5584 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
5585 && (VIM_ISWHITE(rest[6]) || rest[6] == '='))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5586 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5587 opt_len = 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5588 list_op = CLUSTER_SUBTRACT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5589 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5590 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
5591 && (VIM_ISWHITE(rest[8]) || rest[8] == '='))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5592 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5593 opt_len = 8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5594 list_op = CLUSTER_REPLACE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5595 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5596 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5597 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5598
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5599 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
5600 if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5601 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5602 semsg(_(e_invarg2), rest);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5603 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5604 }
10618
4ee16e5e2e26 patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents: 10534
diff changeset
5605 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
5606 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5607 &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
5608 else
4f3decf25b7d patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents: 10629
diff changeset
5609 vim_free(clstr_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5610 got_clstr = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5611 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5612
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5613 if (got_clstr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5614 {
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5615 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5616 syn_stack_free_all(curwin->w_s); // Need to recompute all.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5617 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5618 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5619
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5620 if (!got_clstr)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5621 emsg(_("E400: 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
5622 if (rest == NULL || !ends_excmd2(eap->cmd, rest))
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5623 semsg(_(e_invarg2), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5624 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5625
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5626 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5627 * On first call for current buffer: Init growing array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5628 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5629 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5630 init_syn_patterns(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5631 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5632 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
5633 curwin->w_s->b_syn_patterns.ga_growsize = 10;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5634 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5635
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5636 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5637 * Get one pattern for a ":syntax match" or ":syntax region" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5638 * Stores the pattern and program in a synpat_T.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5639 * Returns a pointer to the next argument, or NULL in case of an error.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5640 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5641 static char_u *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5642 get_syn_pattern(char_u *arg, synpat_T *ci)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5643 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5644 char_u *end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5645 int *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5646 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5647 char_u *cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5648
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5649 // need at least three chars
6993
dcc108222d70 patch 7.4.814
Bram Moolenaar <bram@vim.org>
parents: 6880
diff changeset
5650 if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5651 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5652
19892
5feb426d2ea1 patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents: 19181
diff changeset
5653 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
5654 if (*end != *arg) // end delimiter not found
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5655 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5656 semsg(_("E401: Pattern delimiter not found: %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5657 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5658 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5659 // 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
5660 if ((ci->sp_pattern = vim_strnsave(arg + 1, end - arg - 1)) == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5661 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5662
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5663 // Make 'cpoptions' empty, to avoid the 'l' flag
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5664 cpo_save = p_cpo;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5665 p_cpo = (char_u *)"";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5666 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5667 p_cpo = cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5668
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5669 if (ci->sp_prog == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5670 return NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5671 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
5672 #ifdef FEAT_PROFILE
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
5673 syn_clear_time(&ci->sp_time);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
5674 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5675
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5676 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5677 * Check for a match, highlight or region offset.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5678 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5679 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5680 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5681 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5682 for (idx = SPO_COUNT; --idx >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5683 if (STRNCMP(end, spo_name_tab[idx], 3) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5684 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5685 if (idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5686 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5687 p = &(ci->sp_offsets[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5688 if (idx != SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5689 switch (end[3])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5690 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5691 case 's': break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5692 case 'b': break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5693 case 'e': idx += SPO_COUNT; break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5694 default: idx = -1; break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5695 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5696 if (idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5697 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5698 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
5699 if (idx == SPO_LC_OFF) // lc=99
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5700 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5701 end += 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5702 *p = getdigits(&end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5703
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5704 // "lc=" offset automatically sets "ms=" offset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5705 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5706 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5707 ci->sp_off_flags |= (1 << SPO_MS_OFF);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5708 ci->sp_offsets[SPO_MS_OFF] = *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5709 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5710 }
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5711 else // yy=x+99
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5712 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5713 end += 4;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5714 if (*end == '+')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5715 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5716 ++end;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5717 *p = getdigits(&end); // positive offset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5718 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5719 else if (*end == '-')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5720 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5721 ++end;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5722 *p = -getdigits(&end); // negative offset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5723 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5724 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5725 if (*end != ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5726 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5727 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5728 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5729 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5730 } while (idx >= 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5731
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5732 if (!ends_excmd2(arg, end) && !VIM_ISWHITE(*end))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5733 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5734 semsg(_("E402: Garbage after pattern: %s"), arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5735 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5736 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5737 return skipwhite(end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5738 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5739
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5740 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5741 * Handle ":syntax sync .." command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5742 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5743 static void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5744 syn_cmd_sync(exarg_T *eap, int syncing UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5745 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5746 char_u *arg_start = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5747 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5748 char_u *key = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5749 char_u *next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5750 int illegal = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5751 int finished = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5752 long n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5753 char_u *cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5754
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5755 if (ends_excmd2(eap->cmd, arg_start))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5756 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5757 syn_cmd_list(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5758 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5759 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5760
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5761 while (!ends_excmd2(eap->cmd, arg_start))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5762 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5763 arg_end = skiptowhite(arg_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5764 next_arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5765 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
5766 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
5767 if (key == NULL)
e35955a787a8 patch 8.2.1171: possible crash when out of memory
Bram Moolenaar <Bram@vim.org>
parents: 20830
diff changeset
5768 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5769 if (STRCMP(key, "CCOMMENT") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5770 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5771 if (!eap->skip)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5772 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
5773 if (!ends_excmd2(eap->cmd, next_arg))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5774 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5775 arg_end = skiptowhite(next_arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5776 if (!eap->skip)
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_id = syn_check_group(next_arg,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5778 (int)(arg_end - next_arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5779 next_arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5780 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5781 else if (!eap->skip)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5782 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5783 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5784 else if ( STRNCMP(key, "LINES", 5) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5785 || STRNCMP(key, "MINLINES", 8) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5786 || STRNCMP(key, "MAXLINES", 8) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5787 || STRNCMP(key, "LINEBREAKS", 10) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5788 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5789 if (key[4] == 'S')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5790 arg_end = key + 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5791 else if (key[0] == 'L')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5792 arg_end = key + 11;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5793 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5794 arg_end = key + 9;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5795 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5796 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5797 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5798 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5799 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5800 n = getdigits(&arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5801 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5802 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5803 if (key[4] == 'B')
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5804 curwin->w_s->b_syn_sync_linebreaks = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5805 else if (key[1] == 'A')
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5806 curwin->w_s->b_syn_sync_maxlines = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5807 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5808 curwin->w_s->b_syn_sync_minlines = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5809 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5810 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5811 else if (STRCMP(key, "FROMSTART") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5812 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5813 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5814 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5815 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
5816 curwin->w_s->b_syn_sync_maxlines = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5817 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5818 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5819 else if (STRCMP(key, "LINECONT") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5820 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5821 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
5822 {
013f285f31a6 commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents: 7500
diff changeset
5823 illegal = TRUE;
013f285f31a6 commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents: 7500
diff changeset
5824 break;
013f285f31a6 commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents: 7500
diff changeset
5825 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5826 if (curwin->w_s->b_syn_linecont_pat != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5827 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5828 emsg(_("E403: syntax sync: line continuations pattern specified twice"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5829 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5830 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5831 }
19892
5feb426d2ea1 patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents: 19181
diff changeset
5832 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
5833 if (*arg_end != *next_arg) // end delimiter not found
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5834 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5835 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5836 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5837 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5838
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5839 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5840 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5841 // 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
5842 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
5843 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
5844 arg_end - next_arg - 1)) == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5845 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5846 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5847 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5848 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5849 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5850
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5851 // Make 'cpoptions' empty, to avoid the 'l' flag
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5852 cpo_save = p_cpo;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5853 p_cpo = (char_u *)"";
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5854 curwin->w_s->b_syn_linecont_prog =
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
5855 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5856 p_cpo = cpo_save;
4766
ec24ff78a79c updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents: 4764
diff changeset
5857 #ifdef FEAT_PROFILE
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
5858 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
5859 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5860
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5861 if (curwin->w_s->b_syn_linecont_prog == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5862 {
13244
ac42c4b11dbc patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents: 12973
diff changeset
5863 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5864 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5865 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5866 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5867 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5868 next_arg = skipwhite(arg_end + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5869 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5870 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5871 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5872 eap->arg = next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5873 if (STRCMP(key, "MATCH") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5874 syn_cmd_match(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5875 else if (STRCMP(key, "REGION") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5876 syn_cmd_region(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5877 else if (STRCMP(key, "CLEAR") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5878 syn_cmd_clear(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5879 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5880 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5881 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5882 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5883 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5884 arg_start = next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5885 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5886 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5887 if (illegal)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5888 semsg(_("E404: Illegal arguments: %s"), arg_start);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5889 else if (!finished)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5890 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5891 eap->nextcmd = check_nextcmd(arg_start);
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5892 redraw_curbuf_later(SOME_VALID);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5893 syn_stack_free_all(curwin->w_s); // Need to recompute all syntax.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5894 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5895 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5896
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5897 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5898 * Convert a line of highlight group names into a list of group ID numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5899 * "arg" should point to the "contains" or "nextgroup" keyword.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5900 * "arg" is advanced to after the last group name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5901 * Careful: the argument is modified (NULs added).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5902 * returns FAIL for some error, OK for success.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5903 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5904 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5905 get_id_list(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
5906 char_u **arg,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5907 int keylen, // length of keyword
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5908 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
5909 // 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
5910 int skip)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5911 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5912 char_u *p = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5913 char_u *end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5914 int round;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5915 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5916 int total_count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5917 short *retval = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5918 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5919 regmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5920 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5921 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5922 int failed = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5923
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5924 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5925 * We parse the list twice:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5926 * round == 1: count the number of items, allocate the array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5927 * round == 2: fill the array with the items.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5928 * In round 1 new groups may be added, causing the number of items to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5929 * grow when a regexp is used. In that case round 1 is done once again.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5930 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5931 for (round = 1; round <= 2; ++round)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5932 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5933 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5934 * skip "contains"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5935 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5936 p = skipwhite(*arg + keylen);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5937 if (*p != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5938 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5939 semsg(_("E405: Missing equal sign: %s"), *arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5940 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5941 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5942 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
5943 if (ends_excmd2(*arg, p))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5944 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5945 semsg(_("E406: Empty argument: %s"), *arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5946 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5947 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5948
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5949 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5950 * parse the arguments after "contains"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5951 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5952 count = 0;
20116
513c62184ed8 patch 8.2.0613: Vim9: no check for space before #comment
Bram Moolenaar <Bram@vim.org>
parents: 20007
diff changeset
5953 while (!ends_excmd2(*arg, p))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5954 {
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11127
diff changeset
5955 for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5956 ;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
5957 name = alloc(end - p + 3); // leave room for "^$"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5958 if (name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5959 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5960 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5961 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5962 }
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
5963 vim_strncpy(name + 1, p, end - p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5964 if ( STRCMP(name + 1, "ALLBUT") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5965 || STRCMP(name + 1, "ALL") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5966 || STRCMP(name + 1, "TOP") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5967 || STRCMP(name + 1, "CONTAINED") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5968 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5969 if (TOUPPER_ASC(**arg) != 'C')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5970 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5971 semsg(_("E407: %s not allowed here"), name + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5972 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5973 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5974 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5975 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5976 if (count != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5977 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
5978 semsg(_("E408: %s must be first in contains list"),
10648
4f3decf25b7d patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents: 10629
diff changeset
5979 name + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5980 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5981 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5982 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5983 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5984 if (name[1] == 'A')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5985 id = SYNID_ALLBUT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5986 else if (name[1] == 'T')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5987 id = SYNID_TOP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5988 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5989 id = SYNID_CONTAINED;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5990 id += current_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5991 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5992 else if (name[1] == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5993 {
10629
16fc46021e51 patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 10624
diff changeset
5994 if (skip)
16fc46021e51 patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 10624
diff changeset
5995 id = -1;
16fc46021e51 patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents: 10624
diff changeset
5996 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
5997 id = syn_check_cluster(name + 2, (int)(end - p - 1));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5998 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5999 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6000 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6001 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6002 * Handle full group name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6003 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6004 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6005 id = syn_check_group(name + 1, (int)(end - p));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6006 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6007 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6008 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6009 * Handle match of regexp with group names.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6010 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6011 *name = '^';
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6012 STRCAT(name, "$");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6013 regmatch.regprog = vim_regcomp(name, RE_MAGIC);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6014 if (regmatch.regprog == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6015 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6016 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6017 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6018 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6019 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6020
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6021 regmatch.rm_ic = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6022 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
6023 for (i = highlight_num_groups(); --i >= 0; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6024 {
17401
5462bb963075 patch 8.1.1699: highlight_ga can be local instead of global
Bram Moolenaar <Bram@vim.org>
parents: 17389
diff changeset
6025 if (vim_regexec(&regmatch, highlight_group_name(i),
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6026 (colnr_T)0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6027 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6028 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6029 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6030 // 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
6031 // when adding items that match:
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6032 // "contains=a.*b,axb".
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6033 // Go back to first round
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6034 if (count >= total_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6035 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6036 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6037 round = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6038 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6039 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6040 retval[count] = i + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6041 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6042 ++count;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6043 id = -1; // remember that we found one
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6044 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6045 }
4805
66803af09906 updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents: 4803
diff changeset
6046 vim_regfree(regmatch.regprog);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6047 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6048 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6049 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6050 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6051 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
6052 semsg(_("E409: Unknown group name: %s"), p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6053 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6054 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6055 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6056 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6057 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6058 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6059 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6060 // Got more items than expected, go back to first round
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6061 if (count >= total_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6062 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6063 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6064 round = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6065 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6066 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6067 retval[count] = id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6068 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6069 ++count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6070 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6071 p = skipwhite(end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6072 if (*p != ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6073 break;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6074 p = skipwhite(p + 1); // skip comma in between arguments
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6075 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6076 if (failed)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6077 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6078 if (round == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6079 {
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
6080 retval = ALLOC_MULT(short, count + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6081 if (retval == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6082 break;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6083 retval[count] = 0; // zero means end of the list
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6084 total_count = count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6085 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6086 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6087
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6088 *arg = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6089 if (failed || retval == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6090 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6091 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6092 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6093 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6094
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6095 if (*list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6096 *list = retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6097 else
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6098 vim_free(retval); // list already found, don't overwrite it
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6099
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6100 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6101 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6102
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6103 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6104 * Make a copy of an ID list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6105 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6106 static short *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6107 copy_id_list(short *list)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6108 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6109 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6110 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6111 short *retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6112
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6113 if (list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6114 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6115
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6116 for (count = 0; list[count]; ++count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6117 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6118 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
6119 retval = alloc(len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6120 if (retval != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6121 mch_memmove(retval, list, (size_t)len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6122
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6123 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6124 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6125
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6126 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6127 * Check if syntax group "ssp" is in the ID list "list" of "cur_si".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6128 * "cur_si" can be NULL if not checking the "containedin" list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6129 * Used to check if a syntax item is in the "contains" or "nextgroup" list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6130 * the current item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6131 * This function is called very often, keep it fast!!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6132 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6133 static int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6134 in_id_list(
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6135 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
6136 short *list, // id list
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6137 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
6138 int contained) // group id is contained
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6139 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6140 int retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6141 short *scl_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6142 short item;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6143 short id = ssp->id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6144 static int depth = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6145 int r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6146
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6147 // If ssp has a "containedin" list and "cur_si" is in it, return TRUE.
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
6148 if (cur_si != NULL && ssp->cont_in_list != NULL
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
6149 && !(cur_si->si_flags & HL_MATCH))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6150 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6151 // 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
6152 // that we don't go back past the first one.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6153 while ((cur_si->si_flags & HL_TRANS_CONT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6154 && cur_si > (stateitem_T *)(current_state.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6155 --cur_si;
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6156 // cur_si->si_idx is -1 for keywords, these never contain anything.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6157 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
6158 &(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
6159 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6160 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6161 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6162
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6163 if (list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6164 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6165
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6166 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6167 * If list is ID_LIST_ALL, we are in a transparent item that isn't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6168 * inside anything. Only allow not-contained groups.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6169 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6170 if (list == ID_LIST_ALL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6171 return !contained;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6172
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6173 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6174 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6175 * contains list. We also require that "id" is at the same ":syn include"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6176 * level as the list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6177 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6178 item = *list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6179 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6180 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6181 if (item < SYNID_TOP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6182 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6183 // ALL or ALLBUT: accept all groups in the same file
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6184 if (item - SYNID_ALLBUT != ssp->inc_tag)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6185 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6186 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6187 else if (item < SYNID_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6188 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6189 // TOP: accept all not-contained groups in the same file
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6190 if (item - SYNID_TOP != ssp->inc_tag || contained)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6191 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6192 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6193 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6194 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6195 // CONTAINED: accept all contained groups in the same file
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6196 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6197 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6199 item = *++list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6200 retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6201 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6202 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6203 retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6204
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6205 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6206 * Return "retval" if id is in the contains list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6207 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6208 while (item != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6209 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6210 if (item == id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6211 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6212 if (item >= SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6213 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6214 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
6215 // 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
6216 // cluster that includes itself (indirectly)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6217 if (scl_list != NULL && depth < 30)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6218 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6219 ++depth;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6220 r = in_id_list(NULL, scl_list, ssp, contained);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6221 --depth;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6222 if (r)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6223 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6224 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6225 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6226 item = *++list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6227 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6228 return !retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6229 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6230
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6231 struct subcommand
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6232 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6233 char *name; // subcommand name
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6234 void (*func)(exarg_T *, int); // function to call
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6235 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6236
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6237 static struct subcommand subcommands[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6238 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6239 {"case", syn_cmd_case},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6240 {"clear", syn_cmd_clear},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6241 {"cluster", syn_cmd_cluster},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6242 {"conceal", syn_cmd_conceal},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6243 {"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
6244 {"foldlevel", syn_cmd_foldlevel},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6245 {"include", syn_cmd_include},
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
6246 {"iskeyword", syn_cmd_iskeyword},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6247 {"keyword", syn_cmd_keyword},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6248 {"list", syn_cmd_list},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6249 {"manual", syn_cmd_manual},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6250 {"match", syn_cmd_match},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6251 {"on", syn_cmd_on},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6252 {"off", syn_cmd_off},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6253 {"region", syn_cmd_region},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6254 {"reset", syn_cmd_reset},
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
6255 {"spell", syn_cmd_spell},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6256 {"sync", syn_cmd_sync},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6257 {"", syn_cmd_list},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6258 {NULL, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6259 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6260
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6261 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6262 * ":syntax".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6263 * This searches the subcommands[] table for the subcommand name, and calls a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6264 * syntax_subcommand() function to do the rest.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6265 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6266 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6267 ex_syntax(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6268 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6269 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6270 char_u *subcmd_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6271 char_u *subcmd_name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6272 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6273
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6274 syn_cmdlinep = eap->cmdlinep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6275
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6276 // isolate subcommand name
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6277 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6278 ;
20830
9064044fd4f6 patch 8.2.0967: unnecessary type casts for vim_strnsave()
Bram Moolenaar <Bram@vim.org>
parents: 20751
diff changeset
6279 subcmd_name = vim_strnsave(arg, subcmd_end - arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6280 if (subcmd_name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6281 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6282 if (eap->skip) // skip error messages for all subcommands
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6283 ++emsg_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6284 for (i = 0; ; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6285 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6286 if (subcommands[i].name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6287 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
6288 semsg(_("E410: Invalid :syntax subcommand: %s"), subcmd_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6289 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6290 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6291 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6292 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6293 eap->arg = skipwhite(subcmd_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6294 (subcommands[i].func)(eap, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6295 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6296 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6297 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6298 vim_free(subcmd_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6299 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6300 --emsg_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6301 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6302 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6303
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6304 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6305 ex_ownsyntax(exarg_T *eap)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6306 {
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6307 char_u *old_value;
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6308 char_u *new_value;
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6309
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6310 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
6311 {
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
6312 curwin->w_s = ALLOC_ONE(synblock_T);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6313 memset(curwin->w_s, 0, sizeof(synblock_T));
7030
8d513ddfe3ec commit https://github.com/vim/vim/commit/670acbc70f371409b46b722bd9a1166e53574f42
Christian Brabandt <cb@256bit.org>
parents: 7017
diff changeset
6314 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
6315 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
6316 #ifdef FEAT_SPELL
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6317 // 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
6318 curwin->w_p_spell = FALSE; // No spell checking
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6319 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
6320 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
6321 clear_string_option(&curwin->w_s->b_p_spl);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6322 #endif
7687
61354fabf8a2 commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents: 7685
diff changeset
6323 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
6324 }
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6325
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6326 // save value of b:current_syntax
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6327 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
6328 if (old_value != NULL)
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6329 old_value = vim_strsave(old_value);
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6330
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6331 // 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
6332 // file.
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6333 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
6334
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6335 // 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
6336 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
6337 if (new_value != NULL)
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6338 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
6339
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6340 // restore value of b:current_syntax
2256
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6341 if (old_value == NULL)
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6342 do_unlet((char_u *)"b:current_syntax", TRUE);
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6343 else
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6344 {
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6345 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
6346 vim_free(old_value);
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6347 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6348 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6349
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6350 int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6351 syntax_present(win_T *win)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6352 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6353 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
6354 || 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
6355 || 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
6356 || win->w_s->b_keywtab_ic.ht_used > 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6357 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6358
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6359
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6360 static enum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6361 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6362 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
6363 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
6364 EXP_SPELL, // expand ":syn spell" arguments
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6365 EXP_SYNC // expand ":syn sync" arguments
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6366 } expand_what;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6367
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6368 /*
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6369 * Reset include_link, include_default, include_none to 0.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6370 * Called when we are done expanding.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6371 */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6372 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6373 reset_expand_highlight(void)
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6374 {
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6375 include_link = include_default = include_none = 0;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6376 }
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6377
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6378 /*
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6379 * Handle command line completion for :match and :echohl command: Add "None"
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6380 * as highlight group.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6381 */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6382 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6383 set_context_in_echohl_cmd(expand_T *xp, char_u *arg)
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6384 {
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6385 xp->xp_context = EXPAND_HIGHLIGHT;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6386 xp->xp_pattern = arg;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6387 include_none = 1;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6388 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6389
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6390 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6391 * Handle command line completion for :syntax command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6392 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6393 void
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6394 set_context_in_syntax_cmd(expand_T *xp, char_u *arg)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6395 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6396 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6397
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6398 // Default: expand subcommands
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6399 xp->xp_context = EXPAND_SYNTAX;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6400 expand_what = EXP_SUBCMD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6401 xp->xp_pattern = arg;
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6402 include_link = 0;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6403 include_default = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6404
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6405 // (part of) subcommand already typed
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6406 if (*arg != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6407 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6408 p = skiptowhite(arg);
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6409 if (*p != NUL) // past first word
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6410 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6411 xp->xp_pattern = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6412 if (*skiptowhite(xp->xp_pattern) != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6413 xp->xp_context = EXPAND_NOTHING;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6414 else if (STRNICMP(arg, "case", p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6415 expand_what = EXP_CASE;
10534
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6416 else if (STRNICMP(arg, "spell", p - arg) == 0)
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6417 expand_what = EXP_SPELL;
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6418 else if (STRNICMP(arg, "sync", p - arg) == 0)
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6419 expand_what = EXP_SYNC;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6420 else if ( STRNICMP(arg, "keyword", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6421 || STRNICMP(arg, "region", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6422 || STRNICMP(arg, "match", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6423 || STRNICMP(arg, "list", p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6424 xp->xp_context = EXPAND_HIGHLIGHT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6425 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6426 xp->xp_context = EXPAND_NOTHING;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6427 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6428 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6429 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6430
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6431 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6432 * Function given to ExpandGeneric() to obtain the list syntax names for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6433 * expansion.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6434 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6435 char_u *
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6436 get_syntax_name(expand_T *xp UNUSED, int idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6437 {
10534
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6438 switch (expand_what)
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6439 {
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6440 case EXP_SUBCMD:
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6441 return (char_u *)subcommands[idx].name;
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6442 case EXP_CASE:
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6443 {
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6444 static char *case_args[] = {"match", "ignore", NULL};
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6445 return (char_u *)case_args[idx];
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6446 }
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6447 case EXP_SPELL:
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6448 {
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6449 static char *spell_args[] =
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6450 {"toplevel", "notoplevel", "default", NULL};
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6451 return (char_u *)spell_args[idx];
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6452 }
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6453 case EXP_SYNC:
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6454 {
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6455 static char *sync_args[] =
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6456 {"ccomment", "clear", "fromstart",
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6457 "linebreaks=", "linecont", "lines=", "match",
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6458 "maxlines=", "minlines=", "region", NULL};
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6459 return (char_u *)sync_args[idx];
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 }
1c6db35e3527 commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents: 10530
diff changeset
6462 return NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6463 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6464
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6465
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6466 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6467 * Function called for expression evaluation: get syntax ID at file position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6468 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6469 int
7835
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6470 syn_get_id(
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6471 win_T *wp,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6472 long lnum,
4d7ce6c03fda commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents: 7807
diff changeset
6473 colnr_T col,
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6474 int trans, // remove transparency
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6475 int *spellp, // return: can do spell checking
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6476 int keep_state) // keep state of char at "col"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6477 {
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6478 // When the position is not after the current position and in the same
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6479 // line of the same buffer, need to restart parsing.
499
08012a1ff8d4 updated for version 7.0137
vimboss
parents: 482
diff changeset
6480 if (wp->w_buffer != syn_buf
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6481 || lnum != current_lnum
253
62a331864307 updated for version 7.0069
vimboss
parents: 227
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6492
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6493 return (trans ? current_trans_id : current_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6494 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6520 #if defined(FEAT_EVAL) || defined(PROTO)
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6521 /*
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6522 * Return the syntax ID at position "i" in the current stack.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6523 * The caller must have called syn_get_id() before to fill the stack.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6524 * Returns -1 when "i" is out of range.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6525 */
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
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
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6528 {
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6529 if (i >= current_state.ga_len)
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
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
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6533 invalidate_current_state();
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6534 current_col = MAXCOL;
1500
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6535 return -1;
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6536 }
1500
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6537 return CUR_STATE(i).si_id;
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6538 }
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6539 #endif
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6540
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6554 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6555 * Function called to get folding level for line "lnum" in window "wp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6556 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6559 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
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
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6593 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6594 if (level > wp->w_p_fdn)
1028
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6595 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6596 level = wp->w_p_fdn;
1028
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6597 if (level < 0)
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6598 level = 0;
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6599 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6600 return level;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6601 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6602 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6603
6567
d6473d6501fd updated for version 7.4.610
Bram Moolenaar <bram@vim.org>
parents: 6386
diff changeset
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
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 14968
diff changeset
6620 semsg(_(e_invarg2), 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;
4803
220bdea4f579 updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents: 4791
diff changeset
6698 # ifdef FEAT_FLOAT
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
286fd54c7ae3 patch 7.4.822
Bram Moolenaar <bram@vim.org>
parents: 6993
diff changeset
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;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6728 # ifdef FEAT_FLOAT
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);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6762 # ifdef FEAT_FLOAT
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
6763 msg_puts(profile_msg(&p->average));
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
6764 msg_puts(" ");
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6765 # endif
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6766 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
6767 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
6768 msg_puts(" ");
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6769
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6770 msg_advance(69);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6771 if (Columns < 80)
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6772 len = 20; // will wrap anyway
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6773 else
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6774 len = Columns - 70;
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6775 if (len > (int)STRLEN(p->pattern))
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6776 len = (int)STRLEN(p->pattern);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6777 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
6778 msg_puts("\n");
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6779 }
4791
65cef998f860 updated for version 7.3.1142
Bram Moolenaar <bram@vim.org>
parents: 4776
diff changeset
6780 ga_clear(&ga);
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6781 if (!got_int)
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6782 {
15543
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
6783 msg_puts("\n");
dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
6784 msg_puts(profile_msg(&total_total));
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6785 msg_advance(13);
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6786 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
6787 msg_puts("\n");
4764
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6788 }
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6789 }
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6790 #endif
f824cb97eb92 updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
6791
18814
7e7ec935e7c8 patch 8.1.2395: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents: 17907
diff changeset
6792 #endif // FEAT_SYN_HL