Mercurial > vim
annotate src/syntax.c @ 12487:3f16cf18386c v8.0.1123
patch 8.0.1123: cannot define a toolbar for a window
commit https://github.com/vim/vim/commit/1b9645de3c05f37b5c30e78f999351b0cf486ade
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 17 23:03:31 2017 +0200
patch 8.0.1123: cannot define a toolbar for a window
Problem: Cannot define a toolbar for a window.
Solution: Add a window-local toolbar.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 17 Sep 2017 23:15:04 +0200 |
| parents | 68d7bc045dbe |
| children | 7a887dccd13a |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * syntax.c: code for syntax highlighting | |
| 12 */ | |
| 13 | |
| 14 #include "vim.h" | |
| 15 | |
| 16 /* | |
| 17 * Structure that stores information about a highlight group. | |
| 18 * The ID of a highlight group is also called group ID. It is the index in | |
| 19 * the highlight_ga array PLUS ONE. | |
| 20 */ | |
| 21 struct hl_group | |
| 22 { | |
| 23 char_u *sg_name; /* highlight group name */ | |
| 24 char_u *sg_name_u; /* uppercase of sg_name */ | |
|
10624
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
25 int sg_cleared; /* "hi clear" was used */ |
| 7 | 26 /* for normal terminals */ |
| 27 int sg_term; /* "term=" highlighting attributes */ | |
| 28 char_u *sg_start; /* terminal string for start highl */ | |
| 29 char_u *sg_stop; /* terminal string for stop highl */ | |
| 30 int sg_term_attr; /* Screen attr for term mode */ | |
| 31 /* for color terminals */ | |
| 32 int sg_cterm; /* "cterm=" highlighting attr */ | |
| 33 int sg_cterm_bold; /* bold attr was set for light color */ | |
| 34 int sg_cterm_fg; /* terminal fg color number + 1 */ | |
| 35 int sg_cterm_bg; /* terminal bg color number + 1 */ | |
| 36 int sg_cterm_attr; /* Screen attr for color term mode */ | |
| 37 /* for when using the GUI */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
38 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 7 | 39 guicolor_T sg_gui_fg; /* GUI foreground color handle */ |
| 40 guicolor_T sg_gui_bg; /* GUI background color handle */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
41 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
42 #ifdef FEAT_GUI |
| 205 | 43 guicolor_T sg_gui_sp; /* GUI special color handle */ |
| 7 | 44 GuiFont sg_font; /* GUI font handle */ |
| 45 #ifdef FEAT_XFONTSET | |
| 46 GuiFontset sg_fontset; /* GUI fontset handle */ | |
| 47 #endif | |
| 48 char_u *sg_font_name; /* GUI font or fontset name */ | |
| 49 int sg_gui_attr; /* Screen attr for GUI mode */ | |
| 50 #endif | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
51 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
52 /* Store the sp color name for the GUI or synIDattr() */ |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
53 int sg_gui; /* "gui=" highlighting attributes */ |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
54 char_u *sg_gui_fg_name;/* GUI foreground color name */ |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
55 char_u *sg_gui_bg_name;/* GUI background color name */ |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
56 char_u *sg_gui_sp_name;/* GUI special color name */ |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
57 #endif |
| 7 | 58 int sg_link; /* link to this highlight group ID */ |
| 59 int sg_set; /* combination of SG_* flags */ | |
| 448 | 60 #ifdef FEAT_EVAL |
| 61 scid_T sg_scriptID; /* script in which the group was last set */ | |
| 62 #endif | |
| 7 | 63 }; |
| 64 | |
| 65 #define SG_TERM 1 /* term has been set */ | |
| 66 #define SG_CTERM 2 /* cterm has been set */ | |
| 67 #define SG_GUI 4 /* gui has been set */ | |
| 68 #define SG_LINK 8 /* link has been set */ | |
| 69 | |
| 70 static garray_T highlight_ga; /* highlight groups for 'highlight' option */ | |
| 71 | |
| 72 #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data))) | |
| 73 | |
| 2756 | 74 #define MAX_HL_ID 20000 /* maximum value for a highlight ID. */ |
| 75 | |
| 7 | 76 #ifdef FEAT_CMDL_COMPL |
| 1322 | 77 /* Flags to indicate an additional string for highlight name completion. */ |
| 78 static int include_none = 0; /* when 1 include "None" */ | |
| 79 static int include_default = 0; /* when 1 include "default" */ | |
| 80 static int include_link = 0; /* when 2 include "link" and "clear" */ | |
| 7 | 81 #endif |
| 82 | |
| 83 /* | |
| 84 * The "term", "cterm" and "gui" arguments can be any combination of the | |
| 85 * following names, separated by commas (but no spaces!). | |
| 86 */ | |
| 87 static char *(hl_name_table[]) = | |
| 205 | 88 {"bold", "standout", "underline", "undercurl", |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
89 "italic", "reverse", "inverse", "nocombine", "strikethrough", "NONE"}; |
| 7 | 90 static int hl_attr_table[] = |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
91 {HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE, HL_INVERSE, HL_NOCOMBINE, HL_STRIKETHROUGH, 0}; |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
92 #define ATTR_COMBINE(attr_a, attr_b) ((((attr_b) & HL_NOCOMBINE) ? attr_b : (attr_a)) | (attr_b)) |
| 7 | 93 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
94 static int get_attr_entry(garray_T *table, attrentry_T *aep); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
95 static void syn_unadd_group(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
96 static void set_hl_attr(int idx); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
97 static void highlight_list_one(int id); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
98 static int highlight_list_arg(int id, int didh, int type, int iarg, char_u *sarg, char *name); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
99 static int syn_add_group(char_u *name); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
100 static int syn_list_header(int did_header, int outlen, int id); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
101 static int hl_has_settings(int idx, int check_link); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
102 static void highlight_clear(int idx); |
| 7 | 103 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
104 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
105 static void gui_do_one_color(int idx, int do_menu, int do_tooltip); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
106 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
107 #ifdef FEAT_GUI |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
108 static int set_group_colors(char_u *name, guicolor_T *fgp, guicolor_T *bgp, int do_menu, int use_norm, int do_tooltip); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
109 static GuiFont font_name2handle(char_u *name); |
| 7 | 110 # ifdef FEAT_XFONTSET |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
111 static GuiFontset fontset_name2handle(char_u *name, int fixed_width); |
| 7 | 112 # endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
113 static void hl_do_font(int idx, char_u *arg, int do_normal, int do_menu, int do_tooltip, int free_font); |
| 7 | 114 #endif |
| 115 | |
| 116 /* | |
| 117 * An attribute number is the index in attr_table plus ATTR_OFF. | |
| 118 */ | |
| 119 #define ATTR_OFF (HL_ALL + 1) | |
| 120 | |
| 121 #if defined(FEAT_SYN_HL) || defined(PROTO) | |
| 122 | |
| 123 #define SYN_NAMELEN 50 /* maximum length of a syntax name */ | |
| 124 | |
| 125 /* different types of offsets that are possible */ | |
| 126 #define SPO_MS_OFF 0 /* match start offset */ | |
| 127 #define SPO_ME_OFF 1 /* match end offset */ | |
| 128 #define SPO_HS_OFF 2 /* highl. start offset */ | |
| 129 #define SPO_HE_OFF 3 /* highl. end offset */ | |
| 130 #define SPO_RS_OFF 4 /* region start offset */ | |
| 131 #define SPO_RE_OFF 5 /* region end offset */ | |
| 132 #define SPO_LC_OFF 6 /* leading context offset */ | |
| 133 #define SPO_COUNT 7 | |
| 134 | |
| 135 static char *(spo_name_tab[SPO_COUNT]) = | |
| 136 {"ms=", "me=", "hs=", "he=", "rs=", "re=", "lc="}; | |
| 137 | |
| 138 /* | |
| 139 * The patterns that are being searched for are stored in a syn_pattern. | |
| 140 * A match item consists of one pattern. | |
| 141 * A start/end item consists of n start patterns and m end patterns. | |
| 142 * A start/skip/end item consists of n start patterns, one skip pattern and m | |
| 143 * end patterns. | |
| 144 * For the latter two, the patterns are always consecutive: start-skip-end. | |
| 145 * | |
| 146 * A character offset can be given for the matched text (_m_start and _m_end) | |
| 147 * and for the actually highlighted text (_h_start and _h_end). | |
| 148 */ | |
| 149 typedef struct syn_pattern | |
| 150 { | |
| 151 char sp_type; /* see SPTYPE_ defines below */ | |
| 152 char sp_syncing; /* this item used for syncing */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
153 int sp_flags; /* see HL_ defines below */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
154 #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
|
155 int sp_cchar; /* conceal substitute character */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
156 #endif |
| 7 | 157 struct sp_syn sp_syn; /* struct passed to in_id_list() */ |
| 158 short sp_syn_match_id; /* highlight group ID of pattern */ | |
| 159 char_u *sp_pattern; /* regexp to match, pattern */ | |
| 160 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
|
161 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
162 syn_time_T sp_time; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
163 #endif |
| 7 | 164 int sp_ic; /* ignore-case flag for sp_prog */ |
| 165 short sp_off_flags; /* see below */ | |
| 166 int sp_offsets[SPO_COUNT]; /* offsets */ | |
| 167 short *sp_cont_list; /* cont. group IDs, if non-zero */ | |
| 168 short *sp_next_list; /* next group IDs, if non-zero */ | |
| 169 int sp_sync_idx; /* sync item index (syncing only) */ | |
| 170 int sp_line_id; /* ID of last line where tried */ | |
| 171 int sp_startcol; /* next match in sp_line_id line */ | |
| 172 } synpat_T; | |
| 173 | |
| 174 /* The sp_off_flags are computed like this: | |
| 175 * offset from the start of the matched text: (1 << SPO_XX_OFF) | |
| 176 * offset from the end of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT)) | |
| 177 * When both are present, only one is used. | |
| 178 */ | |
| 179 | |
| 180 #define SPTYPE_MATCH 1 /* match keyword with this group ID */ | |
| 181 #define SPTYPE_START 2 /* match a regexp, start of item */ | |
| 182 #define SPTYPE_END 3 /* match a regexp, end of item */ | |
| 183 #define SPTYPE_SKIP 4 /* match a regexp, skip within item */ | |
| 184 | |
| 185 | |
| 186 #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data)) | |
| 187 | |
| 188 #define NONE_IDX -2 /* value of sp_sync_idx for "NONE" */ | |
| 189 | |
| 190 /* | |
| 191 * Flags for b_syn_sync_flags: | |
| 192 */ | |
| 193 #define SF_CCOMMENT 0x01 /* sync on a C-style comment */ | |
| 194 #define SF_MATCH 0x02 /* sync by matching a pattern */ | |
| 195 | |
| 196 #define SYN_STATE_P(ssp) ((bufstate_T *)((ssp)->ga_data)) | |
| 197 | |
| 198 #define MAXKEYWLEN 80 /* maximum length of a keyword */ | |
| 199 | |
| 200 /* | |
| 201 * The attributes of the syntax item that has been recognized. | |
| 202 */ | |
| 203 static int current_attr = 0; /* attr of current syntax word */ | |
| 204 #ifdef FEAT_EVAL | |
| 205 static int current_id = 0; /* ID of current char for syn_get_id() */ | |
| 2020 | 206 static int current_trans_id = 0; /* idem, transparency removed */ |
| 7 | 207 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
208 #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
|
209 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
|
210 static int current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
211 static int current_sub_char = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
212 #endif |
| 7 | 213 |
| 221 | 214 typedef struct syn_cluster_S |
| 7 | 215 { |
| 216 char_u *scl_name; /* syntax cluster name */ | |
| 217 char_u *scl_name_u; /* uppercase of scl_name */ | |
| 218 short *scl_list; /* IDs in this syntax cluster */ | |
| 221 | 219 } syn_cluster_T; |
| 7 | 220 |
| 221 /* | |
| 222 * Methods of combining two clusters | |
| 223 */ | |
| 224 #define CLUSTER_REPLACE 1 /* replace first list with second */ | |
| 225 #define CLUSTER_ADD 2 /* add second list to first */ | |
| 226 #define CLUSTER_SUBTRACT 3 /* subtract second list from first */ | |
| 227 | |
| 221 | 228 #define SYN_CLSTR(buf) ((syn_cluster_T *)((buf)->b_syn_clusters.ga_data)) |
| 7 | 229 |
| 230 /* | |
| 231 * Syntax group IDs have different types: | |
| 2743 | 232 * 0 - 19999 normal syntax groups |
| 233 * 20000 - 20999 ALLBUT indicator (current_syn_inc_tag added) | |
| 234 * 21000 - 21999 TOP indicator (current_syn_inc_tag added) | |
| 235 * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added) | |
| 236 * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID) | |
| 237 */ | |
| 2756 | 238 #define SYNID_ALLBUT MAX_HL_ID /* syntax group ID for contains=ALLBUT */ |
| 2743 | 239 #define SYNID_TOP 21000 /* syntax group ID for contains=TOP */ |
| 240 #define SYNID_CONTAINED 22000 /* syntax group ID for contains=CONTAINED */ | |
| 241 #define SYNID_CLUSTER 23000 /* first syntax group ID for clusters */ | |
| 242 | |
| 243 #define MAX_SYN_INC_TAG 999 /* maximum before the above overflow */ | |
| 244 #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER) | |
| 7 | 245 |
| 246 /* | |
| 247 * Annoying Hack(TM): ":syn include" needs this pointer to pass to | |
| 248 * expand_filename(). Most of the other syntax commands don't need it, so | |
| 249 * instead of passing it to them, we stow it here. | |
| 250 */ | |
| 251 static char_u **syn_cmdlinep; | |
| 252 | |
| 253 /* | |
| 254 * 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
|
255 * files from leaking into ALLBUT lists, we assign a unique ID to the |
| 7 | 256 * rules in each ":syn include"'d file. |
| 257 */ | |
| 258 static int current_syn_inc_tag = 0; | |
| 259 static int running_syn_inc_tag = 0; | |
| 260 | |
| 261 /* | |
| 134 | 262 * In a hashtable item "hi_key" points to "keyword" in a keyentry. |
| 263 * This avoids adding a pointer to the hashtable item. | |
| 264 * KE2HIKEY() converts a var pointer to a hashitem key pointer. | |
| 265 * HIKEY2KE() converts a hashitem key pointer to a var pointer. | |
| 266 * HI2KE() converts a hashitem pointer to a var pointer. | |
| 267 */ | |
| 268 static keyentry_T dumkey; | |
| 269 #define KE2HIKEY(kp) ((kp)->keyword) | |
| 270 #define HIKEY2KE(p) ((keyentry_T *)((p) - (dumkey.keyword - (char_u *)&dumkey))) | |
| 271 #define HI2KE(hi) HIKEY2KE((hi)->hi_key) | |
| 272 | |
| 273 /* | |
| 7 | 274 * To reduce the time spent in keepend(), remember at which level in the state |
| 275 * stack the first item with "keepend" is present. When "-1", there is no | |
| 276 * "keepend" on the stack. | |
| 277 */ | |
| 278 static int keepend_level = -1; | |
| 279 | |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
280 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
|
281 |
| 7 | 282 /* |
| 283 * For the current state we need to remember more than just the idx. | |
| 284 * When si_m_endpos.lnum is 0, the items other than si_idx are unknown. | |
| 285 * (The end positions have the column number of the next char) | |
| 286 */ | |
| 287 typedef struct state_item | |
| 288 { | |
| 1371 | 289 int si_idx; /* index of syntax pattern or |
| 290 KEYWORD_IDX */ | |
| 7 | 291 int si_id; /* highlight group ID for keywords */ |
| 2020 | 292 int si_trans_id; /* idem, transparency removed */ |
| 7 | 293 int si_m_lnum; /* lnum of the match */ |
| 294 int si_m_startcol; /* starting column of the match */ | |
| 295 lpos_T si_m_endpos; /* just after end posn of the match */ | |
| 296 lpos_T si_h_startpos; /* start position of the highlighting */ | |
| 297 lpos_T si_h_endpos; /* end position of the highlighting */ | |
| 298 lpos_T si_eoe_pos; /* end position of end pattern */ | |
| 299 int si_end_idx; /* group ID for end pattern or zero */ | |
| 300 int si_ends; /* if match ends before si_m_endpos */ | |
| 301 int si_attr; /* attributes in this state */ | |
| 302 long si_flags; /* HL_HAS_EOL flag in this state, and | |
| 303 * HL_SKIP* for si_next_list */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
304 #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
|
305 int si_seqnr; /* sequence number */ |
|
2425
b5ee68272ae5
Fix: concealed regions didn't get redrawn correctly when moving the cursor
Bram Moolenaar <bram@vim.org>
parents:
2418
diff
changeset
|
306 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
|
307 #endif |
| 7 | 308 short *si_cont_list; /* list of contained groups */ |
| 309 short *si_next_list; /* nextgroup IDs after this item ends */ | |
| 310 reg_extmatch_T *si_extmatch; /* \z(...\) matches from start | |
| 311 * pattern */ | |
| 312 } stateitem_T; | |
| 313 | |
| 314 #define KEYWORD_IDX -1 /* value of si_idx for keywords */ | |
| 315 #define ID_LIST_ALL (short *)-1 /* valid of si_cont_list for containing all | |
| 316 but contained groups */ | |
| 317 | |
|
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
|
318 #ifdef FEAT_CONCEAL |
| 6698 | 319 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
|
320 #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
|
321 |
| 7 | 322 /* |
| 154 | 323 * Struct to reduce the number of arguments to get_syn_options(), it's used |
| 324 * very often. | |
| 325 */ | |
| 326 typedef struct | |
| 327 { | |
| 1222 | 328 int flags; /* flags for contained and transparent */ |
| 154 | 329 int keyword; /* TRUE for ":syn keyword" */ |
| 330 int *sync_idx; /* syntax item for "grouphere" argument, NULL | |
| 331 if not allowed */ | |
| 332 char has_cont_list; /* TRUE if "cont_list" can be used */ | |
| 333 short *cont_list; /* group IDs for "contains" argument */ | |
| 334 short *cont_in_list; /* group IDs for "containedin" argument */ | |
| 335 short *next_list; /* group IDs for "nextgroup" argument */ | |
| 336 } syn_opt_arg_T; | |
| 337 | |
| 338 /* | |
| 7 | 339 * The next possible match in the current line for any pattern is remembered, |
| 340 * to avoid having to try for a match in each column. | |
| 341 * If next_match_idx == -1, not tried (in this line) yet. | |
| 342 * If next_match_col == MAXCOL, no match found in this line. | |
| 343 * (All end positions have the column of the char after the end) | |
| 344 */ | |
| 345 static int next_match_col; /* column for start of next match */ | |
| 346 static lpos_T next_match_m_endpos; /* position for end of next match */ | |
| 347 static lpos_T next_match_h_startpos; /* pos. for highl. start of next match */ | |
| 348 static lpos_T next_match_h_endpos; /* pos. for highl. end of next match */ | |
| 349 static int next_match_idx; /* index of matched item */ | |
| 350 static long next_match_flags; /* flags for next match */ | |
| 351 static lpos_T next_match_eos_pos; /* end of start pattn (start region) */ | |
| 352 static lpos_T next_match_eoe_pos; /* pos. for end of end pattern */ | |
| 353 static int next_match_end_idx; /* ID of group for end pattn or zero */ | |
| 354 static reg_extmatch_T *next_match_extmatch = NULL; | |
| 355 | |
| 356 /* | |
| 357 * A state stack is an array of integers or stateitem_T, stored in a | |
| 358 * garray_T. A state stack is invalid if it's itemsize entry is zero. | |
| 359 */ | |
| 360 #define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0) | |
| 361 #define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0) | |
| 362 | |
| 363 /* | |
| 364 * The current state (within the line) of the recognition engine. | |
| 365 * When current_state.ga_itemsize is 0 the current state is invalid. | |
| 366 */ | |
| 367 static win_T *syn_win; /* current window for highlighting */ | |
| 368 static buf_T *syn_buf; /* current buffer for highlighting */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
369 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
|
370 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
371 static proftime_T *syn_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
372 #endif |
| 7 | 373 static linenr_T current_lnum = 0; /* lnum of current state */ |
| 374 static colnr_T current_col = 0; /* column of current state */ | |
| 375 static int current_state_stored = 0; /* TRUE if stored current state | |
| 376 * after setting current_finished */ | |
| 377 static int current_finished = 0; /* current line has been finished */ | |
| 378 static garray_T current_state /* current stack of state_items */ | |
| 379 = {0, 0, 0, 0, NULL}; | |
| 380 static short *current_next_list = NULL; /* when non-zero, nextgroup list */ | |
| 381 static int current_next_flags = 0; /* flags for current_next_list */ | |
| 382 static int current_line_id = 0; /* unique number for current line */ | |
| 383 | |
| 384 #define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx] | |
| 385 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
386 static void syn_sync(win_T *wp, linenr_T lnum, synstate_T *last_valid); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
387 static void save_chartab(char_u *chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
388 static void restore_chartab(char_u *chartab); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
389 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
|
390 static void syn_start_line(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
391 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
|
392 static void syn_stack_alloc(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
393 static int syn_stack_cleanup(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
394 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
|
395 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
|
396 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
|
397 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
|
398 static void invalidate_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
399 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
|
400 static void validate_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
401 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
|
402 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
|
403 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
|
404 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
|
405 static void check_state_ends(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
406 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
|
407 static void check_keepend(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 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
|
412 static void pop_current_state(void); |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
413 #ifdef FEAT_PROFILE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
414 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
|
415 static void syntime_clear(void); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
416 #ifdef __BORLANDC__ |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
417 static int _RTLENTRYF 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
|
418 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
419 static int syn_compare_syntime(const void *v1, const void *v2); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
420 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
421 static void syntime_report(void); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
422 static int syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
423 # define IF_SYN_TIME(p) (p) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
424 #else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
425 # define IF_SYN_TIME(p) NULL |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
426 typedef int syn_time_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
427 #endif |
| 7 | 428 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
429 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
|
430 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
|
431 static void clear_syn_state(synstate_T *p); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
432 static void clear_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
433 |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
434 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
|
435 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
|
436 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
|
437 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
|
438 static char_u *syn_getcurline(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
439 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
|
440 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
|
441 static void syn_cmd_case(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
442 static void syn_cmd_spell(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
443 static void syntax_sync_clear(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
444 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
|
445 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
|
446 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
|
447 static void syn_cmd_clear(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
448 static void syn_cmd_conceal(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
449 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
|
450 static void syn_cmd_on(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
451 static void syn_cmd_enable(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
452 static void syn_cmd_reset(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
453 static void syn_cmd_manual(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
454 static void syn_cmd_off(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
455 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
|
456 static void syn_cmd_list(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
457 static void syn_lines_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
458 static void syn_match_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
459 static void syn_stack_free_block(synblock_T *block); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
460 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
|
461 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
|
462 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
|
463 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
|
464 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
|
465 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
|
466 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
|
467 static void add_keyword(char_u *name, int id, int flags, short *cont_in_list, short *next_list, int conceal_char); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
468 static char_u *get_group_name(char_u *arg, char_u **name_end); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
469 static char_u *get_syn_options(char_u *arg, syn_opt_arg_T *opt, int *conceal_char, int skip); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
470 static void syn_cmd_include(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
471 static void syn_cmd_iskeyword(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
472 static void syn_cmd_keyword(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
473 static void syn_cmd_match(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
474 static void syn_cmd_region(exarg_T *eap, int syncing); |
| 7 | 475 #ifdef __BORLANDC__ |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
476 static int _RTLENTRYF syn_compare_stub(const void *v1, const void *v2); |
| 7 | 477 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
478 static int syn_compare_stub(const void *v1, const void *v2); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
479 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
480 static void syn_cmd_cluster(exarg_T *eap, int syncing); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
481 static int syn_scl_name2id(char_u *name); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
482 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
|
483 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
|
484 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
|
485 static void init_syn_patterns(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
486 static char_u *get_syn_pattern(char_u *arg, synpat_T *ci); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
487 static void syn_cmd_sync(exarg_T *eap, int syncing); |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
488 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
|
489 static void syn_combine_list(short **clstr1, short **clstr2, int list_op); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
490 static void syn_incl_toplevel(int id, int *flagsp); |
| 7 | 491 |
| 492 /* | |
| 493 * Start the syntax recognition for a line. This function is normally called | |
| 494 * from the screen updating, once for each displayed line. | |
| 495 * The buffer is remembered in syn_buf, because get_syntax_attr() doesn't get | |
| 496 * it. Careful: curbuf and curwin are likely to point to another buffer and | |
| 497 * window. | |
| 498 */ | |
| 499 void | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
500 syntax_start(win_T *wp, linenr_T lnum, proftime_T *syntax_tm UNUSED) |
| 7 | 501 { |
| 502 synstate_T *p; | |
| 503 synstate_T *last_valid = NULL; | |
| 504 synstate_T *last_min_valid = NULL; | |
| 1512 | 505 synstate_T *sp, *prev = NULL; |
| 7 | 506 linenr_T parsed_lnum; |
| 507 linenr_T first_stored; | |
| 508 int dist; | |
|
10889
5780bd3a5a7e
patch 8.0.0334: can't access b:changedtick from a dict reference
Christian Brabandt <cb@256bit.org>
parents:
10660
diff
changeset
|
509 static varnumber_T changedtick = 0; /* remember the last change ID */ |
| 7 | 510 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
511 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
512 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
|
513 #endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
514 |
| 7 | 515 /* |
| 516 * After switching buffers, invalidate current_state. | |
| 26 | 517 * Also do this when a change was made, the current state may be invalid |
| 518 * then. | |
| 7 | 519 */ |
|
8806
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
520 if (syn_block != wp->w_s |
|
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
521 || 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
|
522 || changedtick != CHANGEDTICK(syn_buf)) |
| 7 | 523 { |
| 524 invalidate_current_state(); | |
| 525 syn_buf = wp->w_buffer; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
526 syn_block = wp->w_s; |
| 7 | 527 } |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
528 changedtick = CHANGEDTICK(syn_buf); |
| 7 | 529 syn_win = wp; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
530 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
531 syn_tm = syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
532 #endif |
| 7 | 533 |
| 534 /* | |
| 535 * Allocate syntax stack when needed. | |
| 536 */ | |
| 537 syn_stack_alloc(); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
538 if (syn_block->b_sst_array == NULL) |
| 410 | 539 return; /* out of memory */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
540 syn_block->b_sst_lasttick = display_tick; |
| 7 | 541 |
| 542 /* | |
| 543 * If the state of the end of the previous line is useful, store it. | |
| 544 */ | |
| 545 if (VALID_STATE(¤t_state) | |
| 546 && current_lnum < lnum | |
| 547 && current_lnum < syn_buf->b_ml.ml_line_count) | |
| 548 { | |
| 549 (void)syn_finish_line(FALSE); | |
| 550 if (!current_state_stored) | |
| 551 { | |
| 552 ++current_lnum; | |
| 1512 | 553 (void)store_current_state(); |
| 7 | 554 } |
| 555 | |
| 556 /* | |
| 557 * If the current_lnum is now the same as "lnum", keep the current | |
| 558 * state (this happens very often!). Otherwise invalidate | |
| 559 * current_state and figure it out below. | |
| 560 */ | |
| 561 if (current_lnum != lnum) | |
| 562 invalidate_current_state(); | |
| 563 } | |
| 564 else | |
| 565 invalidate_current_state(); | |
| 566 | |
| 567 /* | |
| 568 * Try to synchronize from a saved state in b_sst_array[]. | |
| 569 * Only do this if lnum is not before and not to far beyond a saved state. | |
| 570 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
571 if (INVALID_STATE(¤t_state) && syn_block->b_sst_array != NULL) |
| 7 | 572 { |
| 573 /* Find last valid saved state before start_lnum. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
574 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next) |
| 7 | 575 { |
| 576 if (p->sst_lnum > lnum) | |
| 577 break; | |
| 578 if (p->sst_lnum <= lnum && p->sst_change_lnum == 0) | |
| 579 { | |
| 580 last_valid = p; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
581 if (p->sst_lnum >= lnum - syn_block->b_syn_sync_minlines) |
| 7 | 582 last_min_valid = p; |
| 583 } | |
| 584 } | |
| 585 if (last_min_valid != NULL) | |
| 586 load_current_state(last_min_valid); | |
| 587 } | |
| 588 | |
| 589 /* | |
| 590 * If "lnum" is before or far beyond a line with a saved state, need to | |
| 591 * re-synchronize. | |
| 592 */ | |
| 593 if (INVALID_STATE(¤t_state)) | |
| 594 { | |
| 595 syn_sync(wp, lnum, last_valid); | |
| 2906 | 596 if (current_lnum == 1) |
| 597 /* First line is always valid, no matter "minlines". */ | |
| 598 first_stored = 1; | |
| 599 else | |
| 600 /* Need to parse "minlines" lines before state can be considered | |
| 601 * valid to store. */ | |
| 602 first_stored = current_lnum + syn_block->b_syn_sync_minlines; | |
| 7 | 603 } |
| 604 else | |
| 605 first_stored = current_lnum; | |
| 606 | |
| 607 /* | |
| 608 * Advance from the sync point or saved state until the current line. | |
| 609 * Save some entries for syncing with later on. | |
| 610 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
611 if (syn_block->b_sst_len <= Rows) |
| 819 | 612 dist = 999999; |
| 613 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
614 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 615 while (current_lnum < lnum) |
| 616 { | |
| 617 syn_start_line(); | |
| 618 (void)syn_finish_line(FALSE); | |
| 619 ++current_lnum; | |
| 620 | |
| 621 /* If we parsed at least "minlines" lines or started at a valid | |
| 622 * state, the current state is considered valid. */ | |
| 623 if (current_lnum >= first_stored) | |
| 624 { | |
| 625 /* Check if the saved state entry is for the current line and is | |
| 626 * equal to the current state. If so, then validate all saved | |
| 627 * states that depended on a change before the parsed line. */ | |
| 628 if (prev == NULL) | |
| 1512 | 629 prev = syn_stack_find_entry(current_lnum - 1); |
| 630 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
631 sp = syn_block->b_sst_first; |
| 7 | 632 else |
| 1512 | 633 sp = prev; |
| 634 while (sp != NULL && sp->sst_lnum < current_lnum) | |
| 635 sp = sp->sst_next; | |
| 7 | 636 if (sp != NULL |
| 637 && sp->sst_lnum == current_lnum | |
| 638 && syn_stack_equal(sp)) | |
| 639 { | |
| 640 parsed_lnum = current_lnum; | |
| 641 prev = sp; | |
| 642 while (sp != NULL && sp->sst_change_lnum <= parsed_lnum) | |
| 643 { | |
| 644 if (sp->sst_lnum <= lnum) | |
| 645 /* valid state before desired line, use this one */ | |
| 646 prev = sp; | |
| 647 else if (sp->sst_change_lnum == 0) | |
| 648 /* past saved states depending on change, break here. */ | |
| 649 break; | |
| 650 sp->sst_change_lnum = 0; | |
| 651 sp = sp->sst_next; | |
| 652 } | |
| 653 load_current_state(prev); | |
| 654 } | |
| 655 /* Store the state at this line when it's the first one, the line | |
| 656 * where we start parsing, or some distance from the previously | |
| 657 * saved state. But only when parsed at least 'minlines'. */ | |
| 658 else if (prev == NULL | |
| 659 || current_lnum == lnum | |
| 660 || current_lnum >= prev->sst_lnum + dist) | |
| 1512 | 661 prev = store_current_state(); |
| 7 | 662 } |
| 663 | |
| 664 /* This can take a long time: break when CTRL-C pressed. The current | |
| 665 * state will be wrong then. */ | |
| 666 line_breakcheck(); | |
| 667 if (got_int) | |
| 668 { | |
| 669 current_lnum = lnum; | |
| 670 break; | |
| 671 } | |
| 672 } | |
| 673 | |
| 674 syn_start_line(); | |
| 675 } | |
| 676 | |
| 677 /* | |
| 678 * We cannot simply discard growarrays full of state_items or buf_states; we | |
| 679 * have to manually release their extmatch pointers first. | |
| 680 */ | |
| 681 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
682 clear_syn_state(synstate_T *p) |
| 7 | 683 { |
| 684 int i; | |
| 685 garray_T *gap; | |
| 686 | |
| 687 if (p->sst_stacksize > SST_FIX_STATES) | |
| 688 { | |
| 689 gap = &(p->sst_union.sst_ga); | |
| 690 for (i = 0; i < gap->ga_len; i++) | |
| 691 unref_extmatch(SYN_STATE_P(gap)[i].bs_extmatch); | |
| 692 ga_clear(gap); | |
| 693 } | |
| 694 else | |
| 695 { | |
| 696 for (i = 0; i < p->sst_stacksize; i++) | |
| 697 unref_extmatch(p->sst_union.sst_stack[i].bs_extmatch); | |
| 698 } | |
| 699 } | |
| 700 | |
| 701 /* | |
| 702 * Cleanup the current_state stack. | |
| 703 */ | |
| 704 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
705 clear_current_state(void) |
| 7 | 706 { |
| 707 int i; | |
| 708 stateitem_T *sip; | |
| 709 | |
| 710 sip = (stateitem_T *)(current_state.ga_data); | |
| 711 for (i = 0; i < current_state.ga_len; i++) | |
| 712 unref_extmatch(sip[i].si_extmatch); | |
| 713 ga_clear(¤t_state); | |
| 714 } | |
| 715 | |
| 716 /* | |
| 717 * Try to find a synchronisation point for line "lnum". | |
| 718 * | |
| 719 * This sets current_lnum and the current state. One of three methods is | |
| 720 * used: | |
| 721 * 1. Search backwards for the end of a C-comment. | |
| 722 * 2. Search backwards for given sync patterns. | |
| 723 * 3. Simply start on a given number of lines above "lnum". | |
| 724 */ | |
| 725 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
726 syn_sync( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
727 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
728 linenr_T start_lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
729 synstate_T *last_valid) |
| 7 | 730 { |
| 731 buf_T *curbuf_save; | |
| 732 win_T *curwin_save; | |
| 733 pos_T cursor_save; | |
| 734 int idx; | |
| 735 linenr_T lnum; | |
| 736 linenr_T end_lnum; | |
| 737 linenr_T break_lnum; | |
| 738 int had_sync_point; | |
| 739 stateitem_T *cur_si; | |
| 740 synpat_T *spp; | |
| 741 char_u *line; | |
| 742 int found_flags = 0; | |
| 743 int found_match_idx = 0; | |
| 744 linenr_T found_current_lnum = 0; | |
| 745 int found_current_col= 0; | |
| 746 lpos_T found_m_endpos; | |
| 442 | 747 colnr_T prev_current_col; |
| 7 | 748 |
| 749 /* | |
| 750 * Clear any current state that might be hanging around. | |
| 751 */ | |
| 752 invalidate_current_state(); | |
| 753 | |
| 754 /* | |
| 755 * Start at least "minlines" back. Default starting point for parsing is | |
| 756 * there. | |
| 757 * Start further back, to avoid that scrolling backwards will result in | |
| 758 * resyncing for every line. Now it resyncs only one out of N lines, | |
| 759 * where N is minlines * 1.5, or minlines * 2 if minlines is small. | |
| 760 * Watch out for overflow when minlines is MAXLNUM. | |
| 761 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
762 if (syn_block->b_syn_sync_minlines > start_lnum) |
| 7 | 763 start_lnum = 1; |
| 764 else | |
| 765 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
766 if (syn_block->b_syn_sync_minlines == 1) |
| 7 | 767 lnum = 1; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
768 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
|
769 lnum = syn_block->b_syn_sync_minlines * 2; |
| 7 | 770 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
771 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
|
772 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
|
773 && lnum > syn_block->b_syn_sync_maxlines) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
774 lnum = syn_block->b_syn_sync_maxlines; |
| 7 | 775 if (lnum >= start_lnum) |
| 776 start_lnum = 1; | |
| 777 else | |
| 778 start_lnum -= lnum; | |
| 779 } | |
| 780 current_lnum = start_lnum; | |
| 781 | |
| 782 /* | |
| 783 * 1. Search backwards for the end of a C-style comment. | |
| 784 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
785 if (syn_block->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 786 { |
| 787 /* Need to make syn_buf the current buffer for a moment, to be able to | |
| 788 * use find_start_comment(). */ | |
| 789 curwin_save = curwin; | |
| 790 curwin = wp; | |
| 791 curbuf_save = curbuf; | |
| 792 curbuf = syn_buf; | |
| 793 | |
| 794 /* | |
| 795 * Skip lines that end in a backslash. | |
| 796 */ | |
| 797 for ( ; start_lnum > 1; --start_lnum) | |
| 798 { | |
| 799 line = ml_get(start_lnum - 1); | |
| 800 if (*line == NUL || *(line + STRLEN(line) - 1) != '\\') | |
| 801 break; | |
| 802 } | |
| 803 current_lnum = start_lnum; | |
| 804 | |
| 805 /* set cursor to start of search */ | |
| 806 cursor_save = wp->w_cursor; | |
| 807 wp->w_cursor.lnum = start_lnum; | |
| 808 wp->w_cursor.col = 0; | |
| 809 | |
| 810 /* | |
| 811 * If the line is inside a comment, need to find the syntax item that | |
| 812 * defines the comment. | |
| 813 * Restrict the search for the end of a comment to b_syn_sync_maxlines. | |
| 814 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
815 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
|
816 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
817 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
|
818 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
|
819 == syn_block->b_syn_sync_id |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
820 && SYN_ITEMS(syn_block)[idx].sp_type == SPTYPE_START) |
| 7 | 821 { |
| 822 validate_current_state(); | |
| 823 if (push_current_state(idx) == OK) | |
| 824 update_si_attr(current_state.ga_len - 1); | |
| 825 break; | |
| 826 } | |
| 827 } | |
| 828 | |
| 829 /* restore cursor and buffer */ | |
| 830 wp->w_cursor = cursor_save; | |
| 831 curwin = curwin_save; | |
| 832 curbuf = curbuf_save; | |
| 833 } | |
| 834 | |
| 835 /* | |
| 836 * 2. Search backwards for given sync patterns. | |
| 837 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
838 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
|
839 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
840 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
|
841 && 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
|
842 break_lnum = start_lnum - syn_block->b_syn_sync_maxlines; |
| 7 | 843 else |
| 844 break_lnum = 0; | |
| 845 | |
| 699 | 846 found_m_endpos.lnum = 0; |
| 847 found_m_endpos.col = 0; | |
| 7 | 848 end_lnum = start_lnum; |
| 849 lnum = start_lnum; | |
| 850 while (--lnum > break_lnum) | |
| 851 { | |
| 852 /* This can take a long time: break when CTRL-C pressed. */ | |
| 853 line_breakcheck(); | |
| 854 if (got_int) | |
| 855 { | |
| 856 invalidate_current_state(); | |
| 857 current_lnum = start_lnum; | |
| 858 break; | |
| 859 } | |
| 860 | |
| 861 /* Check if we have run into a valid saved state stack now. */ | |
| 862 if (last_valid != NULL && lnum == last_valid->sst_lnum) | |
| 863 { | |
| 864 load_current_state(last_valid); | |
| 865 break; | |
| 866 } | |
| 867 | |
| 868 /* | |
| 869 * Check if the previous line has the line-continuation pattern. | |
| 870 */ | |
| 871 if (lnum > 1 && syn_match_linecont(lnum - 1)) | |
| 872 continue; | |
| 873 | |
| 874 /* | |
| 875 * Start with nothing on the state stack | |
| 876 */ | |
| 877 validate_current_state(); | |
| 878 | |
| 879 for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum) | |
| 880 { | |
| 881 syn_start_line(); | |
| 882 for (;;) | |
| 883 { | |
| 884 had_sync_point = syn_finish_line(TRUE); | |
| 885 /* | |
| 886 * When a sync point has been found, remember where, and | |
| 887 * continue to look for another one, further on in the line. | |
| 888 */ | |
| 889 if (had_sync_point && current_state.ga_len) | |
| 890 { | |
| 891 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 892 if (cur_si->si_m_endpos.lnum > start_lnum) | |
| 893 { | |
| 894 /* ignore match that goes to after where started */ | |
| 895 current_lnum = end_lnum; | |
| 896 break; | |
| 897 } | |
| 1371 | 898 if (cur_si->si_idx < 0) |
| 899 { | |
| 900 /* Cannot happen? */ | |
| 901 found_flags = 0; | |
| 902 found_match_idx = KEYWORD_IDX; | |
| 903 } | |
| 904 else | |
| 905 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
906 spp = &(SYN_ITEMS(syn_block)[cur_si->si_idx]); |
| 1371 | 907 found_flags = spp->sp_flags; |
| 908 found_match_idx = spp->sp_sync_idx; | |
| 909 } | |
| 7 | 910 found_current_lnum = current_lnum; |
| 911 found_current_col = current_col; | |
| 912 found_m_endpos = cur_si->si_m_endpos; | |
| 913 /* | |
| 914 * Continue after the match (be aware of a zero-length | |
| 915 * match). | |
| 916 */ | |
| 917 if (found_m_endpos.lnum > current_lnum) | |
| 918 { | |
| 919 current_lnum = found_m_endpos.lnum; | |
| 920 current_col = found_m_endpos.col; | |
| 921 if (current_lnum >= end_lnum) | |
| 922 break; | |
| 923 } | |
| 924 else if (found_m_endpos.col > current_col) | |
| 925 current_col = found_m_endpos.col; | |
| 926 else | |
| 927 ++current_col; | |
| 928 | |
| 929 /* syn_current_attr() will have skipped the check for | |
| 442 | 930 * an item that ends here, need to do that now. Be |
| 931 * careful not to go past the NUL. */ | |
| 932 prev_current_col = current_col; | |
| 933 if (syn_getcurline()[current_col] != NUL) | |
| 934 ++current_col; | |
| 7 | 935 check_state_ends(); |
| 442 | 936 current_col = prev_current_col; |
| 7 | 937 } |
| 938 else | |
| 939 break; | |
| 940 } | |
| 941 } | |
| 942 | |
| 943 /* | |
| 944 * If a sync point was encountered, break here. | |
| 945 */ | |
| 946 if (found_flags) | |
| 947 { | |
| 948 /* | |
| 949 * Put the item that was specified by the sync point on the | |
| 950 * state stack. If there was no item specified, make the | |
| 951 * state stack empty. | |
| 952 */ | |
| 953 clear_current_state(); | |
| 954 if (found_match_idx >= 0 | |
| 955 && push_current_state(found_match_idx) == OK) | |
| 956 update_si_attr(current_state.ga_len - 1); | |
| 957 | |
| 958 /* | |
| 959 * When using "grouphere", continue from the sync point | |
| 960 * match, until the end of the line. Parsing starts at | |
| 961 * the next line. | |
| 962 * For "groupthere" the parsing starts at start_lnum. | |
| 963 */ | |
| 964 if (found_flags & HL_SYNC_HERE) | |
| 965 { | |
| 966 if (current_state.ga_len) | |
| 967 { | |
| 968 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 969 cur_si->si_h_startpos.lnum = found_current_lnum; | |
| 970 cur_si->si_h_startpos.col = found_current_col; | |
| 971 update_si_end(cur_si, (int)current_col, TRUE); | |
| 972 check_keepend(); | |
| 973 } | |
| 974 current_col = found_m_endpos.col; | |
| 975 current_lnum = found_m_endpos.lnum; | |
| 976 (void)syn_finish_line(FALSE); | |
| 977 ++current_lnum; | |
| 978 } | |
| 979 else | |
| 980 current_lnum = start_lnum; | |
| 981 | |
| 982 break; | |
| 983 } | |
| 984 | |
| 985 end_lnum = lnum; | |
| 986 invalidate_current_state(); | |
| 987 } | |
| 988 | |
| 989 /* Ran into start of the file or exceeded maximum number of lines */ | |
| 990 if (lnum <= break_lnum) | |
| 991 { | |
| 992 invalidate_current_state(); | |
| 993 current_lnum = break_lnum + 1; | |
| 994 } | |
| 995 } | |
| 996 | |
| 997 validate_current_state(); | |
| 998 } | |
| 999 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1000 static void |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1001 save_chartab(char_u *chartab) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1002 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1003 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
|
1004 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1005 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
|
1006 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
|
1007 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1008 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1009 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1010 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1011 static void |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1012 restore_chartab(char_u *chartab) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1013 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1014 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
|
1015 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
|
1016 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1017 |
| 7 | 1018 /* |
| 1019 * Return TRUE if the line-continuation pattern matches in line "lnum". | |
| 1020 */ | |
| 1021 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1022 syn_match_linecont(linenr_T lnum) |
| 7 | 1023 { |
| 1024 regmmatch_T regmatch; | |
| 6375 | 1025 int r; |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1026 char_u buf_chartab[32]; /* chartab array for syn iskyeyword */ |
| 7 | 1027 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1028 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
|
1029 { |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1030 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1031 save_chartab(buf_chartab); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1032 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
|
1033 regmatch.regprog = syn_block->b_syn_linecont_prog; |
| 6375 | 1034 r = syn_regexec(®match, lnum, (colnr_T)0, |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1035 IF_SYN_TIME(&syn_block->b_syn_linecont_time)); |
| 6375 | 1036 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
|
1037 restore_chartab(buf_chartab); |
| 6375 | 1038 return r; |
| 7 | 1039 } |
| 1040 return FALSE; | |
| 1041 } | |
| 1042 | |
| 1043 /* | |
| 1044 * Prepare the current state for the start of a line. | |
| 1045 */ | |
| 1046 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1047 syn_start_line(void) |
| 7 | 1048 { |
| 1049 current_finished = FALSE; | |
| 1050 current_col = 0; | |
| 1051 | |
| 1052 /* | |
| 1053 * Need to update the end of a start/skip/end that continues from the | |
| 1054 * previous line and regions that have "keepend". | |
| 1055 */ | |
| 1056 if (current_state.ga_len > 0) | |
| 2863 | 1057 { |
| 7 | 1058 syn_update_ends(TRUE); |
| 2863 | 1059 check_state_ends(); |
| 1060 } | |
| 7 | 1061 |
| 1062 next_match_idx = -1; | |
| 1063 ++current_line_id; | |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
1064 #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
|
1065 next_seqnr = 1; |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
1066 #endif |
| 7 | 1067 } |
| 1068 | |
| 1069 /* | |
| 1070 * Check for items in the stack that need their end updated. | |
| 1071 * When "startofline" is TRUE the last item is always updated. | |
| 1072 * When "startofline" is FALSE the item with "keepend" is forcefully updated. | |
| 1073 */ | |
| 1074 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1075 syn_update_ends(int startofline) |
| 7 | 1076 { |
| 1077 stateitem_T *cur_si; | |
| 1078 int i; | |
| 991 | 1079 int seen_keepend; |
| 7 | 1080 |
| 1081 if (startofline) | |
| 1082 { | |
| 1083 /* Check for a match carried over from a previous line with a | |
| 1084 * contained region. The match ends as soon as the region ends. */ | |
| 1085 for (i = 0; i < current_state.ga_len; ++i) | |
| 1086 { | |
| 1087 cur_si = &CUR_STATE(i); | |
| 1088 if (cur_si->si_idx >= 0 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1089 && (SYN_ITEMS(syn_block)[cur_si->si_idx]).sp_type |
| 7 | 1090 == SPTYPE_MATCH |
| 1091 && cur_si->si_m_endpos.lnum < current_lnum) | |
| 1092 { | |
| 1093 cur_si->si_flags |= HL_MATCHCONT; | |
| 1094 cur_si->si_m_endpos.lnum = 0; | |
| 1095 cur_si->si_m_endpos.col = 0; | |
| 1096 cur_si->si_h_endpos = cur_si->si_m_endpos; | |
| 1097 cur_si->si_ends = TRUE; | |
| 1098 } | |
| 1099 } | |
| 1100 } | |
| 1101 | |
| 1102 /* | |
| 1103 * Need to update the end of a start/skip/end that continues from the | |
| 1104 * previous line. And regions that have "keepend", because they may | |
| 991 | 1105 * influence contained items. If we've just removed "extend" |
| 1106 * (startofline == 0) then we should update ends of normal regions | |
| 1107 * contained inside "keepend" because "extend" could have extended | |
| 1108 * these "keepend" regions as well as contained normal regions. | |
| 7 | 1109 * Then check for items ending in column 0. |
| 1110 */ | |
| 1111 i = current_state.ga_len - 1; | |
| 1112 if (keepend_level >= 0) | |
| 1113 for ( ; i > keepend_level; --i) | |
| 1114 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 1115 break; | |
| 991 | 1116 |
| 1117 seen_keepend = FALSE; | |
| 7 | 1118 for ( ; i < current_state.ga_len; ++i) |
| 1119 { | |
| 1120 cur_si = &CUR_STATE(i); | |
| 1121 if ((cur_si->si_flags & HL_KEEPEND) | |
| 991 | 1122 || (seen_keepend && !startofline) |
| 7 | 1123 || (i == current_state.ga_len - 1 && startofline)) |
| 1124 { | |
| 1125 cur_si->si_h_startpos.col = 0; /* start highl. in col 0 */ | |
| 1126 cur_si->si_h_startpos.lnum = current_lnum; | |
| 1127 | |
| 1128 if (!(cur_si->si_flags & HL_MATCHCONT)) | |
| 1129 update_si_end(cur_si, (int)current_col, !startofline); | |
| 991 | 1130 |
| 1131 if (!startofline && (cur_si->si_flags & HL_KEEPEND)) | |
| 1132 seen_keepend = TRUE; | |
| 7 | 1133 } |
| 1134 } | |
| 1135 check_keepend(); | |
| 1136 } | |
| 1137 | |
| 1138 /**************************************** | |
| 1139 * Handling of the state stack cache. | |
| 1140 */ | |
| 1141 | |
| 1142 /* | |
| 1143 * EXPLANATION OF THE SYNTAX STATE STACK CACHE | |
| 1144 * | |
| 1145 * To speed up syntax highlighting, the state stack for the start of some | |
| 1146 * lines is cached. These entries can be used to start parsing at that point. | |
| 1147 * | |
| 1148 * The stack is kept in b_sst_array[] for each buffer. There is a list of | |
| 1149 * valid entries. b_sst_first points to the first one, then follow sst_next. | |
| 1150 * The entries are sorted on line number. The first entry is often for line 2 | |
| 1151 * (line 1 always starts with an empty stack). | |
| 1152 * There is also a list for free entries. This construction is used to avoid | |
| 1153 * having to allocate and free memory blocks too often. | |
| 1154 * | |
| 1155 * When making changes to the buffer, this is logged in b_mod_*. When calling | |
| 1156 * update_screen() to update the display, it will call | |
| 1157 * syn_stack_apply_changes() for each displayed buffer to adjust the cached | |
| 1158 * entries. The entries which are inside the changed area are removed, | |
| 1159 * because they must be recomputed. Entries below the changed have their line | |
| 1160 * number adjusted for deleted/inserted lines, and have their sst_change_lnum | |
| 1161 * set to indicate that a check must be made if the changed lines would change | |
| 1162 * the cached entry. | |
| 1163 * | |
| 1164 * When later displaying lines, an entry is stored for each line. Displayed | |
| 1165 * lines are likely to be displayed again, in which case the state at the | |
| 1166 * start of the line is needed. | |
| 1167 * For not displayed lines, an entry is stored for every so many lines. These | |
| 1168 * entries will be used e.g., when scrolling backwards. The distance between | |
| 1169 * entries depends on the number of lines in the buffer. For small buffers | |
| 1170 * the distance is fixed at SST_DIST, for large buffers there is a fixed | |
| 1171 * number of entries SST_MAX_ENTRIES, and the distance is computed. | |
| 1172 */ | |
| 1173 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1174 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1175 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
|
1176 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1177 synstate_T *p; |
|
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 if (block->b_sst_array != NULL) |
|
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 for (p = block->b_sst_first; p != NULL; p = p->sst_next) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1182 clear_syn_state(p); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1183 vim_free(block->b_sst_array); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1184 block->b_sst_array = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1185 block->b_sst_len = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1186 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1187 } |
| 7 | 1188 /* |
| 1189 * Free b_sst_array[] for buffer "buf". | |
| 1190 * Used when syntax items changed to force resyncing everywhere. | |
| 1191 */ | |
| 1192 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1193 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
|
1194 { |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1195 #ifdef FEAT_FOLDING |
| 7 | 1196 win_T *wp; |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1197 #endif |
| 7 | 1198 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1199 syn_stack_free_block(block); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1200 |
| 7 | 1201 #ifdef FEAT_FOLDING |
| 1202 /* When using "syntax" fold method, must update all folds. */ | |
| 1203 FOR_ALL_WINDOWS(wp) | |
| 1204 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1205 if (wp->w_s == block && foldmethodIsSyntax(wp)) |
| 7 | 1206 foldUpdateAll(wp); |
| 1207 } | |
| 1208 #endif | |
| 1209 } | |
| 1210 | |
| 1211 /* | |
| 1212 * Allocate the syntax state stack for syn_buf when needed. | |
| 1213 * If the number of entries in b_sst_array[] is much too big or a bit too | |
| 1214 * small, reallocate it. | |
| 1215 * Also used to allocate b_sst_array[] for the first time. | |
| 1216 */ | |
| 1217 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1218 syn_stack_alloc(void) |
| 7 | 1219 { |
| 1220 long len; | |
| 1221 synstate_T *to, *from; | |
| 1222 synstate_T *sstp; | |
| 1223 | |
| 1224 len = syn_buf->b_ml.ml_line_count / SST_DIST + Rows * 2; | |
| 1225 if (len < SST_MIN_ENTRIES) | |
| 1226 len = SST_MIN_ENTRIES; | |
| 1227 else if (len > SST_MAX_ENTRIES) | |
| 1228 len = SST_MAX_ENTRIES; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1229 if (syn_block->b_sst_len > len * 2 || syn_block->b_sst_len < len) |
| 7 | 1230 { |
| 1231 /* Allocate 50% too much, to avoid reallocating too often. */ | |
| 1232 len = syn_buf->b_ml.ml_line_count; | |
| 1233 len = (len + len / 2) / SST_DIST + Rows * 2; | |
| 1234 if (len < SST_MIN_ENTRIES) | |
| 1235 len = SST_MIN_ENTRIES; | |
| 1236 else if (len > SST_MAX_ENTRIES) | |
| 1237 len = SST_MAX_ENTRIES; | |
| 1238 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1239 if (syn_block->b_sst_array != NULL) |
| 7 | 1240 { |
| 1241 /* When shrinking the array, cleanup the existing stack. | |
| 1242 * 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
|
1243 while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len |
| 7 | 1244 && syn_stack_cleanup()) |
| 1245 ; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1246 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
|
1247 len = syn_block->b_sst_len - syn_block->b_sst_freecount + 2; |
| 7 | 1248 } |
| 1249 | |
| 1250 sstp = (synstate_T *)alloc_clear((unsigned)(len * sizeof(synstate_T))); | |
| 1251 if (sstp == NULL) /* out of memory! */ | |
| 1252 return; | |
| 1253 | |
| 1254 to = sstp - 1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1255 if (syn_block->b_sst_array != NULL) |
| 7 | 1256 { |
| 1257 /* 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
|
1258 for (from = syn_block->b_sst_first; from != NULL; |
| 7 | 1259 from = from->sst_next) |
| 1260 { | |
| 1261 ++to; | |
| 1262 *to = *from; | |
| 1263 to->sst_next = to + 1; | |
| 1264 } | |
| 1265 } | |
| 1266 if (to != sstp - 1) | |
| 1267 { | |
| 1268 to->sst_next = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1269 syn_block->b_sst_first = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1270 syn_block->b_sst_freecount = len - (int)(to - sstp) - 1; |
| 7 | 1271 } |
| 1272 else | |
| 1273 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1274 syn_block->b_sst_first = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1275 syn_block->b_sst_freecount = len; |
| 7 | 1276 } |
| 1277 | |
| 1278 /* Create the list of free entries. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1279 syn_block->b_sst_firstfree = to + 1; |
| 7 | 1280 while (++to < sstp + len) |
| 1281 to->sst_next = to + 1; | |
| 1282 (sstp + len - 1)->sst_next = NULL; | |
| 1283 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1284 vim_free(syn_block->b_sst_array); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1285 syn_block->b_sst_array = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1286 syn_block->b_sst_len = len; |
| 7 | 1287 } |
| 1288 } | |
| 1289 | |
| 1290 /* | |
| 1291 * Check for changes in a buffer to affect stored syntax states. Uses the | |
| 1292 * b_mod_* fields. | |
| 1293 * Called from update_screen(), before screen is being updated, once for each | |
| 1294 * displayed buffer. | |
| 1295 */ | |
| 1296 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1297 syn_stack_apply_changes(buf_T *buf) |
| 7 | 1298 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1299 win_T *wp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1300 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1301 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
|
1302 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1303 FOR_ALL_WINDOWS(wp) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1304 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1305 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
|
1306 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
|
1307 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1308 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1309 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1310 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1311 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
|
1312 { |
| 7 | 1313 synstate_T *p, *prev, *np; |
| 1314 linenr_T n; | |
| 1315 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1316 if (block->b_sst_array == NULL) /* nothing to do */ |
| 7 | 1317 return; |
| 1318 | |
| 1319 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1320 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
|
1321 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1322 if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top) |
| 7 | 1323 { |
| 1324 n = p->sst_lnum + buf->b_mod_xlines; | |
| 1325 if (n <= buf->b_mod_bot) | |
| 1326 { | |
| 1327 /* this state is inside the changed area, remove it */ | |
| 1328 np = p->sst_next; | |
| 1329 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1330 block->b_sst_first = np; |
| 7 | 1331 else |
| 1332 prev->sst_next = np; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1333 syn_stack_free_entry(block, p); |
| 7 | 1334 p = np; |
| 1335 continue; | |
| 1336 } | |
| 1337 /* This state is below the changed area. Remember the line | |
| 1338 * that needs to be parsed before this entry can be made valid | |
| 1339 * again. */ | |
| 1340 if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top) | |
| 1341 { | |
| 1342 if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top) | |
| 1343 p->sst_change_lnum += buf->b_mod_xlines; | |
| 1344 else | |
| 1345 p->sst_change_lnum = buf->b_mod_top; | |
| 1346 } | |
| 1347 if (p->sst_change_lnum == 0 | |
| 1348 || p->sst_change_lnum < buf->b_mod_bot) | |
| 1349 p->sst_change_lnum = buf->b_mod_bot; | |
| 1350 | |
| 1351 p->sst_lnum = n; | |
| 1352 } | |
| 1353 prev = p; | |
| 1354 p = p->sst_next; | |
| 1355 } | |
| 1356 } | |
| 1357 | |
| 1358 /* | |
| 1359 * Reduce the number of entries in the state stack for syn_buf. | |
| 1360 * Returns TRUE if at least one entry was freed. | |
| 1361 */ | |
| 1362 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1363 syn_stack_cleanup(void) |
| 7 | 1364 { |
| 1365 synstate_T *p, *prev; | |
| 1366 disptick_T tick; | |
| 1367 int above; | |
| 1368 int dist; | |
| 1369 int retval = FALSE; | |
| 1370 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1371 if (syn_block->b_sst_array == NULL || syn_block->b_sst_first == NULL) |
| 7 | 1372 return retval; |
| 1373 | |
| 1374 /* 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
|
1375 if (syn_block->b_sst_len <= Rows) |
| 819 | 1376 dist = 999999; |
| 1377 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1378 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 1379 |
| 1380 /* | |
| 2020 | 1381 * Go through the list to find the "tick" for the oldest entry that can |
| 7 | 1382 * be removed. Set "above" when the "tick" for the oldest entry is above |
| 1383 * "b_sst_lasttick" (the display tick wraps around). | |
| 1384 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1385 tick = syn_block->b_sst_lasttick; |
| 7 | 1386 above = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1387 prev = syn_block->b_sst_first; |
| 7 | 1388 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1389 { | |
| 1390 if (prev->sst_lnum + dist > p->sst_lnum) | |
| 1391 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1392 if (p->sst_tick > syn_block->b_sst_lasttick) |
| 7 | 1393 { |
| 1394 if (!above || p->sst_tick < tick) | |
| 1395 tick = p->sst_tick; | |
| 1396 above = TRUE; | |
| 1397 } | |
| 1398 else if (!above && p->sst_tick < tick) | |
| 1399 tick = p->sst_tick; | |
| 1400 } | |
| 1401 } | |
| 1402 | |
| 1403 /* | |
| 1404 * Go through the list to make the entries for the oldest tick at an | |
| 1405 * interval of several lines. | |
| 1406 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1407 prev = syn_block->b_sst_first; |
| 7 | 1408 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1409 { | |
| 1410 if (p->sst_tick == tick && prev->sst_lnum + dist > p->sst_lnum) | |
| 1411 { | |
| 1412 /* Move this entry from used list to free list */ | |
| 1413 prev->sst_next = p->sst_next; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1414 syn_stack_free_entry(syn_block, p); |
| 7 | 1415 p = prev; |
| 1416 retval = TRUE; | |
| 1417 } | |
| 1418 } | |
| 1419 return retval; | |
| 1420 } | |
| 1421 | |
| 1422 /* | |
| 1423 * Free the allocated memory for a syn_state item. | |
| 1424 * Move the entry into the free list. | |
| 1425 */ | |
| 1426 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1427 syn_stack_free_entry(synblock_T *block, synstate_T *p) |
| 7 | 1428 { |
| 1429 clear_syn_state(p); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1430 p->sst_next = block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1431 block->b_sst_firstfree = p; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1432 ++block->b_sst_freecount; |
| 7 | 1433 } |
| 1434 | |
| 1435 /* | |
| 1436 * Find an entry in the list of state stacks at or before "lnum". | |
| 1437 * Returns NULL when there is no entry or the first entry is after "lnum". | |
| 1438 */ | |
| 1439 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1440 syn_stack_find_entry(linenr_T lnum) |
| 7 | 1441 { |
| 1442 synstate_T *p, *prev; | |
| 1443 | |
| 1444 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1445 for (p = syn_block->b_sst_first; p != NULL; prev = p, p = p->sst_next) |
| 7 | 1446 { |
| 1447 if (p->sst_lnum == lnum) | |
| 1448 return p; | |
| 1449 if (p->sst_lnum > lnum) | |
| 1450 break; | |
| 1451 } | |
| 1452 return prev; | |
| 1453 } | |
| 1454 | |
| 1455 /* | |
| 1456 * Try saving the current state in b_sst_array[]. | |
| 1457 * The current state must be valid for the start of the current_lnum line! | |
| 1458 */ | |
| 1459 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1460 store_current_state(void) |
| 7 | 1461 { |
| 1462 int i; | |
| 1463 synstate_T *p; | |
| 1464 bufstate_T *bp; | |
| 1465 stateitem_T *cur_si; | |
| 1512 | 1466 synstate_T *sp = syn_stack_find_entry(current_lnum); |
| 7 | 1467 |
| 1468 /* | |
| 1469 * If the current state contains a start or end pattern that continues | |
| 1470 * from the previous line, we can't use it. Don't store it then. | |
| 1471 */ | |
| 1472 for (i = current_state.ga_len - 1; i >= 0; --i) | |
| 1473 { | |
| 1474 cur_si = &CUR_STATE(i); | |
| 1475 if (cur_si->si_h_startpos.lnum >= current_lnum | |
| 1476 || cur_si->si_m_endpos.lnum >= current_lnum | |
| 1477 || cur_si->si_h_endpos.lnum >= current_lnum | |
| 1478 || (cur_si->si_end_idx | |
| 1479 && cur_si->si_eoe_pos.lnum >= current_lnum)) | |
| 1480 break; | |
| 1481 } | |
| 1482 if (i >= 0) | |
| 1483 { | |
| 1484 if (sp != NULL) | |
| 1485 { | |
| 1486 /* 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
|
1487 if (syn_block->b_sst_first == sp) |
| 7 | 1488 /* it's the first entry */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1489 syn_block->b_sst_first = sp->sst_next; |
| 7 | 1490 else |
| 1491 { | |
| 1492 /* find the entry just before this one to adjust sst_next */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1493 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next) |
| 7 | 1494 if (p->sst_next == sp) |
| 1495 break; | |
| 840 | 1496 if (p != NULL) /* just in case */ |
| 1497 p->sst_next = sp->sst_next; | |
| 7 | 1498 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1499 syn_stack_free_entry(syn_block, sp); |
| 7 | 1500 sp = NULL; |
| 1501 } | |
| 1502 } | |
| 1503 else if (sp == NULL || sp->sst_lnum != current_lnum) | |
| 1504 { | |
| 1505 /* | |
| 1506 * Add a new entry | |
| 1507 */ | |
| 1508 /* 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
|
1509 if (syn_block->b_sst_freecount == 0) |
| 7 | 1510 { |
| 1511 (void)syn_stack_cleanup(); | |
| 1512 /* "sp" may have been moved to the freelist now */ | |
| 1513 sp = syn_stack_find_entry(current_lnum); | |
| 1514 } | |
| 1515 /* 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
|
1516 if (syn_block->b_sst_freecount == 0) |
| 7 | 1517 sp = NULL; |
| 1518 else | |
| 1519 { | |
| 1520 /* Take the first item from the free list and put it in the used | |
| 1521 * list, after *sp */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1522 p = syn_block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1523 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
|
1524 --syn_block->b_sst_freecount; |
| 7 | 1525 if (sp == NULL) |
| 1526 { | |
| 1527 /* Insert in front of the list */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1528 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
|
1529 syn_block->b_sst_first = p; |
| 7 | 1530 } |
| 1531 else | |
| 1532 { | |
| 1533 /* insert in list after *sp */ | |
| 1534 p->sst_next = sp->sst_next; | |
| 1535 sp->sst_next = p; | |
| 1536 } | |
| 1537 sp = p; | |
| 1538 sp->sst_stacksize = 0; | |
| 1539 sp->sst_lnum = current_lnum; | |
| 1540 } | |
| 1541 } | |
| 1542 if (sp != NULL) | |
| 1543 { | |
| 1544 /* When overwriting an existing state stack, clear it first */ | |
| 1545 clear_syn_state(sp); | |
| 1546 sp->sst_stacksize = current_state.ga_len; | |
| 1547 if (current_state.ga_len > SST_FIX_STATES) | |
| 1548 { | |
| 1549 /* Need to clear it, might be something remaining from when the | |
| 1550 * length was less than SST_FIX_STATES. */ | |
| 1551 ga_init2(&sp->sst_union.sst_ga, (int)sizeof(bufstate_T), 1); | |
| 1552 if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL) | |
| 1553 sp->sst_stacksize = 0; | |
| 1554 else | |
| 1555 sp->sst_union.sst_ga.ga_len = current_state.ga_len; | |
| 1556 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
| 1557 } | |
| 1558 else | |
| 1559 bp = sp->sst_union.sst_stack; | |
| 1560 for (i = 0; i < sp->sst_stacksize; ++i) | |
| 1561 { | |
| 1562 bp[i].bs_idx = CUR_STATE(i).si_idx; | |
| 1563 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
|
1564 #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
|
1565 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
|
1566 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
|
1567 #endif |
| 7 | 1568 bp[i].bs_extmatch = ref_extmatch(CUR_STATE(i).si_extmatch); |
| 1569 } | |
| 1570 sp->sst_next_flags = current_next_flags; | |
| 1571 sp->sst_next_list = current_next_list; | |
| 1572 sp->sst_tick = display_tick; | |
| 1573 sp->sst_change_lnum = 0; | |
| 1574 } | |
| 1575 current_state_stored = TRUE; | |
| 1576 return sp; | |
| 1577 } | |
| 1578 | |
| 1579 /* | |
| 1580 * Copy a state stack from "from" in b_sst_array[] to current_state; | |
| 1581 */ | |
| 1582 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1583 load_current_state(synstate_T *from) |
| 7 | 1584 { |
| 1585 int i; | |
| 1586 bufstate_T *bp; | |
| 1587 | |
| 1588 clear_current_state(); | |
| 1589 validate_current_state(); | |
| 1590 keepend_level = -1; | |
| 1591 if (from->sst_stacksize | |
| 1592 && ga_grow(¤t_state, from->sst_stacksize) != FAIL) | |
| 1593 { | |
| 1594 if (from->sst_stacksize > SST_FIX_STATES) | |
| 1595 bp = SYN_STATE_P(&(from->sst_union.sst_ga)); | |
| 1596 else | |
| 1597 bp = from->sst_union.sst_stack; | |
| 1598 for (i = 0; i < from->sst_stacksize; ++i) | |
| 1599 { | |
| 1600 CUR_STATE(i).si_idx = bp[i].bs_idx; | |
| 1601 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
|
1602 #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
|
1603 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
|
1604 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
|
1605 #endif |
| 7 | 1606 CUR_STATE(i).si_extmatch = ref_extmatch(bp[i].bs_extmatch); |
| 1607 if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND)) | |
| 1608 keepend_level = i; | |
| 1609 CUR_STATE(i).si_ends = FALSE; | |
| 1610 CUR_STATE(i).si_m_lnum = 0; | |
| 1611 if (CUR_STATE(i).si_idx >= 0) | |
| 1612 CUR_STATE(i).si_next_list = | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1613 (SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_next_list; |
| 7 | 1614 else |
| 1615 CUR_STATE(i).si_next_list = NULL; | |
| 1616 update_si_attr(i); | |
| 1617 } | |
| 1618 current_state.ga_len = from->sst_stacksize; | |
| 1619 } | |
| 1620 current_next_list = from->sst_next_list; | |
| 1621 current_next_flags = from->sst_next_flags; | |
| 1622 current_lnum = from->sst_lnum; | |
| 1623 } | |
| 1624 | |
| 1625 /* | |
| 1626 * Compare saved state stack "*sp" with the current state. | |
| 1627 * Return TRUE when they are equal. | |
| 1628 */ | |
| 1629 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1630 syn_stack_equal(synstate_T *sp) |
| 7 | 1631 { |
| 1632 int i, j; | |
| 1633 bufstate_T *bp; | |
| 1634 reg_extmatch_T *six, *bsx; | |
| 1635 | |
| 1636 /* First a quick check if the stacks have the same size end nextlist. */ | |
| 1637 if (sp->sst_stacksize == current_state.ga_len | |
| 1638 && sp->sst_next_list == current_next_list) | |
| 1639 { | |
| 1640 /* Need to compare all states on both stacks. */ | |
| 1641 if (sp->sst_stacksize > SST_FIX_STATES) | |
| 1642 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
| 1643 else | |
| 1644 bp = sp->sst_union.sst_stack; | |
| 1645 | |
| 1646 for (i = current_state.ga_len; --i >= 0; ) | |
| 1647 { | |
| 1648 /* If the item has another index the state is different. */ | |
| 1649 if (bp[i].bs_idx != CUR_STATE(i).si_idx) | |
| 1650 break; | |
| 1651 if (bp[i].bs_extmatch != CUR_STATE(i).si_extmatch) | |
| 1652 { | |
| 1653 /* When the extmatch pointers are different, the strings in | |
| 1654 * them can still be the same. Check if the extmatch | |
| 1655 * references are equal. */ | |
| 1656 bsx = bp[i].bs_extmatch; | |
| 1657 six = CUR_STATE(i).si_extmatch; | |
| 1658 /* If one of the extmatch pointers is NULL the states are | |
| 1659 * different. */ | |
| 1660 if (bsx == NULL || six == NULL) | |
| 1661 break; | |
| 1662 for (j = 0; j < NSUBEXP; ++j) | |
| 1663 { | |
| 1664 /* Check each referenced match string. They must all be | |
| 1665 * equal. */ | |
| 1666 if (bsx->matches[j] != six->matches[j]) | |
| 1667 { | |
| 1668 /* If the pointer is different it can still be the | |
| 1669 * same text. Compare the strings, ignore case when | |
| 1670 * the start item has the sp_ic flag set. */ | |
| 1671 if (bsx->matches[j] == NULL | |
| 1672 || six->matches[j] == NULL) | |
| 1673 break; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1674 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic |
| 7 | 1675 ? MB_STRICMP(bsx->matches[j], |
| 1676 six->matches[j]) != 0 | |
| 1677 : STRCMP(bsx->matches[j], six->matches[j]) != 0) | |
| 1678 break; | |
| 1679 } | |
| 1680 } | |
| 1681 if (j != NSUBEXP) | |
| 1682 break; | |
| 1683 } | |
| 1684 } | |
| 1685 if (i < 0) | |
| 1686 return TRUE; | |
| 1687 } | |
| 1688 return FALSE; | |
| 1689 } | |
| 1690 | |
| 1691 /* | |
| 1692 * We stop parsing syntax above line "lnum". If the stored state at or below | |
| 1693 * this line depended on a change before it, it now depends on the line below | |
| 1694 * the last parsed line. | |
| 1695 * The window looks like this: | |
| 1696 * line which changed | |
| 1697 * displayed line | |
| 1698 * displayed line | |
| 1699 * lnum -> line below window | |
| 1700 */ | |
| 1701 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1702 syntax_end_parsing(linenr_T lnum) |
| 7 | 1703 { |
| 1704 synstate_T *sp; | |
| 1705 | |
| 1706 sp = syn_stack_find_entry(lnum); | |
| 1707 if (sp != NULL && sp->sst_lnum < lnum) | |
| 1708 sp = sp->sst_next; | |
| 1709 | |
| 1710 if (sp != NULL && sp->sst_change_lnum != 0) | |
| 1711 sp->sst_change_lnum = lnum; | |
| 1712 } | |
| 1713 | |
| 1714 /* | |
| 1715 * End of handling of the state stack. | |
| 1716 ****************************************/ | |
| 1717 | |
| 1718 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1719 invalidate_current_state(void) |
| 7 | 1720 { |
| 1721 clear_current_state(); | |
| 1722 current_state.ga_itemsize = 0; /* mark current_state invalid */ | |
| 1723 current_next_list = NULL; | |
| 1724 keepend_level = -1; | |
| 1725 } | |
| 1726 | |
| 1727 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1728 validate_current_state(void) |
| 7 | 1729 { |
| 1730 current_state.ga_itemsize = sizeof(stateitem_T); | |
| 1731 current_state.ga_growsize = 3; | |
| 1732 } | |
| 1733 | |
| 1734 /* | |
| 1735 * Return TRUE if the syntax at start of lnum changed since last time. | |
| 1736 * This will only be called just after get_syntax_attr() for the previous | |
| 1737 * line, to check if the next line needs to be redrawn too. | |
| 1738 */ | |
| 1739 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1740 syntax_check_changed(linenr_T lnum) |
| 7 | 1741 { |
| 1742 int retval = TRUE; | |
| 1743 synstate_T *sp; | |
| 1744 | |
| 1745 /* | |
| 1746 * Check the state stack when: | |
| 1747 * - lnum is just below the previously syntaxed line. | |
| 1748 * - lnum is not before the lines with saved states. | |
| 1749 * - lnum is not past the lines with saved states. | |
| 1750 * - lnum is at or before the last changed line. | |
| 1751 */ | |
| 1752 if (VALID_STATE(¤t_state) && lnum == current_lnum + 1) | |
| 1753 { | |
| 1754 sp = syn_stack_find_entry(lnum); | |
| 1755 if (sp != NULL && sp->sst_lnum == lnum) | |
| 1756 { | |
| 1757 /* | |
| 1758 * finish the previous line (needed when not all of the line was | |
| 1759 * drawn) | |
| 1760 */ | |
| 1761 (void)syn_finish_line(FALSE); | |
| 1762 | |
| 1763 /* | |
| 1764 * Compare the current state with the previously saved state of | |
| 1765 * the line. | |
| 1766 */ | |
| 1767 if (syn_stack_equal(sp)) | |
| 1768 retval = FALSE; | |
| 1769 | |
| 1770 /* | |
| 1771 * Store the current state in b_sst_array[] for later use. | |
| 1772 */ | |
| 1773 ++current_lnum; | |
| 1512 | 1774 (void)store_current_state(); |
| 7 | 1775 } |
| 1776 } | |
| 1777 | |
| 1778 return retval; | |
| 1779 } | |
| 1780 | |
| 1781 /* | |
| 1782 * Finish the current line. | |
| 1783 * This doesn't return any attributes, it only gets the state at the end of | |
| 1784 * the line. It can start anywhere in the line, as long as the current state | |
| 1785 * is valid. | |
| 1786 */ | |
| 1787 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1788 syn_finish_line( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1789 int syncing) /* called for syncing */ |
| 7 | 1790 { |
| 1791 stateitem_T *cur_si; | |
| 442 | 1792 colnr_T prev_current_col; |
| 7 | 1793 |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1794 while (!current_finished) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1795 { |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1796 (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
|
1797 /* |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1798 * 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
|
1799 */ |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1800 if (syncing && current_state.ga_len) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1801 { |
| 7 | 1802 /* |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1803 * Check for match with sync item. |
| 7 | 1804 */ |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1805 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
|
1806 if (cur_si->si_idx >= 0 |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1807 && (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
|
1808 & (HL_SYNC_HERE|HL_SYNC_THERE))) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1809 return TRUE; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1810 |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1811 /* syn_current_attr() will have skipped the check for an item |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1812 * that ends here, need to do that now. Be careful not to go |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1813 * past the NUL. */ |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1814 prev_current_col = current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1815 if (syn_getcurline()[current_col] != NUL) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1816 ++current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1817 check_state_ends(); |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1818 current_col = prev_current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1819 } |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1820 ++current_col; |
| 7 | 1821 } |
| 1822 return FALSE; | |
| 1823 } | |
| 1824 | |
| 1825 /* | |
| 1826 * Return highlight attributes for next character. | |
| 1827 * Must first call syntax_start() once for the line. | |
| 1828 * "col" is normally 0 for the first use in a line, and increments by one each | |
| 1829 * time. It's allowed to skip characters and to stop before the end of the | |
| 1830 * line. But only a "col" after a previously used column is allowed. | |
| 221 | 1831 * When "can_spell" is not NULL set it to TRUE when spell-checking should be |
| 1832 * done. | |
| 7 | 1833 */ |
| 1834 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1835 get_syntax_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1836 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1837 int *can_spell, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1838 int keep_state) /* keep state of char at "col" */ |
| 7 | 1839 { |
| 1840 int attr = 0; | |
| 1841 | |
| 1363 | 1842 if (can_spell != NULL) |
| 1843 /* Default: Only do spelling when there is no @Spell cluster or when | |
| 1844 * ":syn spell toplevel" was used. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1845 *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
|
1846 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1847 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 1363 | 1848 |
| 7 | 1849 /* check for out of memory situation */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1850 if (syn_block->b_sst_array == NULL) |
| 7 | 1851 return 0; |
| 1852 | |
| 419 | 1853 /* After 'synmaxcol' the attribute is always zero. */ |
| 431 | 1854 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc) |
| 419 | 1855 { |
| 1856 clear_current_state(); | |
| 1857 #ifdef FEAT_EVAL | |
| 1858 current_id = 0; | |
| 1859 current_trans_id = 0; | |
| 1860 #endif | |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1861 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1862 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
|
1863 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
|
1864 #endif |
| 419 | 1865 return 0; |
| 1866 } | |
| 1867 | |
| 7 | 1868 /* Make sure current_state is valid */ |
| 1869 if (INVALID_STATE(¤t_state)) | |
| 1870 validate_current_state(); | |
| 1871 | |
| 1872 /* | |
| 1873 * Skip from the current column to "col", get the attributes for "col". | |
| 1874 */ | |
| 1875 while (current_col <= col) | |
| 1876 { | |
| 1504 | 1877 attr = syn_current_attr(FALSE, TRUE, can_spell, |
| 1878 current_col == col ? keep_state : FALSE); | |
| 7 | 1879 ++current_col; |
| 1880 } | |
| 1881 | |
| 1882 return attr; | |
| 1883 } | |
| 1884 | |
| 1885 /* | |
| 1886 * Get syntax attributes for current_lnum, current_col. | |
| 1887 */ | |
| 1888 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1889 syn_current_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1890 int syncing, /* When 1: called for syncing */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1891 int displaying, /* result will be displayed */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1892 int *can_spell, /* return: do spell checking */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1893 int keep_state) /* keep syntax stack afterwards */ |
| 7 | 1894 { |
| 1895 int syn_id; | |
| 1896 lpos_T endpos; /* was: char_u *endp; */ | |
| 1897 lpos_T hl_startpos; /* was: int hl_startcol; */ | |
| 1898 lpos_T hl_endpos; | |
| 1899 lpos_T eos_pos; /* end-of-start match (start region) */ | |
| 1900 lpos_T eoe_pos; /* end-of-end pattern */ | |
| 1901 int end_idx; /* group ID for end pattern */ | |
| 1902 int idx; | |
| 1903 synpat_T *spp; | |
| 221 | 1904 stateitem_T *cur_si, *sip = NULL; |
| 7 | 1905 int startcol; |
| 1906 int endcol; | |
| 1907 long flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1908 int cchar; |
| 7 | 1909 short *next_list; |
| 1910 int found_match; /* found usable match */ | |
| 1911 static int try_next_column = FALSE; /* must try in next col */ | |
| 1912 int do_keywords; | |
| 1913 regmmatch_T regmatch; | |
| 1914 lpos_T pos; | |
| 1915 int lc_col; | |
| 1916 reg_extmatch_T *cur_extmatch = NULL; | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1917 char_u buf_chartab[32]; /* chartab array for syn iskyeyword */ |
| 7 | 1918 char_u *line; /* current line. NOTE: becomes invalid after |
| 1919 looking for a pattern match! */ | |
| 1920 | |
| 1921 /* variables for zero-width matches that have a "nextgroup" argument */ | |
| 1922 int keep_next_list; | |
| 1923 int zero_width_next_list = FALSE; | |
| 1924 garray_T zero_width_next_ga; | |
| 1925 | |
| 1926 /* | |
| 1927 * No character, no attributes! Past end of line? | |
| 1928 * Do try matching with an empty line (could be the start of a region). | |
| 1929 */ | |
| 1930 line = syn_getcurline(); | |
| 1931 if (line[current_col] == NUL && current_col != 0) | |
| 1932 { | |
| 1933 /* | |
| 1934 * If we found a match after the last column, use it. | |
| 1935 */ | |
| 1936 if (next_match_idx >= 0 && next_match_col >= (int)current_col | |
| 1937 && next_match_col != MAXCOL) | |
| 1938 (void)push_next_match(NULL); | |
| 1939 | |
| 1940 current_finished = TRUE; | |
| 1941 current_state_stored = FALSE; | |
| 1942 return 0; | |
| 1943 } | |
| 1944 | |
| 1945 /* if the current or next character is NUL, we will finish the line now */ | |
| 1946 if (line[current_col] == NUL || line[current_col + 1] == NUL) | |
| 1947 { | |
| 1948 current_finished = TRUE; | |
| 1949 current_state_stored = FALSE; | |
| 1950 } | |
| 1951 | |
| 1952 /* | |
| 1953 * When in the previous column there was a match but it could not be used | |
| 1954 * (empty match or already matched in this column) need to try again in | |
| 1955 * the next column. | |
| 1956 */ | |
| 1957 if (try_next_column) | |
| 1958 { | |
| 1959 next_match_idx = -1; | |
| 1960 try_next_column = FALSE; | |
| 1961 } | |
| 1962 | |
| 1963 /* Only check for keywords when not syncing and there are some. */ | |
| 1964 do_keywords = !syncing | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1965 && (syn_block->b_keywtab.ht_used > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1966 || syn_block->b_keywtab_ic.ht_used > 0); |
| 7 | 1967 |
| 1968 /* Init the list of zero-width matches with a nextlist. This is used to | |
| 1969 * avoid matching the same item in the same position twice. */ | |
| 1970 ga_init2(&zero_width_next_ga, (int)sizeof(int), 10); | |
| 1971 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1972 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1973 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1974 |
| 7 | 1975 /* |
| 1976 * Repeat matching keywords and patterns, to find contained items at the | |
| 1977 * same column. This stops when there are no extra matches at the current | |
| 1978 * column. | |
| 1979 */ | |
| 1980 do | |
| 1981 { | |
| 1982 found_match = FALSE; | |
| 1983 keep_next_list = FALSE; | |
| 1984 syn_id = 0; | |
| 1985 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1986 |
| 7 | 1987 /* |
| 1988 * 1. Check for a current state. | |
| 1989 * Only when there is no current state, or if the current state may | |
| 1990 * contain other things, we need to check for keywords and patterns. | |
| 1991 * Always need to check for contained items if some item has the | |
| 1992 * "containedin" argument (takes extra time!). | |
| 1993 */ | |
| 1994 if (current_state.ga_len) | |
| 1995 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 1996 else | |
| 1997 cur_si = NULL; | |
| 1998 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1999 if (syn_block->b_syn_containedin || cur_si == NULL |
| 7 | 2000 || cur_si->si_cont_list != NULL) |
| 2001 { | |
| 2002 /* | |
| 2003 * 2. Check for keywords, if on a keyword char after a non-keyword | |
| 2004 * char. Don't do this when syncing. | |
| 2005 */ | |
| 2006 if (do_keywords) | |
| 2007 { | |
| 2008 line = syn_getcurline(); | |
| 4043 | 2009 if (vim_iswordp_buf(line + current_col, syn_buf) |
| 7 | 2010 && (current_col == 0 |
| 4043 | 2011 || !vim_iswordp_buf(line + current_col - 1 |
| 7 | 2012 #ifdef FEAT_MBYTE |
| 2013 - (has_mbyte | |
| 2014 ? (*mb_head_off)(line, line + current_col - 1) | |
| 2015 : 0) | |
| 2016 #endif | |
| 2017 , syn_buf))) | |
| 2018 { | |
| 2019 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
|
2020 &endcol, &flags, &next_list, cur_si, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2021 &cchar); |
| 205 | 2022 if (syn_id != 0) |
| 7 | 2023 { |
| 2024 if (push_current_state(KEYWORD_IDX) == OK) | |
| 2025 { | |
| 2026 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2027 cur_si->si_m_startcol = current_col; | |
| 2028 cur_si->si_h_startpos.lnum = current_lnum; | |
| 2029 cur_si->si_h_startpos.col = 0; /* starts right away */ | |
| 2030 cur_si->si_m_endpos.lnum = current_lnum; | |
| 2031 cur_si->si_m_endpos.col = endcol; | |
| 2032 cur_si->si_h_endpos.lnum = current_lnum; | |
| 2033 cur_si->si_h_endpos.col = endcol; | |
| 2034 cur_si->si_ends = TRUE; | |
| 2035 cur_si->si_end_idx = 0; | |
| 2036 cur_si->si_flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2037 #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
|
2038 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
|
2039 cur_si->si_cchar = cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2040 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2041 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2042 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
|
2043 & HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2044 #endif |
| 7 | 2045 cur_si->si_id = syn_id; |
| 2046 cur_si->si_trans_id = syn_id; | |
| 2047 if (flags & HL_TRANSP) | |
| 2048 { | |
| 2049 if (current_state.ga_len < 2) | |
| 2050 { | |
| 2051 cur_si->si_attr = 0; | |
| 2052 cur_si->si_trans_id = 0; | |
| 2053 } | |
| 2054 else | |
| 2055 { | |
| 2056 cur_si->si_attr = CUR_STATE( | |
| 2057 current_state.ga_len - 2).si_attr; | |
| 2058 cur_si->si_trans_id = CUR_STATE( | |
| 2059 current_state.ga_len - 2).si_trans_id; | |
| 2060 } | |
| 2061 } | |
| 2062 else | |
| 2063 cur_si->si_attr = syn_id2attr(syn_id); | |
| 2064 cur_si->si_cont_list = NULL; | |
| 2065 cur_si->si_next_list = next_list; | |
| 2066 check_keepend(); | |
| 2067 } | |
| 2068 else | |
| 2069 vim_free(next_list); | |
| 2070 } | |
| 2071 } | |
| 2072 } | |
| 2073 | |
| 2074 /* | |
| 205 | 2075 * 3. Check for patterns (only if no keyword found). |
| 7 | 2076 */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2077 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len) |
| 7 | 2078 { |
| 2079 /* | |
| 2080 * If we didn't check for a match yet, or we are past it, check | |
| 2081 * for any match with a pattern. | |
| 2082 */ | |
| 2083 if (next_match_idx < 0 || next_match_col < (int)current_col) | |
| 2084 { | |
| 2085 /* | |
| 2086 * Check all relevant patterns for a match at this | |
| 2087 * position. This is complicated, because matching with a | |
| 2088 * pattern takes quite a bit of time, thus we want to | |
| 2089 * avoid doing it when it's not needed. | |
| 2090 */ | |
| 2091 next_match_idx = 0; /* no match in this line yet */ | |
| 2092 next_match_col = MAXCOL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2093 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; ) |
| 7 | 2094 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2095 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2096 if ( spp->sp_syncing == syncing |
| 2097 && (displaying || !(spp->sp_flags & HL_DISPLAY)) | |
| 2098 && (spp->sp_type == SPTYPE_MATCH | |
| 2099 || spp->sp_type == SPTYPE_START) | |
| 2100 && (current_next_list != NULL | |
| 2101 ? in_id_list(NULL, current_next_list, | |
| 2102 &spp->sp_syn, 0) | |
| 2103 : (cur_si == NULL | |
| 2104 ? !(spp->sp_flags & HL_CONTAINED) | |
| 2105 : in_id_list(cur_si, | |
| 2106 cur_si->si_cont_list, &spp->sp_syn, | |
| 2107 spp->sp_flags & HL_CONTAINED)))) | |
| 2108 { | |
| 6375 | 2109 int r; |
| 2110 | |
| 7 | 2111 /* If we already tried matching in this line, and |
| 2112 * there isn't a match before next_match_col, skip | |
| 2113 * this item. */ | |
| 2114 if (spp->sp_line_id == current_line_id | |
| 2115 && spp->sp_startcol >= next_match_col) | |
| 2116 continue; | |
| 2117 spp->sp_line_id = current_line_id; | |
| 2118 | |
| 2119 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF]; | |
| 2120 if (lc_col < 0) | |
| 2121 lc_col = 0; | |
| 2122 | |
| 2123 regmatch.rmm_ic = spp->sp_ic; | |
| 2124 regmatch.regprog = spp->sp_prog; | |
| 6375 | 2125 r = syn_regexec(®match, |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2126 current_lnum, |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2127 (colnr_T)lc_col, |
| 6375 | 2128 IF_SYN_TIME(&spp->sp_time)); |
| 2129 spp->sp_prog = regmatch.regprog; | |
| 2130 if (!r) | |
| 7 | 2131 { |
| 2132 /* no match in this line, try another one */ | |
| 2133 spp->sp_startcol = MAXCOL; | |
| 2134 continue; | |
| 2135 } | |
| 2136 | |
| 2137 /* | |
| 2138 * Compute the first column of the match. | |
| 2139 */ | |
| 2140 syn_add_start_off(&pos, ®match, | |
| 2141 spp, SPO_MS_OFF, -1); | |
| 2142 if (pos.lnum > current_lnum) | |
| 2143 { | |
| 2144 /* must have used end of match in a next line, | |
| 2145 * we can't handle that */ | |
| 2146 spp->sp_startcol = MAXCOL; | |
| 2147 continue; | |
| 2148 } | |
| 2149 startcol = pos.col; | |
| 2150 | |
| 2151 /* remember the next column where this pattern | |
| 2152 * matches in the current line */ | |
| 2153 spp->sp_startcol = startcol; | |
| 2154 | |
| 2155 /* | |
| 2156 * If a previously found match starts at a lower | |
| 2157 * column number, don't use this one. | |
| 2158 */ | |
| 2159 if (startcol >= next_match_col) | |
| 2160 continue; | |
| 2161 | |
| 2162 /* | |
| 2163 * If we matched this pattern at this position | |
| 2164 * before, skip it. Must retry in the next | |
| 2165 * column, because it may match from there. | |
| 2166 */ | |
| 2167 if (did_match_already(idx, &zero_width_next_ga)) | |
| 2168 { | |
| 2169 try_next_column = TRUE; | |
| 2170 continue; | |
| 2171 } | |
| 2172 | |
| 2173 endpos.lnum = regmatch.endpos[0].lnum; | |
| 2174 endpos.col = regmatch.endpos[0].col; | |
| 2175 | |
| 2176 /* Compute the highlight start. */ | |
| 2177 syn_add_start_off(&hl_startpos, ®match, | |
| 2178 spp, SPO_HS_OFF, -1); | |
| 2179 | |
| 2180 /* Compute the region start. */ | |
| 2181 /* Default is to use the end of the match. */ | |
| 2182 syn_add_end_off(&eos_pos, ®match, | |
| 2183 spp, SPO_RS_OFF, 0); | |
| 2184 | |
| 2185 /* | |
| 2186 * Grab the external submatches before they get | |
| 2187 * overwritten. Reference count doesn't change. | |
| 2188 */ | |
| 2189 unref_extmatch(cur_extmatch); | |
| 2190 cur_extmatch = re_extmatch_out; | |
| 2191 re_extmatch_out = NULL; | |
| 2192 | |
| 2193 flags = 0; | |
| 2194 eoe_pos.lnum = 0; /* avoid warning */ | |
| 2195 eoe_pos.col = 0; | |
| 2196 end_idx = 0; | |
| 2197 hl_endpos.lnum = 0; | |
| 2198 | |
| 2199 /* | |
| 2200 * For a "oneline" the end must be found in the | |
| 2201 * same line too. Search for it after the end of | |
| 2202 * the match with the start pattern. Set the | |
| 2203 * resulting end positions at the same time. | |
| 2204 */ | |
| 2205 if (spp->sp_type == SPTYPE_START | |
| 2206 && (spp->sp_flags & HL_ONELINE)) | |
| 2207 { | |
| 2208 lpos_T startpos; | |
| 2209 | |
| 2210 startpos = endpos; | |
| 2211 find_endpos(idx, &startpos, &endpos, &hl_endpos, | |
| 2212 &flags, &eoe_pos, &end_idx, cur_extmatch); | |
| 2213 if (endpos.lnum == 0) | |
| 2214 continue; /* not found */ | |
| 2215 } | |
| 2216 | |
| 2217 /* | |
| 2218 * For a "match" the size must be > 0 after the | |
| 2219 * end offset needs has been added. Except when | |
| 2220 * syncing. | |
| 2221 */ | |
| 2222 else if (spp->sp_type == SPTYPE_MATCH) | |
| 2223 { | |
| 2224 syn_add_end_off(&hl_endpos, ®match, spp, | |
| 2225 SPO_HE_OFF, 0); | |
| 2226 syn_add_end_off(&endpos, ®match, spp, | |
| 2227 SPO_ME_OFF, 0); | |
| 2228 if (endpos.lnum == current_lnum | |
| 2229 && (int)endpos.col + syncing < startcol) | |
| 2230 { | |
| 2231 /* | |
| 2232 * If an empty string is matched, may need | |
| 2233 * to try matching again at next column. | |
| 2234 */ | |
| 2235 if (regmatch.startpos[0].col | |
| 2236 == regmatch.endpos[0].col) | |
| 2237 try_next_column = TRUE; | |
| 2238 continue; | |
| 2239 } | |
| 2240 } | |
| 2241 | |
| 2242 /* | |
| 2243 * keep the best match so far in next_match_* | |
| 2244 */ | |
| 2245 /* Highlighting must start after startpos and end | |
| 2246 * before endpos. */ | |
| 2247 if (hl_startpos.lnum == current_lnum | |
| 2248 && (int)hl_startpos.col < startcol) | |
| 2249 hl_startpos.col = startcol; | |
| 2250 limit_pos_zero(&hl_endpos, &endpos); | |
| 2251 | |
| 2252 next_match_idx = idx; | |
| 2253 next_match_col = startcol; | |
| 2254 next_match_m_endpos = endpos; | |
| 2255 next_match_h_endpos = hl_endpos; | |
| 2256 next_match_h_startpos = hl_startpos; | |
| 2257 next_match_flags = flags; | |
| 2258 next_match_eos_pos = eos_pos; | |
| 2259 next_match_eoe_pos = eoe_pos; | |
| 2260 next_match_end_idx = end_idx; | |
| 2261 unref_extmatch(next_match_extmatch); | |
| 2262 next_match_extmatch = cur_extmatch; | |
| 2263 cur_extmatch = NULL; | |
| 2264 } | |
| 2265 } | |
| 2266 } | |
| 2267 | |
| 2268 /* | |
| 2269 * If we found a match at the current column, use it. | |
| 2270 */ | |
| 2271 if (next_match_idx >= 0 && next_match_col == (int)current_col) | |
| 2272 { | |
| 2273 synpat_T *lspp; | |
| 2274 | |
| 2275 /* When a zero-width item matched which has a nextgroup, | |
| 2276 * 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
|
2277 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2278 if (next_match_m_endpos.lnum == current_lnum |
| 2279 && next_match_m_endpos.col == current_col | |
| 2280 && lspp->sp_next_list != NULL) | |
| 2281 { | |
| 2282 current_next_list = lspp->sp_next_list; | |
| 2283 current_next_flags = lspp->sp_flags; | |
| 2284 keep_next_list = TRUE; | |
| 2285 zero_width_next_list = TRUE; | |
| 2286 | |
| 2287 /* Add the index to a list, so that we can check | |
| 2288 * later that we don't match it again (and cause an | |
| 2289 * endless loop). */ | |
| 2290 if (ga_grow(&zero_width_next_ga, 1) == OK) | |
| 2291 { | |
| 2292 ((int *)(zero_width_next_ga.ga_data)) | |
| 2293 [zero_width_next_ga.ga_len++] = next_match_idx; | |
| 2294 } | |
| 2295 next_match_idx = -1; | |
| 2296 } | |
| 2297 else | |
| 2298 cur_si = push_next_match(cur_si); | |
| 2299 found_match = TRUE; | |
| 2300 } | |
| 2301 } | |
| 2302 } | |
| 2303 | |
| 2304 /* | |
| 2305 * Handle searching for nextgroup match. | |
| 2306 */ | |
| 2307 if (current_next_list != NULL && !keep_next_list) | |
| 2308 { | |
| 2309 /* | |
| 2310 * If a nextgroup was not found, continue looking for one if: | |
| 2311 * - this is an empty line and the "skipempty" option was given | |
| 2312 * - we are on white space and the "skipwhite" option was given | |
| 2313 */ | |
| 2314 if (!found_match) | |
| 2315 { | |
| 2316 line = syn_getcurline(); | |
| 2317 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
|
2318 && VIM_ISWHITE(line[current_col])) |
| 7 | 2319 || ((current_next_flags & HL_SKIPEMPTY) |
| 2320 && *line == NUL)) | |
| 2321 break; | |
| 2322 } | |
| 2323 | |
| 2324 /* | |
| 2325 * If a nextgroup was found: Use it, and continue looking for | |
| 2326 * contained matches. | |
| 2327 * If a nextgroup was not found: Continue looking for a normal | |
| 2328 * match. | |
| 2329 * When did set current_next_list for a zero-width item and no | |
| 2330 * match was found don't loop (would get stuck). | |
| 2331 */ | |
| 2332 current_next_list = NULL; | |
| 2333 next_match_idx = -1; | |
| 2334 if (!zero_width_next_list) | |
| 2335 found_match = TRUE; | |
| 2336 } | |
| 2337 | |
| 2338 } while (found_match); | |
| 2339 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2340 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2341 |
| 7 | 2342 /* |
| 2343 * Use attributes from the current state, if within its highlighting. | |
| 2344 * If not, use attributes from the current-but-one state, etc. | |
| 2345 */ | |
| 2346 current_attr = 0; | |
| 2347 #ifdef FEAT_EVAL | |
| 2348 current_id = 0; | |
| 2349 current_trans_id = 0; | |
| 2350 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2351 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2352 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
|
2353 current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2354 #endif |
| 7 | 2355 if (cur_si != NULL) |
| 2356 { | |
| 221 | 2357 #ifndef FEAT_EVAL |
| 2358 int current_trans_id = 0; | |
| 2359 #endif | |
| 7 | 2360 for (idx = current_state.ga_len - 1; idx >= 0; --idx) |
| 2361 { | |
| 2362 sip = &CUR_STATE(idx); | |
| 2363 if ((current_lnum > sip->si_h_startpos.lnum | |
| 2364 || (current_lnum == sip->si_h_startpos.lnum | |
| 2365 && current_col >= sip->si_h_startpos.col)) | |
| 2366 && (sip->si_h_endpos.lnum == 0 | |
| 2367 || current_lnum < sip->si_h_endpos.lnum | |
| 2368 || (current_lnum == sip->si_h_endpos.lnum | |
| 2369 && current_col < sip->si_h_endpos.col))) | |
| 2370 { | |
| 2371 current_attr = sip->si_attr; | |
| 2372 #ifdef FEAT_EVAL | |
| 2373 current_id = sip->si_id; | |
| 221 | 2374 #endif |
| 7 | 2375 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
|
2376 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2377 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
|
2378 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
|
2379 current_sub_char = sip->si_cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2380 #endif |
| 7 | 2381 break; |
| 2382 } | |
| 2383 } | |
| 2384 | |
| 221 | 2385 if (can_spell != NULL) |
| 2386 { | |
| 2387 struct sp_syn sps; | |
| 2388 | |
| 2389 /* | |
| 2390 * set "can_spell" to TRUE if spell checking is supposed to be | |
| 2391 * done in the current item. | |
| 2392 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2393 if (syn_block->b_spell_cluster_id == 0) |
| 227 | 2394 { |
| 320 | 2395 /* There is no @Spell cluster: Do spelling for items without |
| 2396 * @NoSpell cluster. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2397 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
|
2398 || current_trans_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2399 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP); |
| 227 | 2400 else |
| 2401 { | |
| 2402 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2403 sps.id = syn_block->b_nospell_cluster_id; |
| 227 | 2404 sps.cont_in_list = NULL; |
| 2405 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2406 } | |
| 2407 } | |
| 221 | 2408 else |
| 2409 { | |
| 320 | 2410 /* The @Spell cluster is defined: Do spelling in items with |
| 419 | 2411 * the @Spell cluster. But not when @NoSpell is also there. |
| 2412 * At the toplevel only spell check when ":syn spell toplevel" | |
| 2413 * was used. */ | |
| 320 | 2414 if (current_trans_id == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2415 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP); |
| 320 | 2416 else |
| 2417 { | |
| 2418 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2419 sps.id = syn_block->b_spell_cluster_id; |
| 320 | 2420 sps.cont_in_list = NULL; |
| 2421 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2422 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2423 if (syn_block->b_nospell_cluster_id != 0) |
| 320 | 2424 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2425 sps.id = syn_block->b_nospell_cluster_id; |
| 320 | 2426 if (in_id_list(sip, sip->si_cont_list, &sps, 0)) |
| 2427 *can_spell = FALSE; | |
| 2428 } | |
| 2429 } | |
| 221 | 2430 } |
| 2431 } | |
| 2432 | |
| 2433 | |
| 7 | 2434 /* |
| 2435 * Check for end of current state (and the states before it) at the | |
| 2436 * next column. Don't do this for syncing, because we would miss a | |
| 2437 * single character match. | |
| 2438 * First check if the current state ends at the current column. It | |
| 2439 * may be for an empty match and a containing item might end in the | |
| 2440 * current column. | |
| 2441 */ | |
| 1504 | 2442 if (!syncing && !keep_state) |
| 7 | 2443 { |
| 2444 check_state_ends(); | |
| 442 | 2445 if (current_state.ga_len > 0 |
| 2446 && syn_getcurline()[current_col] != NUL) | |
| 7 | 2447 { |
| 2448 ++current_col; | |
| 2449 check_state_ends(); | |
| 2450 --current_col; | |
| 2451 } | |
| 2452 } | |
| 2453 } | |
| 221 | 2454 else if (can_spell != NULL) |
| 419 | 2455 /* Default: Only do spelling when there is no @Spell cluster or when |
| 2456 * ":syn spell toplevel" was used. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2457 *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
|
2458 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2459 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 7 | 2460 |
| 2020 | 2461 /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */ |
| 7 | 2462 if (current_next_list != NULL |
| 2463 && syn_getcurline()[current_col + 1] == NUL | |
| 2464 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) | |
| 2465 current_next_list = NULL; | |
| 2466 | |
| 2467 if (zero_width_next_ga.ga_len > 0) | |
| 2468 ga_clear(&zero_width_next_ga); | |
| 2469 | |
| 2470 /* No longer need external matches. But keep next_match_extmatch. */ | |
| 2471 unref_extmatch(re_extmatch_out); | |
| 2472 re_extmatch_out = NULL; | |
| 2473 unref_extmatch(cur_extmatch); | |
| 2474 | |
| 2475 return current_attr; | |
| 2476 } | |
| 2477 | |
| 2478 | |
| 2479 /* | |
| 2480 * Check if we already matched pattern "idx" at the current column. | |
| 2481 */ | |
| 2482 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2483 did_match_already(int idx, garray_T *gap) |
| 7 | 2484 { |
| 2485 int i; | |
| 2486 | |
| 2487 for (i = current_state.ga_len; --i >= 0; ) | |
| 2488 if (CUR_STATE(i).si_m_startcol == (int)current_col | |
| 2489 && CUR_STATE(i).si_m_lnum == (int)current_lnum | |
| 2490 && CUR_STATE(i).si_idx == idx) | |
| 2491 return TRUE; | |
| 2492 | |
| 2493 /* Zero-width matches with a nextgroup argument are not put on the syntax | |
| 2494 * stack, and can only be matched once anyway. */ | |
| 2495 for (i = gap->ga_len; --i >= 0; ) | |
| 2496 if (((int *)(gap->ga_data))[i] == idx) | |
| 2497 return TRUE; | |
| 2498 | |
| 2499 return FALSE; | |
| 2500 } | |
| 2501 | |
| 2502 /* | |
| 2503 * Push the next match onto the stack. | |
| 2504 */ | |
| 2505 static stateitem_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2506 push_next_match(stateitem_T *cur_si) |
| 7 | 2507 { |
| 2508 synpat_T *spp; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2509 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2510 int save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2511 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2512 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2513 spp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2514 |
| 2515 /* | |
| 2516 * Push the item in current_state stack; | |
| 2517 */ | |
| 2518 if (push_current_state(next_match_idx) == OK) | |
| 2519 { | |
| 2520 /* | |
| 2521 * If it's a start-skip-end type that crosses lines, figure out how | |
| 2522 * much it continues in this line. Otherwise just fill in the length. | |
| 2523 */ | |
| 2524 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2525 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2526 cur_si->si_m_startcol = current_col; | |
| 2527 cur_si->si_m_lnum = current_lnum; | |
| 2528 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
|
2529 #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
|
2530 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
|
2531 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
|
2532 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2533 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2534 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
|
2535 #endif |
| 7 | 2536 cur_si->si_next_list = spp->sp_next_list; |
| 2537 cur_si->si_extmatch = ref_extmatch(next_match_extmatch); | |
| 2538 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE)) | |
| 2539 { | |
| 2540 /* Try to find the end pattern in the current line */ | |
| 2541 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE); | |
| 2542 check_keepend(); | |
| 2543 } | |
| 2544 else | |
| 2545 { | |
| 2546 cur_si->si_m_endpos = next_match_m_endpos; | |
| 2547 cur_si->si_h_endpos = next_match_h_endpos; | |
| 2548 cur_si->si_ends = TRUE; | |
| 2549 cur_si->si_flags |= next_match_flags; | |
| 2550 cur_si->si_eoe_pos = next_match_eoe_pos; | |
| 2551 cur_si->si_end_idx = next_match_end_idx; | |
| 2552 } | |
| 2553 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND)) | |
| 2554 keepend_level = current_state.ga_len - 1; | |
| 2555 check_keepend(); | |
| 2556 update_si_attr(current_state.ga_len - 1); | |
| 2557 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2558 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2559 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
|
2560 #endif |
| 7 | 2561 /* |
| 2562 * If the start pattern has another highlight group, push another item | |
| 2563 * on the stack for the start pattern. | |
| 2564 */ | |
| 2565 if ( spp->sp_type == SPTYPE_START | |
| 2566 && spp->sp_syn_match_id != 0 | |
| 2567 && push_current_state(next_match_idx) == OK) | |
| 2568 { | |
| 2569 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2570 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2571 cur_si->si_m_startcol = current_col; | |
| 2572 cur_si->si_m_lnum = current_lnum; | |
| 2573 cur_si->si_m_endpos = next_match_eos_pos; | |
| 2574 cur_si->si_h_endpos = next_match_eos_pos; | |
| 2575 cur_si->si_ends = TRUE; | |
| 2576 cur_si->si_end_idx = 0; | |
| 2577 cur_si->si_flags = HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2578 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2579 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2580 cur_si->si_flags |= save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2581 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2582 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2583 #endif |
| 7 | 2584 cur_si->si_next_list = NULL; |
| 2585 check_keepend(); | |
| 2586 update_si_attr(current_state.ga_len - 1); | |
| 2587 } | |
| 2588 } | |
| 2589 | |
| 2590 next_match_idx = -1; /* try other match next time */ | |
| 2591 | |
| 2592 return cur_si; | |
| 2593 } | |
| 2594 | |
| 2595 /* | |
| 2596 * Check for end of current state (and the states before it). | |
| 2597 */ | |
| 2598 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2599 check_state_ends(void) |
| 7 | 2600 { |
| 2601 stateitem_T *cur_si; | |
| 2863 | 2602 int had_extend; |
| 7 | 2603 |
| 2604 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2605 for (;;) | |
| 2606 { | |
| 2607 if (cur_si->si_ends | |
| 2608 && (cur_si->si_m_endpos.lnum < current_lnum | |
| 2609 || (cur_si->si_m_endpos.lnum == current_lnum | |
| 2610 && cur_si->si_m_endpos.col <= current_col))) | |
| 2611 { | |
| 2612 /* | |
| 2613 * If there is an end pattern group ID, highlight the end pattern | |
| 2614 * now. No need to pop the current item from the stack. | |
| 2615 * Only do this if the end pattern continues beyond the current | |
| 2616 * position. | |
| 2617 */ | |
| 2618 if (cur_si->si_end_idx | |
| 2619 && (cur_si->si_eoe_pos.lnum > current_lnum | |
| 2620 || (cur_si->si_eoe_pos.lnum == current_lnum | |
| 2621 && cur_si->si_eoe_pos.col > current_col))) | |
| 2622 { | |
| 2623 cur_si->si_idx = cur_si->si_end_idx; | |
| 2624 cur_si->si_end_idx = 0; | |
| 2625 cur_si->si_m_endpos = cur_si->si_eoe_pos; | |
| 2626 cur_si->si_h_endpos = cur_si->si_eoe_pos; | |
| 2627 cur_si->si_flags |= HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2628 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2629 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2630 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2631 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2632 #endif |
| 7 | 2633 update_si_attr(current_state.ga_len - 1); |
| 36 | 2634 |
| 2831 | 2635 /* nextgroup= should not match in the end pattern */ |
| 2636 current_next_list = NULL; | |
| 2637 | |
| 36 | 2638 /* what matches next may be different now, clear it */ |
| 2639 next_match_idx = 0; | |
| 2640 next_match_col = MAXCOL; | |
| 7 | 2641 break; |
| 2642 } | |
| 2643 else | |
| 2644 { | |
| 2645 /* handle next_list, unless at end of line and no "skipnl" or | |
| 2646 * "skipempty" */ | |
| 2647 current_next_list = cur_si->si_next_list; | |
| 2648 current_next_flags = cur_si->si_flags; | |
| 2649 if (!(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)) | |
| 2650 && syn_getcurline()[current_col] == NUL) | |
| 2651 current_next_list = NULL; | |
| 2652 | |
| 2653 /* When the ended item has "extend", another item with | |
| 2654 * "keepend" now needs to check for its end. */ | |
| 2863 | 2655 had_extend = (cur_si->si_flags & HL_EXTEND); |
| 7 | 2656 |
| 2657 pop_current_state(); | |
| 2658 | |
| 2659 if (current_state.ga_len == 0) | |
| 2660 break; | |
| 2661 | |
| 1503 | 2662 if (had_extend && keepend_level >= 0) |
| 7 | 2663 { |
| 2664 syn_update_ends(FALSE); | |
| 2665 if (current_state.ga_len == 0) | |
| 2666 break; | |
| 2667 } | |
| 2668 | |
| 2669 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2670 | |
| 2671 /* | |
| 2672 * Only for a region the search for the end continues after | |
| 2673 * the end of the contained item. If the contained match | |
| 2674 * included the end-of-line, break here, the region continues. | |
| 2675 * Don't do this when: | |
| 2676 * - "keepend" is used for the contained item | |
| 2677 * - not at the end of the line (could be end="x$"me=e-1). | |
| 2678 * - "excludenl" is used (HL_HAS_EOL won't be set) | |
| 2679 */ | |
| 2680 if (cur_si->si_idx >= 0 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2681 && SYN_ITEMS(syn_block)[cur_si->si_idx].sp_type |
| 7 | 2682 == SPTYPE_START |
| 2683 && !(cur_si->si_flags & (HL_MATCH | HL_KEEPEND))) | |
| 2684 { | |
| 2685 update_si_end(cur_si, (int)current_col, TRUE); | |
| 2686 check_keepend(); | |
| 2687 if ((current_next_flags & HL_HAS_EOL) | |
| 2688 && keepend_level < 0 | |
| 2689 && syn_getcurline()[current_col] == NUL) | |
| 2690 break; | |
| 2691 } | |
| 2692 } | |
| 2693 } | |
| 2694 else | |
| 2695 break; | |
| 2696 } | |
| 2697 } | |
| 2698 | |
| 2699 /* | |
| 2700 * Update an entry in the current_state stack for a match or region. This | |
| 2701 * fills in si_attr, si_next_list and si_cont_list. | |
| 2702 */ | |
| 2703 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2704 update_si_attr(int idx) |
| 7 | 2705 { |
| 2706 stateitem_T *sip = &CUR_STATE(idx); | |
| 2707 synpat_T *spp; | |
| 2708 | |
| 1371 | 2709 /* This should not happen... */ |
| 2710 if (sip->si_idx < 0) | |
| 2711 return; | |
| 2712 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2713 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]); |
| 7 | 2714 if (sip->si_flags & HL_MATCH) |
| 2715 sip->si_id = spp->sp_syn_match_id; | |
| 2716 else | |
| 2717 sip->si_id = spp->sp_syn.id; | |
| 2718 sip->si_attr = syn_id2attr(sip->si_id); | |
| 2719 sip->si_trans_id = sip->si_id; | |
| 2720 if (sip->si_flags & HL_MATCH) | |
| 2721 sip->si_cont_list = NULL; | |
| 2722 else | |
| 2723 sip->si_cont_list = spp->sp_cont_list; | |
| 2724 | |
| 2725 /* | |
| 2726 * For transparent items, take attr from outer item. | |
| 2727 * Also take cont_list, if there is none. | |
| 2728 * Don't do this for the matchgroup of a start or end pattern. | |
| 2729 */ | |
| 2730 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH)) | |
| 2731 { | |
| 2732 if (idx == 0) | |
| 2733 { | |
| 2734 sip->si_attr = 0; | |
| 2735 sip->si_trans_id = 0; | |
| 2736 if (sip->si_cont_list == NULL) | |
| 2737 sip->si_cont_list = ID_LIST_ALL; | |
| 2738 } | |
| 2739 else | |
| 2740 { | |
| 2741 sip->si_attr = CUR_STATE(idx - 1).si_attr; | |
| 2742 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id; | |
| 36 | 2743 sip->si_h_startpos = CUR_STATE(idx - 1).si_h_startpos; |
| 2744 sip->si_h_endpos = CUR_STATE(idx - 1).si_h_endpos; | |
| 7 | 2745 if (sip->si_cont_list == NULL) |
| 2746 { | |
| 2747 sip->si_flags |= HL_TRANS_CONT; | |
| 2748 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list; | |
| 2749 } | |
| 2750 } | |
| 2751 } | |
| 2752 } | |
| 2753 | |
| 2754 /* | |
| 2755 * Check the current stack for patterns with "keepend" flag. | |
| 2756 * Propagate the match-end to contained items, until a "skipend" item is found. | |
| 2757 */ | |
| 2758 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2759 check_keepend(void) |
| 7 | 2760 { |
| 2761 int i; | |
| 2762 lpos_T maxpos; | |
| 991 | 2763 lpos_T maxpos_h; |
| 7 | 2764 stateitem_T *sip; |
| 2765 | |
| 2766 /* | |
| 2767 * This check can consume a lot of time; only do it from the level where | |
| 2768 * there really is a keepend. | |
| 2769 */ | |
| 2770 if (keepend_level < 0) | |
| 2771 return; | |
| 2772 | |
| 2773 /* | |
| 2774 * Find the last index of an "extend" item. "keepend" items before that | |
| 2775 * won't do anything. If there is no "extend" item "i" will be | |
| 2776 * "keepend_level" and all "keepend" items will work normally. | |
| 2777 */ | |
| 2778 for (i = current_state.ga_len - 1; i > keepend_level; --i) | |
| 2779 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 2780 break; | |
| 2781 | |
| 2782 maxpos.lnum = 0; | |
| 1702 | 2783 maxpos.col = 0; |
| 991 | 2784 maxpos_h.lnum = 0; |
| 1702 | 2785 maxpos_h.col = 0; |
| 7 | 2786 for ( ; i < current_state.ga_len; ++i) |
| 2787 { | |
| 2788 sip = &CUR_STATE(i); | |
| 2789 if (maxpos.lnum != 0) | |
| 2790 { | |
| 2791 limit_pos_zero(&sip->si_m_endpos, &maxpos); | |
| 991 | 2792 limit_pos_zero(&sip->si_h_endpos, &maxpos_h); |
| 7 | 2793 limit_pos_zero(&sip->si_eoe_pos, &maxpos); |
| 2794 sip->si_ends = TRUE; | |
| 2795 } | |
| 991 | 2796 if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) |
| 2797 { | |
| 2798 if (maxpos.lnum == 0 | |
| 7 | 2799 || maxpos.lnum > sip->si_m_endpos.lnum |
| 2800 || (maxpos.lnum == sip->si_m_endpos.lnum | |
| 991 | 2801 && maxpos.col > sip->si_m_endpos.col)) |
| 2802 maxpos = sip->si_m_endpos; | |
| 2803 if (maxpos_h.lnum == 0 | |
| 2804 || maxpos_h.lnum > sip->si_h_endpos.lnum | |
| 2805 || (maxpos_h.lnum == sip->si_h_endpos.lnum | |
| 2806 && maxpos_h.col > sip->si_h_endpos.col)) | |
| 2807 maxpos_h = sip->si_h_endpos; | |
| 2808 } | |
| 7 | 2809 } |
| 2810 } | |
| 2811 | |
| 2812 /* | |
| 2813 * Update an entry in the current_state stack for a start-skip-end pattern. | |
| 2814 * This finds the end of the current item, if it's in the current line. | |
| 2815 * | |
| 2816 * Return the flags for the matched END. | |
| 2817 */ | |
| 2818 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2819 update_si_end( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2820 stateitem_T *sip, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2821 int startcol, /* where to start searching for the end */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2822 int force) /* when TRUE overrule a previous end */ |
| 7 | 2823 { |
| 2824 lpos_T startpos; | |
| 2825 lpos_T endpos; | |
| 2826 lpos_T hl_endpos; | |
| 2827 lpos_T end_endpos; | |
| 2828 int end_idx; | |
| 2829 | |
| 1371 | 2830 /* return quickly for a keyword */ |
| 2831 if (sip->si_idx < 0) | |
| 2832 return; | |
| 2833 | |
| 7 | 2834 /* Don't update when it's already done. Can be a match of an end pattern |
| 2835 * that started in a previous line. Watch out: can also be a "keepend" | |
| 2836 * from a containing item. */ | |
| 2837 if (!force && sip->si_m_endpos.lnum >= current_lnum) | |
| 2838 return; | |
| 2839 | |
| 2840 /* | |
| 2841 * We need to find the end of the region. It may continue in the next | |
| 2842 * line. | |
| 2843 */ | |
| 2844 end_idx = 0; | |
| 2845 startpos.lnum = current_lnum; | |
| 2846 startpos.col = startcol; | |
| 2847 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos, | |
| 2848 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch); | |
| 2849 | |
| 2850 if (endpos.lnum == 0) | |
| 2851 { | |
| 2852 /* No end pattern matched. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2853 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) |
| 7 | 2854 { |
| 2855 /* a "oneline" never continues in the next line */ | |
| 2856 sip->si_ends = TRUE; | |
| 2857 sip->si_m_endpos.lnum = current_lnum; | |
| 2858 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline()); | |
| 2859 } | |
| 2860 else | |
| 2861 { | |
| 2862 /* continues in the next line */ | |
| 2863 sip->si_ends = FALSE; | |
| 2864 sip->si_m_endpos.lnum = 0; | |
| 2865 } | |
| 2866 sip->si_h_endpos = sip->si_m_endpos; | |
| 2867 } | |
| 2868 else | |
| 2869 { | |
| 2870 /* match within this line */ | |
| 2871 sip->si_m_endpos = endpos; | |
| 2872 sip->si_h_endpos = hl_endpos; | |
| 2873 sip->si_eoe_pos = end_endpos; | |
| 2874 sip->si_ends = TRUE; | |
| 2875 sip->si_end_idx = end_idx; | |
| 2876 } | |
| 2877 } | |
| 2878 | |
| 2879 /* | |
| 2880 * Add a new state to the current state stack. | |
| 2881 * It is cleared and the index set to "idx". | |
| 2882 * Return FAIL if it's not possible (out of memory). | |
| 2883 */ | |
| 2884 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2885 push_current_state(int idx) |
| 7 | 2886 { |
| 2887 if (ga_grow(¤t_state, 1) == FAIL) | |
| 2888 return FAIL; | |
| 2889 vim_memset(&CUR_STATE(current_state.ga_len), 0, sizeof(stateitem_T)); | |
| 2890 CUR_STATE(current_state.ga_len).si_idx = idx; | |
| 2891 ++current_state.ga_len; | |
| 2892 return OK; | |
| 2893 } | |
| 2894 | |
| 2895 /* | |
| 2896 * Remove a state from the current_state stack. | |
| 2897 */ | |
| 2898 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2899 pop_current_state(void) |
| 7 | 2900 { |
| 2901 if (current_state.ga_len) | |
| 2902 { | |
| 2903 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch); | |
| 2904 --current_state.ga_len; | |
| 2905 } | |
| 2906 /* after the end of a pattern, try matching a keyword or pattern */ | |
| 2907 next_match_idx = -1; | |
| 2908 | |
| 2909 /* if first state with "keepend" is popped, reset keepend_level */ | |
| 2910 if (keepend_level >= current_state.ga_len) | |
| 2911 keepend_level = -1; | |
| 2912 } | |
| 2913 | |
| 2914 /* | |
| 2915 * Find the end of a start/skip/end syntax region after "startpos". | |
| 2916 * Only checks one line. | |
| 2917 * Also handles a match item that continued from a previous line. | |
| 2918 * If not found, the syntax item continues in the next line. m_endpos->lnum | |
| 2919 * will be 0. | |
| 2920 * If found, the end of the region and the end of the highlighting is | |
| 2921 * computed. | |
| 2922 */ | |
| 2923 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2924 find_endpos( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2925 int idx, /* index of the pattern */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2926 lpos_T *startpos, /* where to start looking for an END match */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2927 lpos_T *m_endpos, /* return: end of match */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2928 lpos_T *hl_endpos, /* return: end of highlighting */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2929 long *flagsp, /* return: flags of matching END */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2930 lpos_T *end_endpos, /* return: end of end pattern match */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2931 int *end_idx, /* return: group ID for end pat. match, or 0 */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2932 reg_extmatch_T *start_ext) /* submatches from the start pattern */ |
| 7 | 2933 { |
| 2934 colnr_T matchcol; | |
| 2935 synpat_T *spp, *spp_skip; | |
| 2936 int start_idx; | |
| 2937 int best_idx; | |
| 2938 regmmatch_T regmatch; | |
| 2939 regmmatch_T best_regmatch; /* startpos/endpos of best match */ | |
| 2940 lpos_T pos; | |
| 2941 char_u *line; | |
| 2942 int had_match = FALSE; | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2943 char_u buf_chartab[32]; /* chartab array for syn option iskyeyword */ |
| 7 | 2944 |
| 1371 | 2945 /* just in case we are invoked for a keyword */ |
| 2946 if (idx < 0) | |
| 2947 return; | |
| 2948 | |
| 7 | 2949 /* |
| 2950 * Check for being called with a START pattern. | |
| 2951 * Can happen with a match that continues to the next line, because it | |
| 2952 * contained a region. | |
| 2953 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2954 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2955 if (spp->sp_type != SPTYPE_START) |
| 2956 { | |
| 2957 *hl_endpos = *startpos; | |
| 2958 return; | |
| 2959 } | |
| 2960 | |
| 2961 /* | |
| 2962 * Find the SKIP or first END pattern after the last START pattern. | |
| 2963 */ | |
| 2964 for (;;) | |
| 2965 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2966 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2967 if (spp->sp_type != SPTYPE_START) |
| 2968 break; | |
| 2969 ++idx; | |
| 2970 } | |
| 2971 | |
| 2972 /* | |
| 2973 * Lookup the SKIP pattern (if present) | |
| 2974 */ | |
| 2975 if (spp->sp_type == SPTYPE_SKIP) | |
| 2976 { | |
| 2977 spp_skip = spp; | |
| 2978 ++idx; | |
| 2979 } | |
| 2980 else | |
| 2981 spp_skip = NULL; | |
| 2982 | |
| 2983 /* Setup external matches for syn_regexec(). */ | |
| 2984 unref_extmatch(re_extmatch_in); | |
| 2985 re_extmatch_in = ref_extmatch(start_ext); | |
| 2986 | |
| 2987 matchcol = startpos->col; /* start looking for a match at sstart */ | |
| 2988 start_idx = idx; /* remember the first END pattern. */ | |
| 2989 best_regmatch.startpos[0].col = 0; /* avoid compiler warning */ | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2990 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2991 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2992 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2993 |
| 7 | 2994 for (;;) |
| 2995 { | |
| 2996 /* | |
| 2997 * Find end pattern that matches first after "matchcol". | |
| 2998 */ | |
| 2999 best_idx = -1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3000 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx) |
| 7 | 3001 { |
| 3002 int lc_col = matchcol; | |
| 6375 | 3003 int r; |
| 7 | 3004 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3005 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 3006 if (spp->sp_type != SPTYPE_END) /* past last END pattern */ |
| 3007 break; | |
| 3008 lc_col -= spp->sp_offsets[SPO_LC_OFF]; | |
| 3009 if (lc_col < 0) | |
| 3010 lc_col = 0; | |
| 3011 | |
| 3012 regmatch.rmm_ic = spp->sp_ic; | |
| 3013 regmatch.regprog = spp->sp_prog; | |
| 6375 | 3014 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 3015 IF_SYN_TIME(&spp->sp_time)); | |
| 3016 spp->sp_prog = regmatch.regprog; | |
| 3017 if (r) | |
| 7 | 3018 { |
| 3019 if (best_idx == -1 || regmatch.startpos[0].col | |
| 3020 < best_regmatch.startpos[0].col) | |
| 3021 { | |
| 3022 best_idx = idx; | |
| 3023 best_regmatch.startpos[0] = regmatch.startpos[0]; | |
| 3024 best_regmatch.endpos[0] = regmatch.endpos[0]; | |
| 3025 } | |
| 3026 } | |
| 3027 } | |
| 3028 | |
| 3029 /* | |
| 3030 * If all end patterns have been tried, and there is no match, the | |
| 3031 * item continues until end-of-line. | |
| 3032 */ | |
| 3033 if (best_idx == -1) | |
| 3034 break; | |
| 3035 | |
| 3036 /* | |
| 3037 * If the skip pattern matches before the end pattern, | |
| 3038 * continue searching after the skip pattern. | |
| 3039 */ | |
| 3040 if (spp_skip != NULL) | |
| 3041 { | |
| 3042 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF]; | |
| 6375 | 3043 int r; |
| 7 | 3044 |
| 3045 if (lc_col < 0) | |
| 3046 lc_col = 0; | |
| 3047 regmatch.rmm_ic = spp_skip->sp_ic; | |
| 3048 regmatch.regprog = spp_skip->sp_prog; | |
| 6375 | 3049 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 3050 IF_SYN_TIME(&spp_skip->sp_time)); | |
| 3051 spp_skip->sp_prog = regmatch.regprog; | |
| 3052 if (r && regmatch.startpos[0].col | |
| 7 | 3053 <= best_regmatch.startpos[0].col) |
| 3054 { | |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
3055 int line_len; |
|
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
3056 |
| 7 | 3057 /* Add offset to skip pattern match */ |
| 3058 syn_add_end_off(&pos, ®match, spp_skip, SPO_ME_OFF, 1); | |
| 3059 | |
| 3060 /* If the skip pattern goes on to the next line, there is no | |
| 3061 * match with an end pattern in this line. */ | |
| 3062 if (pos.lnum > startpos->lnum) | |
| 3063 break; | |
| 3064 | |
| 3065 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
|
3066 line_len = (int)STRLEN(line); |
| 7 | 3067 |
| 3068 /* take care of an empty match or negative offset */ | |
| 3069 if (pos.col <= matchcol) | |
| 3070 ++matchcol; | |
| 3071 else if (pos.col <= regmatch.endpos[0].col) | |
| 3072 matchcol = pos.col; | |
| 3073 else | |
| 3074 /* Be careful not to jump over the NUL at the end-of-line */ | |
| 3075 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
|
3076 matchcol < line_len && matchcol < pos.col; |
| 7 | 3077 ++matchcol) |
| 3078 ; | |
| 3079 | |
| 3080 /* 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
|
3081 if (matchcol >= line_len) |
| 7 | 3082 break; |
| 3083 | |
| 3084 continue; /* start with first end pattern again */ | |
| 3085 } | |
| 3086 } | |
| 3087 | |
| 3088 /* | |
| 3089 * Match from start pattern to end pattern. | |
| 3090 * Correct for match and highlight offset of end pattern. | |
| 3091 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3092 spp = &(SYN_ITEMS(syn_block)[best_idx]); |
| 7 | 3093 syn_add_end_off(m_endpos, &best_regmatch, spp, SPO_ME_OFF, 1); |
| 3094 /* can't end before the start */ | |
| 3095 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col) | |
| 3096 m_endpos->col = startpos->col; | |
| 3097 | |
| 3098 syn_add_end_off(end_endpos, &best_regmatch, spp, SPO_HE_OFF, 1); | |
| 3099 /* can't end before the start */ | |
| 3100 if (end_endpos->lnum == startpos->lnum | |
| 3101 && end_endpos->col < startpos->col) | |
| 3102 end_endpos->col = startpos->col; | |
| 3103 /* can't end after the match */ | |
| 3104 limit_pos(end_endpos, m_endpos); | |
| 3105 | |
| 3106 /* | |
| 3107 * If the end group is highlighted differently, adjust the pointers. | |
| 3108 */ | |
| 3109 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0) | |
| 3110 { | |
| 3111 *end_idx = best_idx; | |
| 3112 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT))) | |
| 3113 { | |
| 3114 hl_endpos->lnum = best_regmatch.endpos[0].lnum; | |
| 3115 hl_endpos->col = best_regmatch.endpos[0].col; | |
| 3116 } | |
| 3117 else | |
| 3118 { | |
| 3119 hl_endpos->lnum = best_regmatch.startpos[0].lnum; | |
| 3120 hl_endpos->col = best_regmatch.startpos[0].col; | |
| 3121 } | |
| 3122 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF]; | |
| 3123 | |
| 3124 /* can't end before the start */ | |
| 3125 if (hl_endpos->lnum == startpos->lnum | |
| 3126 && hl_endpos->col < startpos->col) | |
| 3127 hl_endpos->col = startpos->col; | |
| 3128 limit_pos(hl_endpos, m_endpos); | |
| 3129 | |
| 3130 /* now the match ends where the highlighting ends, it is turned | |
| 3131 * into the matchgroup for the end */ | |
| 3132 *m_endpos = *hl_endpos; | |
| 3133 } | |
| 3134 else | |
| 3135 { | |
| 3136 *end_idx = 0; | |
| 3137 *hl_endpos = *end_endpos; | |
| 3138 } | |
| 3139 | |
| 3140 *flagsp = spp->sp_flags; | |
| 3141 | |
| 3142 had_match = TRUE; | |
| 3143 break; | |
| 3144 } | |
| 3145 | |
| 3146 /* no match for an END pattern in this line */ | |
| 3147 if (!had_match) | |
| 3148 m_endpos->lnum = 0; | |
| 3149 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3150 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3151 |
| 7 | 3152 /* Remove external matches. */ |
| 3153 unref_extmatch(re_extmatch_in); | |
| 3154 re_extmatch_in = NULL; | |
| 3155 } | |
| 3156 | |
| 3157 /* | |
| 3158 * Limit "pos" not to be after "limit". | |
| 3159 */ | |
| 3160 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3161 limit_pos(lpos_T *pos, lpos_T *limit) |
| 7 | 3162 { |
| 3163 if (pos->lnum > limit->lnum) | |
| 3164 *pos = *limit; | |
| 3165 else if (pos->lnum == limit->lnum && pos->col > limit->col) | |
| 3166 pos->col = limit->col; | |
| 3167 } | |
| 3168 | |
| 3169 /* | |
| 3170 * Limit "pos" not to be after "limit", unless pos->lnum is zero. | |
| 3171 */ | |
| 3172 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3173 limit_pos_zero( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3174 lpos_T *pos, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3175 lpos_T *limit) |
| 7 | 3176 { |
| 3177 if (pos->lnum == 0) | |
| 3178 *pos = *limit; | |
| 3179 else | |
| 3180 limit_pos(pos, limit); | |
| 3181 } | |
| 3182 | |
| 3183 /* | |
| 3184 * Add offset to matched text for end of match or highlight. | |
| 3185 */ | |
| 3186 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3187 syn_add_end_off( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3188 lpos_T *result, /* returned position */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3189 regmmatch_T *regmatch, /* start/end of match */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3190 synpat_T *spp, /* matched pattern */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3191 int idx, /* index of offset */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3192 int extra) /* extra chars for offset to start */ |
| 7 | 3193 { |
| 3194 int col; | |
| 1624 | 3195 int off; |
| 3196 char_u *base; | |
| 3197 char_u *p; | |
| 7 | 3198 |
| 3199 if (spp->sp_off_flags & (1 << idx)) | |
| 3200 { | |
| 3201 result->lnum = regmatch->startpos[0].lnum; | |
| 1624 | 3202 col = regmatch->startpos[0].col; |
| 3203 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3204 } |
| 3205 else | |
| 3206 { | |
| 3207 result->lnum = regmatch->endpos[0].lnum; | |
| 3208 col = regmatch->endpos[0].col; | |
| 1624 | 3209 off = spp->sp_offsets[idx]; |
| 3210 } | |
| 3211 /* Don't go past the end of the line. Matters for "rs=e+2" when there | |
| 3212 * is a matchgroup. Watch out for match with last NL in the buffer. */ | |
| 3213 if (result->lnum > syn_buf->b_ml.ml_line_count) | |
| 3214 col = 0; | |
| 3215 else if (off != 0) | |
| 3216 { | |
| 3217 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3218 p = base + col; | |
| 3219 if (off > 0) | |
| 3220 { | |
| 3221 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
|
3222 MB_PTR_ADV(p); |
| 1624 | 3223 } |
| 3224 else if (off < 0) | |
| 3225 { | |
| 3226 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
|
3227 MB_PTR_BACK(base, p); |
| 1624 | 3228 } |
| 3229 col = (int)(p - base); | |
| 3230 } | |
| 3231 result->col = col; | |
| 7 | 3232 } |
| 3233 | |
| 3234 /* | |
| 3235 * Add offset to matched text for start of match or highlight. | |
| 3236 * Avoid resulting column to become negative. | |
| 3237 */ | |
| 3238 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3239 syn_add_start_off( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3240 lpos_T *result, /* returned position */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3241 regmmatch_T *regmatch, /* start/end of match */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3242 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3243 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3244 int extra) /* extra chars for offset to end */ |
| 7 | 3245 { |
| 3246 int col; | |
| 1624 | 3247 int off; |
| 3248 char_u *base; | |
| 3249 char_u *p; | |
| 7 | 3250 |
| 3251 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT))) | |
| 3252 { | |
| 3253 result->lnum = regmatch->endpos[0].lnum; | |
| 1624 | 3254 col = regmatch->endpos[0].col; |
| 3255 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3256 } |
| 3257 else | |
| 3258 { | |
| 3259 result->lnum = regmatch->startpos[0].lnum; | |
| 3260 col = regmatch->startpos[0].col; | |
| 1624 | 3261 off = spp->sp_offsets[idx]; |
| 3262 } | |
|
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3263 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
|
3264 { |
|
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3265 /* a "\n" at the end of the pattern may take us below the last line */ |
|
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3266 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
|
3267 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
|
3268 } |
| 1624 | 3269 if (off != 0) |
| 3270 { | |
| 3271 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3272 p = base + col; | |
| 3273 if (off > 0) | |
| 3274 { | |
| 3275 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
|
3276 MB_PTR_ADV(p); |
| 1624 | 3277 } |
| 3278 else if (off < 0) | |
| 3279 { | |
| 3280 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
|
3281 MB_PTR_BACK(base, p); |
| 1624 | 3282 } |
| 3283 col = (int)(p - base); | |
| 3284 } | |
| 3285 result->col = col; | |
| 7 | 3286 } |
| 3287 | |
| 3288 /* | |
| 3289 * Get current line in syntax buffer. | |
| 3290 */ | |
| 3291 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3292 syn_getcurline(void) |
| 7 | 3293 { |
| 3294 return ml_get_buf(syn_buf, current_lnum, FALSE); | |
| 3295 } | |
| 3296 | |
| 3297 /* | |
| 410 | 3298 * Call vim_regexec() to find a match with "rmp" in "syn_buf". |
| 7 | 3299 * Returns TRUE when there is a match. |
| 3300 */ | |
| 3301 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3302 syn_regexec( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3303 regmmatch_T *rmp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3304 linenr_T lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3305 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3306 syn_time_T *st UNUSED) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3307 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3308 int r; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3309 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3310 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
|
3311 #endif |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3312 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3313 proftime_T pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3314 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3315 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3316 profile_start(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3317 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3318 |
| 410 | 3319 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
|
3320 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
|
3321 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3322 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
|
3323 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3324 NULL, NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3325 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3326 ); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3327 |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3328 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3329 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3330 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3331 profile_end(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3332 profile_add(&st->total, &pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3333 if (profile_cmp(&pt, &st->slowest) < 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3334 st->slowest = pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3335 ++st->count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3336 if (r > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3337 ++st->match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3338 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3339 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3340 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3341 if (timed_out) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3342 syn_win->w_s->b_syn_slow = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3343 #endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3344 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3345 if (r > 0) |
| 7 | 3346 { |
| 3347 rmp->startpos[0].lnum += lnum; | |
| 3348 rmp->endpos[0].lnum += lnum; | |
| 3349 return TRUE; | |
| 3350 } | |
| 3351 return FALSE; | |
| 3352 } | |
| 3353 | |
| 3354 /* | |
| 3355 * Check one position in a line for a matching keyword. | |
| 3356 * 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
|
3357 * Return its ID if found, 0 otherwise. |
| 7 | 3358 */ |
| 3359 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3360 check_keyword_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3361 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3362 int startcol, /* position in line to check for keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3363 int *endcolp, /* return: character after found keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3364 long *flagsp, /* return: flags of matching keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3365 short **next_listp, /* return: next_list of matching keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3366 stateitem_T *cur_si, /* item at the top of the stack */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3367 int *ccharp UNUSED) /* conceal substitution char */ |
| 7 | 3368 { |
| 134 | 3369 keyentry_T *kp; |
| 3370 char_u *kwp; | |
| 7 | 3371 int round; |
| 134 | 3372 int kwlen; |
| 7 | 3373 char_u keyword[MAXKEYWLEN + 1]; /* assume max. keyword len is 80 */ |
| 134 | 3374 hashtab_T *ht; |
| 3375 hashitem_T *hi; | |
| 7 | 3376 |
| 3377 /* Find first character after the keyword. First character was already | |
| 3378 * checked. */ | |
| 134 | 3379 kwp = line + startcol; |
| 3380 kwlen = 0; | |
| 7 | 3381 do |
| 3382 { | |
| 3383 #ifdef FEAT_MBYTE | |
| 3384 if (has_mbyte) | |
| 474 | 3385 kwlen += (*mb_ptr2len)(kwp + kwlen); |
| 7 | 3386 else |
| 3387 #endif | |
| 134 | 3388 ++kwlen; |
| 3389 } | |
| 4043 | 3390 while (vim_iswordp_buf(kwp + kwlen, syn_buf)); |
| 134 | 3391 |
| 3392 if (kwlen > MAXKEYWLEN) | |
| 7 | 3393 return 0; |
| 3394 | |
| 3395 /* | |
| 3396 * Must make a copy of the keyword, so we can add a NUL and make it | |
| 3397 * lowercase. | |
| 3398 */ | |
| 419 | 3399 vim_strncpy(keyword, kwp, kwlen); |
| 7 | 3400 |
| 3401 /* | |
| 3402 * Try twice: | |
| 3403 * 1. matching case | |
| 3404 * 2. ignoring case | |
| 3405 */ | |
| 3406 for (round = 1; round <= 2; ++round) | |
| 3407 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3408 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic; |
| 134 | 3409 if (ht->ht_used == 0) |
| 7 | 3410 continue; |
| 134 | 3411 if (round == 2) /* ignore case */ |
| 3412 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1); | |
| 7 | 3413 |
| 3414 /* | |
| 134 | 3415 * Find keywords that match. There can be several with different |
| 3416 * attributes. | |
| 7 | 3417 * When current_next_list is non-zero accept only that group, otherwise: |
| 3418 * Accept a not-contained keyword at toplevel. | |
| 3419 * Accept a keyword at other levels only if it is in the contains list. | |
| 3420 */ | |
| 134 | 3421 hi = hash_find(ht, keyword); |
| 3422 if (!HASHITEM_EMPTY(hi)) | |
| 3423 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next) | |
| 7 | 3424 { |
| 134 | 3425 if (current_next_list != 0 |
| 3426 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0) | |
| 3427 : (cur_si == NULL | |
| 3428 ? !(kp->flags & HL_CONTAINED) | |
| 3429 : in_id_list(cur_si, cur_si->si_cont_list, | |
| 3430 &kp->k_syn, kp->flags & HL_CONTAINED))) | |
| 3431 { | |
| 3432 *endcolp = startcol + kwlen; | |
| 3433 *flagsp = kp->flags; | |
| 3434 *next_listp = kp->next_list; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3435 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3436 *ccharp = kp->k_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3437 #endif |
| 134 | 3438 return kp->k_syn.id; |
| 3439 } | |
| 7 | 3440 } |
| 3441 } | |
| 3442 return 0; | |
| 3443 } | |
| 3444 | |
| 3445 /* | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3446 * Handle ":syntax conceal" command. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3447 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3448 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3449 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
|
3450 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3451 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3452 char_u *arg = eap->arg; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3453 char_u *next; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3454 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3455 eap->nextcmd = find_nextcmd(arg); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3456 if (eap->skip) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3457 return; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3458 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3459 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
|
3460 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
|
3461 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3462 if (curwin->w_s->b_syn_conceal) |
|
11514
7c42cf66d5be
patch 8.0.0640: mismatch between help and actual message
Christian Brabandt <cb@256bit.org>
parents:
11465
diff
changeset
|
3463 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
|
3464 else |
|
11514
7c42cf66d5be
patch 8.0.0640: mismatch between help and actual message
Christian Brabandt <cb@256bit.org>
parents:
11465
diff
changeset
|
3465 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
|
3466 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3467 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
|
3468 curwin->w_s->b_syn_conceal = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3469 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
|
3470 curwin->w_s->b_syn_conceal = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3471 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3472 EMSG2(_("E390: Illegal argument: %s"), arg); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3473 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3474 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3475 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3476 /* |
| 7 | 3477 * Handle ":syntax case" command. |
| 3478 */ | |
| 3479 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3480 syn_cmd_case(exarg_T *eap, int syncing UNUSED) |
| 7 | 3481 { |
| 3482 char_u *arg = eap->arg; | |
| 3483 char_u *next; | |
| 3484 | |
| 3485 eap->nextcmd = find_nextcmd(arg); | |
| 3486 if (eap->skip) | |
| 3487 return; | |
| 3488 | |
| 3489 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
|
3490 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
|
3491 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3492 if (curwin->w_s->b_syn_ic) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3493 MSG(_("syntax case ignore")); |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3494 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3495 MSG(_("syntax case match")); |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3496 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3497 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
|
3498 curwin->w_s->b_syn_ic = FALSE; |
| 7 | 3499 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
|
3500 curwin->w_s->b_syn_ic = TRUE; |
| 7 | 3501 else |
| 3502 EMSG2(_("E390: Illegal argument: %s"), arg); | |
| 3503 } | |
| 3504 | |
| 3505 /* | |
| 419 | 3506 * Handle ":syntax spell" command. |
| 3507 */ | |
| 3508 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3509 syn_cmd_spell(exarg_T *eap, int syncing UNUSED) |
| 419 | 3510 { |
| 3511 char_u *arg = eap->arg; | |
| 3512 char_u *next; | |
| 3513 | |
| 3514 eap->nextcmd = find_nextcmd(arg); | |
| 3515 if (eap->skip) | |
| 3516 return; | |
| 3517 | |
| 3518 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
|
3519 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
|
3520 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3521 if (curwin->w_s->b_syn_spell == SYNSPL_TOP) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3522 MSG(_("syntax spell toplevel")); |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3523 else if (curwin->w_s->b_syn_spell == SYNSPL_NOTOP) |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3524 MSG(_("syntax spell notoplevel")); |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3525 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3526 MSG(_("syntax spell default")); |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3527 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3528 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
|
3529 curwin->w_s->b_syn_spell = SYNSPL_TOP; |
| 419 | 3530 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
|
3531 curwin->w_s->b_syn_spell = SYNSPL_NOTOP; |
| 1064 | 3532 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
|
3533 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT; |
| 419 | 3534 else |
| 6880 | 3535 { |
| 419 | 3536 EMSG2(_("E390: Illegal argument: %s"), arg); |
| 6880 | 3537 return; |
| 3538 } | |
| 3539 | |
| 3540 /* assume spell checking changed, force a redraw */ | |
| 3541 redraw_win_later(curwin, NOT_VALID); | |
| 419 | 3542 } |
| 3543 | |
| 3544 /* | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3545 * Handle ":syntax iskeyword" command. |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3546 */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3547 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3548 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
|
3549 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3550 char_u *arg = eap->arg; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3551 char_u save_chartab[32]; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3552 char_u *save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3553 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3554 if (eap->skip) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3555 return; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3556 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3557 arg = skipwhite(arg); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3558 if (*arg == NUL) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3559 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3560 MSG_PUTS("\n"); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3561 MSG_PUTS(_("syntax iskeyword ")); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3562 if (curwin->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
|
3563 msg_outtrans(curwin->w_s->b_syn_isk); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3564 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3565 msg_outtrans((char_u *)"not set"); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3566 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3567 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3568 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3569 if (STRNICMP(arg, "clear", 5) == 0) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3570 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3571 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
|
3572 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3573 clear_string_option(&curwin->w_s->b_syn_isk); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3574 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3575 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3576 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3577 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
|
3578 save_isk = curbuf->b_p_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3579 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
|
3580 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3581 buf_init_chartab(curbuf, FALSE); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3582 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
|
3583 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3584 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
|
3585 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
|
3586 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
|
3587 curbuf->b_p_isk = save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3588 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3589 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3590 redraw_win_later(curwin, NOT_VALID); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3591 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3592 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3593 /* |
| 7 | 3594 * Clear all syntax info for one buffer. |
| 3595 */ | |
| 3596 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3597 syntax_clear(synblock_T *block) |
| 7 | 3598 { |
| 3599 int i; | |
| 3600 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3601 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
|
3602 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3603 block->b_syn_slow = FALSE; /* clear previous timeout */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3604 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3605 block->b_syn_ic = FALSE; /* Use case, by default */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3606 block->b_syn_spell = SYNSPL_DEFAULT; /* default spell checking */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3607 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
|
3608 #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
|
3609 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
|
3610 #endif |
| 7 | 3611 |
| 3612 /* free the keywords */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3613 clear_keywtab(&block->b_keywtab); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3614 clear_keywtab(&block->b_keywtab_ic); |
| 7 | 3615 |
| 3616 /* free the syntax patterns */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3617 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
|
3618 syn_clear_pattern(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3619 ga_clear(&block->b_syn_patterns); |
| 7 | 3620 |
| 3621 /* free the syntax clusters */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3622 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
|
3623 syn_clear_cluster(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3624 ga_clear(&block->b_syn_clusters); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3625 block->b_spell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3626 block->b_nospell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3627 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3628 block->b_syn_sync_flags = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3629 block->b_syn_sync_minlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3630 block->b_syn_sync_maxlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3631 block->b_syn_sync_linebreaks = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3632 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3633 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
|
3634 block->b_syn_linecont_prog = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3635 vim_free(block->b_syn_linecont_pat); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3636 block->b_syn_linecont_pat = NULL; |
| 7 | 3637 #ifdef FEAT_FOLDING |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3638 block->b_syn_folditems = 0; |
| 7 | 3639 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3640 clear_string_option(&block->b_syn_isk); |
| 7 | 3641 |
| 3642 /* free the stored states */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3643 syn_stack_free_all(block); |
| 7 | 3644 invalidate_current_state(); |
| 2743 | 3645 |
| 3646 /* Reset the counter for ":syn include" */ | |
| 3647 running_syn_inc_tag = 0; | |
| 7 | 3648 } |
| 3649 | |
| 3650 /* | |
|
2253
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3651 * 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
|
3652 */ |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3653 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3654 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
|
3655 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3656 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
|
3657 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3658 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
|
3659 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
|
3660 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
|
3661 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3662 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3663 |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3664 /* |
| 7 | 3665 * Clear syncing info for one buffer. |
| 3666 */ | |
| 3667 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3668 syntax_sync_clear(void) |
| 7 | 3669 { |
| 3670 int i; | |
| 3671 | |
| 3672 /* free the syntax patterns */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3673 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
|
3674 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
|
3675 syn_remove_pattern(curwin->w_s, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3676 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3677 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
|
3678 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
|
3679 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
|
3680 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
|
3681 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3682 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
|
3683 curwin->w_s->b_syn_linecont_prog = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3684 vim_free(curwin->w_s->b_syn_linecont_pat); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3685 curwin->w_s->b_syn_linecont_pat = NULL; |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3686 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
|
3687 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3688 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 3689 } |
| 3690 | |
| 3691 /* | |
| 3692 * Remove one pattern from the buffer's pattern list. | |
| 3693 */ | |
| 3694 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3695 syn_remove_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3696 synblock_T *block, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3697 int idx) |
| 7 | 3698 { |
| 3699 synpat_T *spp; | |
| 3700 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3701 spp = &(SYN_ITEMS(block)[idx]); |
| 7 | 3702 #ifdef FEAT_FOLDING |
| 3703 if (spp->sp_flags & HL_FOLD) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3704 --block->b_syn_folditems; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3705 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3706 syn_clear_pattern(block, idx); |
| 7 | 3707 mch_memmove(spp, spp + 1, |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3708 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
|
3709 --block->b_syn_patterns.ga_len; |
| 7 | 3710 } |
| 3711 | |
| 3712 /* | |
| 3713 * Clear and free one syntax pattern. When clearing all, must be called from | |
| 3714 * last to first! | |
| 3715 */ | |
| 3716 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3717 syn_clear_pattern(synblock_T *block, int i) |
| 7 | 3718 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3719 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
|
3720 vim_regfree(SYN_ITEMS(block)[i].sp_prog); |
| 7 | 3721 /* 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
|
3722 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
|
3723 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3724 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
|
3725 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
|
3726 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list); |
| 7 | 3727 } |
| 3728 } | |
| 3729 | |
| 3730 /* | |
| 3731 * Clear and free one syntax cluster. | |
| 3732 */ | |
| 3733 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3734 syn_clear_cluster(synblock_T *block, int i) |
| 7 | 3735 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3736 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
|
3737 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
|
3738 vim_free(SYN_CLSTR(block)[i].scl_list); |
| 7 | 3739 } |
| 3740 | |
| 3741 /* | |
| 3742 * Handle ":syntax clear" command. | |
| 3743 */ | |
| 3744 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3745 syn_cmd_clear(exarg_T *eap, int syncing) |
| 7 | 3746 { |
| 3747 char_u *arg = eap->arg; | |
| 3748 char_u *arg_end; | |
| 3749 int id; | |
| 3750 | |
| 3751 eap->nextcmd = find_nextcmd(arg); | |
| 3752 if (eap->skip) | |
| 3753 return; | |
| 3754 | |
| 3755 /* | |
| 3756 * We have to disable this within ":syn include @group filename", | |
| 3757 * because otherwise @group would get deleted. | |
| 3758 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn | |
| 3759 * clear". | |
| 3760 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3761 if (curwin->w_s->b_syn_topgrp != 0) |
| 7 | 3762 return; |
| 3763 | |
| 3764 if (ends_excmd(*arg)) | |
| 3765 { | |
| 3766 /* | |
| 3767 * No argument: Clear all syntax items. | |
| 3768 */ | |
| 3769 if (syncing) | |
| 3770 syntax_sync_clear(); | |
| 3771 else | |
| 3772 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3773 syntax_clear(curwin->w_s); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3774 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
|
3775 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
3776 do_unlet((char_u *)"w:current_syntax", TRUE); |
| 7 | 3777 } |
| 3778 } | |
| 3779 else | |
| 3780 { | |
| 3781 /* | |
| 3782 * Clear the group IDs that are in the argument. | |
| 3783 */ | |
| 3784 while (!ends_excmd(*arg)) | |
| 3785 { | |
| 3786 arg_end = skiptowhite(arg); | |
| 3787 if (*arg == '@') | |
| 3788 { | |
| 3789 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 3790 if (id == 0) | |
| 3791 { | |
| 3792 EMSG2(_("E391: No such syntax cluster: %s"), arg); | |
| 3793 break; | |
| 3794 } | |
| 3795 else | |
| 3796 { | |
| 3797 /* | |
| 3798 * We can't physically delete a cluster without changing | |
| 3799 * the IDs of other clusters, so we do the next best thing | |
| 3800 * and make it empty. | |
| 3801 */ | |
| 3802 short scl_id = id - SYNID_CLUSTER; | |
| 3803 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3804 vim_free(SYN_CLSTR(curwin->w_s)[scl_id].scl_list); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3805 SYN_CLSTR(curwin->w_s)[scl_id].scl_list = NULL; |
| 7 | 3806 } |
| 3807 } | |
| 3808 else | |
| 3809 { | |
| 3810 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 3811 if (id == 0) | |
| 3812 { | |
| 3813 EMSG2(_(e_nogroup), arg); | |
| 3814 break; | |
| 3815 } | |
| 3816 else | |
| 3817 syn_clear_one(id, syncing); | |
| 3818 } | |
| 3819 arg = skipwhite(arg_end); | |
| 3820 } | |
| 3821 } | |
| 745 | 3822 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3823 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 3824 } |
| 3825 | |
| 3826 /* | |
| 3827 * Clear one syntax group for the current buffer. | |
| 3828 */ | |
| 3829 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3830 syn_clear_one(int id, int syncing) |
| 7 | 3831 { |
| 3832 synpat_T *spp; | |
| 3833 int idx; | |
| 3834 | |
| 3835 /* Clear keywords only when not ":syn sync clear group-name" */ | |
| 3836 if (!syncing) | |
| 3837 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3838 (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
|
3839 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic); |
| 7 | 3840 } |
| 3841 | |
| 3842 /* clear the patterns for "id" */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3843 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
|
3844 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3845 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 3846 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 3847 continue; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3848 syn_remove_pattern(curwin->w_s, idx); |
| 7 | 3849 } |
| 3850 } | |
| 3851 | |
| 3852 /* | |
| 3853 * Handle ":syntax on" command. | |
| 3854 */ | |
| 3855 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3856 syn_cmd_on(exarg_T *eap, int syncing UNUSED) |
| 7 | 3857 { |
| 3858 syn_cmd_onoff(eap, "syntax"); | |
| 3859 } | |
| 3860 | |
| 3861 /* | |
| 3862 * Handle ":syntax enable" command. | |
| 3863 */ | |
| 3864 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3865 syn_cmd_enable(exarg_T *eap, int syncing UNUSED) |
| 7 | 3866 { |
| 3867 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable"); | |
| 3868 syn_cmd_onoff(eap, "syntax"); | |
| 148 | 3869 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3870 } |
| 3871 | |
| 3872 /* | |
| 3873 * Handle ":syntax reset" command. | |
|
8815
50d9fb580ffe
commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816
Christian Brabandt <cb@256bit.org>
parents:
8806
diff
changeset
|
3874 * It actually resets highlighting, not syntax. |
| 7 | 3875 */ |
| 3876 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3877 syn_cmd_reset(exarg_T *eap, int syncing UNUSED) |
| 7 | 3878 { |
| 3879 eap->nextcmd = check_nextcmd(eap->arg); | |
| 3880 if (!eap->skip) | |
| 3881 { | |
| 3882 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset"); | |
| 3883 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); | |
| 148 | 3884 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3885 } |
| 3886 } | |
| 3887 | |
| 3888 /* | |
| 3889 * Handle ":syntax manual" command. | |
| 3890 */ | |
| 3891 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3892 syn_cmd_manual(exarg_T *eap, int syncing UNUSED) |
| 7 | 3893 { |
| 3894 syn_cmd_onoff(eap, "manual"); | |
| 3895 } | |
| 3896 | |
| 3897 /* | |
| 3898 * Handle ":syntax off" command. | |
| 3899 */ | |
| 3900 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3901 syn_cmd_off(exarg_T *eap, int syncing UNUSED) |
| 7 | 3902 { |
| 3903 syn_cmd_onoff(eap, "nosyntax"); | |
| 3904 } | |
| 3905 | |
| 3906 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3907 syn_cmd_onoff(exarg_T *eap, char *name) |
| 7 | 3908 { |
| 3909 char_u buf[100]; | |
| 3910 | |
| 3911 eap->nextcmd = check_nextcmd(eap->arg); | |
| 3912 if (!eap->skip) | |
| 3913 { | |
| 3914 STRCPY(buf, "so "); | |
| 274 | 3915 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); |
| 7 | 3916 do_cmdline_cmd(buf); |
| 3917 } | |
| 3918 } | |
| 3919 | |
| 3920 /* | |
| 3921 * Handle ":syntax [list]" command: list current syntax words. | |
| 3922 */ | |
| 3923 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3924 syn_cmd_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3925 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3926 int syncing) /* when TRUE: list syncing items */ |
| 7 | 3927 { |
| 3928 char_u *arg = eap->arg; | |
| 3929 int id; | |
| 3930 char_u *arg_end; | |
| 3931 | |
| 3932 eap->nextcmd = find_nextcmd(arg); | |
| 3933 if (eap->skip) | |
| 3934 return; | |
| 3935 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3936 if (!syntax_present(curwin)) |
| 7 | 3937 { |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3938 MSG(_(msg_no_items)); |
| 7 | 3939 return; |
| 3940 } | |
| 3941 | |
| 3942 if (syncing) | |
| 3943 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3944 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 3945 { |
| 3946 MSG_PUTS(_("syncing on C-style comments")); | |
| 3947 syn_lines_msg(); | |
| 3948 syn_match_msg(); | |
| 3949 return; | |
| 3950 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3951 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
|
3952 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3953 if (curwin->w_s->b_syn_sync_minlines == 0) |
| 7 | 3954 MSG_PUTS(_("no syncing")); |
| 3955 else | |
| 3956 { | |
| 3957 MSG_PUTS(_("syncing starts ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3958 msg_outnum(curwin->w_s->b_syn_sync_minlines); |
| 7 | 3959 MSG_PUTS(_(" lines before top line")); |
| 3960 syn_match_msg(); | |
| 3961 } | |
| 3962 return; | |
| 3963 } | |
| 3964 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
|
3965 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
|
3966 || 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
|
3967 || curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 3968 { |
| 3969 MSG_PUTS(_("\nsyncing on items")); | |
| 3970 syn_lines_msg(); | |
| 3971 syn_match_msg(); | |
| 3972 } | |
| 3973 } | |
| 3974 else | |
| 3975 MSG_PUTS_TITLE(_("\n--- Syntax items ---")); | |
| 3976 if (ends_excmd(*arg)) | |
| 3977 { | |
| 3978 /* | |
| 3979 * No argument: List all group IDs and all syntax clusters. | |
| 3980 */ | |
| 3981 for (id = 1; id <= highlight_ga.ga_len && !got_int; ++id) | |
| 3982 syn_list_one(id, syncing, FALSE); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3983 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id) |
| 7 | 3984 syn_list_cluster(id); |
| 3985 } | |
| 3986 else | |
| 3987 { | |
| 3988 /* | |
| 3989 * List the group IDs and syntax clusters that are in the argument. | |
| 3990 */ | |
| 3991 while (!ends_excmd(*arg) && !got_int) | |
| 3992 { | |
| 3993 arg_end = skiptowhite(arg); | |
| 3994 if (*arg == '@') | |
| 3995 { | |
| 3996 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 3997 if (id == 0) | |
| 3998 EMSG2(_("E392: No such syntax cluster: %s"), arg); | |
| 3999 else | |
| 4000 syn_list_cluster(id - SYNID_CLUSTER); | |
| 4001 } | |
| 4002 else | |
| 4003 { | |
| 4004 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 4005 if (id == 0) | |
| 4006 EMSG2(_(e_nogroup), arg); | |
| 4007 else | |
| 4008 syn_list_one(id, syncing, TRUE); | |
| 4009 } | |
| 4010 arg = skipwhite(arg_end); | |
| 4011 } | |
| 4012 } | |
| 4013 eap->nextcmd = check_nextcmd(arg); | |
| 4014 } | |
| 4015 | |
| 4016 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4017 syn_lines_msg(void) |
| 7 | 4018 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4019 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
|
4020 || curwin->w_s->b_syn_sync_minlines > 0) |
| 7 | 4021 { |
| 4022 MSG_PUTS("; "); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4023 if (curwin->w_s->b_syn_sync_minlines > 0) |
| 7 | 4024 { |
| 4025 MSG_PUTS(_("minimal ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4026 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
|
4027 if (curwin->w_s->b_syn_sync_maxlines) |
| 7 | 4028 MSG_PUTS(", "); |
| 4029 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4030 if (curwin->w_s->b_syn_sync_maxlines > 0) |
| 7 | 4031 { |
| 4032 MSG_PUTS(_("maximal ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4033 msg_outnum(curwin->w_s->b_syn_sync_maxlines); |
| 7 | 4034 } |
| 4035 MSG_PUTS(_(" lines before top line")); | |
| 4036 } | |
| 4037 } | |
| 4038 | |
| 4039 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4040 syn_match_msg(void) |
| 7 | 4041 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4042 if (curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 4043 { |
| 4044 MSG_PUTS(_("; match ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4045 msg_outnum(curwin->w_s->b_syn_sync_linebreaks); |
| 7 | 4046 MSG_PUTS(_(" line breaks")); |
| 4047 } | |
| 4048 } | |
| 4049 | |
| 4050 static int last_matchgroup; | |
| 4051 | |
| 4052 struct name_list | |
| 4053 { | |
| 4054 int flag; | |
| 4055 char *name; | |
| 4056 }; | |
| 4057 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
4058 static void syn_list_flags(struct name_list *nl, int flags, int attr); |
| 7 | 4059 |
| 4060 /* | |
| 4061 * List one syntax item, for ":syntax" or "syntax list syntax_name". | |
| 4062 */ | |
| 4063 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4064 syn_list_one( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4065 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4066 int syncing, /* when TRUE: list syncing items */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4067 int link_only) /* when TRUE; list link-only too */ |
| 7 | 4068 { |
| 4069 int attr; | |
| 4070 int idx; | |
| 4071 int did_header = FALSE; | |
| 4072 synpat_T *spp; | |
| 4073 static struct name_list namelist1[] = | |
| 4074 { | |
| 4075 {HL_DISPLAY, "display"}, | |
| 4076 {HL_CONTAINED, "contained"}, | |
| 4077 {HL_ONELINE, "oneline"}, | |
| 4078 {HL_KEEPEND, "keepend"}, | |
| 4079 {HL_EXTEND, "extend"}, | |
| 4080 {HL_EXCLUDENL, "excludenl"}, | |
| 4081 {HL_TRANSP, "transparent"}, | |
| 4082 {HL_FOLD, "fold"}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4083 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4084 {HL_CONCEAL, "conceal"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4085 {HL_CONCEALENDS, "concealends"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4086 #endif |
| 7 | 4087 {0, NULL} |
| 4088 }; | |
| 4089 static struct name_list namelist2[] = | |
| 4090 { | |
| 4091 {HL_SKIPWHITE, "skipwhite"}, | |
| 4092 {HL_SKIPNL, "skipnl"}, | |
| 4093 {HL_SKIPEMPTY, "skipempty"}, | |
| 4094 {0, NULL} | |
| 4095 }; | |
| 4096 | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4097 attr = HL_ATTR(HLF_D); /* highlight like directories */ |
| 7 | 4098 |
| 4099 /* list the keywords for "id" */ | |
| 4100 if (!syncing) | |
| 4101 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4102 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
|
4103 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic, |
| 7 | 4104 did_header, attr); |
| 4105 } | |
| 4106 | |
| 4107 /* list the patterns for "id" */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4108 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
|
4109 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4110 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 4111 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 4112 continue; | |
| 4113 | |
| 4114 (void)syn_list_header(did_header, 999, id); | |
| 4115 did_header = TRUE; | |
| 4116 last_matchgroup = 0; | |
| 4117 if (spp->sp_type == SPTYPE_MATCH) | |
| 4118 { | |
| 4119 put_pattern("match", ' ', spp, attr); | |
| 4120 msg_putchar(' '); | |
| 4121 } | |
| 4122 else if (spp->sp_type == SPTYPE_START) | |
| 4123 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4124 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
|
4125 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
|
4126 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
|
4127 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
|
4128 while (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
|
4129 && SYN_ITEMS(curwin->w_s)[idx].sp_type == SPTYPE_END) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4130 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
| 7 | 4131 --idx; |
| 4132 msg_putchar(' '); | |
| 4133 } | |
| 4134 syn_list_flags(namelist1, spp->sp_flags, attr); | |
| 4135 | |
| 4136 if (spp->sp_cont_list != NULL) | |
| 4137 put_id_list((char_u *)"contains", spp->sp_cont_list, attr); | |
| 4138 | |
| 4139 if (spp->sp_syn.cont_in_list != NULL) | |
| 4140 put_id_list((char_u *)"containedin", | |
| 4141 spp->sp_syn.cont_in_list, attr); | |
| 4142 | |
| 4143 if (spp->sp_next_list != NULL) | |
| 4144 { | |
| 4145 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr); | |
| 4146 syn_list_flags(namelist2, spp->sp_flags, attr); | |
| 4147 } | |
| 4148 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE)) | |
| 4149 { | |
| 4150 if (spp->sp_flags & HL_SYNC_HERE) | |
| 4151 msg_puts_attr((char_u *)"grouphere", attr); | |
| 4152 else | |
| 4153 msg_puts_attr((char_u *)"groupthere", attr); | |
| 4154 msg_putchar(' '); | |
| 4155 if (spp->sp_sync_idx >= 0) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4156 msg_outtrans(HL_TABLE()[SYN_ITEMS(curwin->w_s) |
| 7 | 4157 [spp->sp_sync_idx].sp_syn.id - 1].sg_name); |
| 4158 else | |
| 4159 MSG_PUTS("NONE"); | |
| 4160 msg_putchar(' '); | |
| 4161 } | |
| 4162 } | |
| 4163 | |
| 4164 /* list the link, if there is one */ | |
| 4165 if (HL_TABLE()[id - 1].sg_link && (did_header || link_only) && !got_int) | |
| 4166 { | |
| 4167 (void)syn_list_header(did_header, 999, id); | |
| 4168 msg_puts_attr((char_u *)"links to", attr); | |
| 4169 msg_putchar(' '); | |
| 4170 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name); | |
| 4171 } | |
| 4172 } | |
| 4173 | |
| 4174 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4175 syn_list_flags(struct name_list *nlist, int flags, int attr) |
| 7 | 4176 { |
| 4177 int i; | |
| 4178 | |
| 3263 | 4179 for (i = 0; nlist[i].flag != 0; ++i) |
| 4180 if (flags & nlist[i].flag) | |
| 4181 { | |
| 4182 msg_puts_attr((char_u *)nlist[i].name, attr); | |
| 7 | 4183 msg_putchar(' '); |
| 4184 } | |
| 4185 } | |
| 4186 | |
| 4187 /* | |
| 4188 * List one syntax cluster, for ":syntax" or "syntax list syntax_name". | |
| 4189 */ | |
| 4190 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4191 syn_list_cluster(int id) |
| 7 | 4192 { |
| 4193 int endcol = 15; | |
| 4194 | |
| 4195 /* slight hack: roughly duplicate the guts of syn_list_header() */ | |
| 4196 msg_putchar('\n'); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4197 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name); |
| 7 | 4198 |
| 4199 if (msg_col >= endcol) /* output at least one space */ | |
| 4200 endcol = msg_col + 1; | |
| 4201 if (Columns <= endcol) /* avoid hang for tiny window */ | |
| 4202 endcol = Columns - 1; | |
| 4203 | |
| 4204 msg_advance(endcol); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4205 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
|
4206 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4207 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
|
4208 HL_ATTR(HLF_D)); |
| 7 | 4209 } |
| 4210 else | |
| 4211 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4212 msg_puts_attr((char_u *)"cluster", HL_ATTR(HLF_D)); |
| 7 | 4213 msg_puts((char_u *)"=NONE"); |
| 4214 } | |
| 4215 } | |
| 4216 | |
| 4217 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4218 put_id_list(char_u *name, short *list, int attr) |
| 7 | 4219 { |
| 4220 short *p; | |
| 4221 | |
| 4222 msg_puts_attr(name, attr); | |
| 4223 msg_putchar('='); | |
| 4224 for (p = list; *p; ++p) | |
| 4225 { | |
| 4226 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP) | |
| 4227 { | |
| 4228 if (p[1]) | |
| 4229 MSG_PUTS("ALLBUT"); | |
| 4230 else | |
| 4231 MSG_PUTS("ALL"); | |
| 4232 } | |
| 4233 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED) | |
| 4234 { | |
| 4235 MSG_PUTS("TOP"); | |
| 4236 } | |
| 4237 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER) | |
| 4238 { | |
| 4239 MSG_PUTS("CONTAINED"); | |
| 4240 } | |
| 4241 else if (*p >= SYNID_CLUSTER) | |
| 4242 { | |
| 4243 short scl_id = *p - SYNID_CLUSTER; | |
| 4244 | |
| 4245 msg_putchar('@'); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4246 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name); |
| 7 | 4247 } |
| 4248 else | |
| 4249 msg_outtrans(HL_TABLE()[*p - 1].sg_name); | |
| 4250 if (p[1]) | |
| 4251 msg_putchar(','); | |
| 4252 } | |
| 4253 msg_putchar(' '); | |
| 4254 } | |
| 4255 | |
| 4256 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4257 put_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4258 char *s, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4259 int c, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4260 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4261 int attr) |
| 7 | 4262 { |
| 4263 long n; | |
| 4264 int mask; | |
| 4265 int first; | |
| 4266 static char *sepchars = "/+=-#@\"|'^&"; | |
| 4267 int i; | |
| 4268 | |
| 4269 /* May have to write "matchgroup=group" */ | |
| 4270 if (last_matchgroup != spp->sp_syn_match_id) | |
| 4271 { | |
| 4272 last_matchgroup = spp->sp_syn_match_id; | |
| 4273 msg_puts_attr((char_u *)"matchgroup", attr); | |
| 4274 msg_putchar('='); | |
| 4275 if (last_matchgroup == 0) | |
| 4276 msg_outtrans((char_u *)"NONE"); | |
| 4277 else | |
| 4278 msg_outtrans(HL_TABLE()[last_matchgroup - 1].sg_name); | |
| 4279 msg_putchar(' '); | |
| 4280 } | |
| 4281 | |
| 4282 /* output the name of the pattern and an '=' or ' ' */ | |
| 4283 msg_puts_attr((char_u *)s, attr); | |
| 4284 msg_putchar(c); | |
| 4285 | |
| 4286 /* output the pattern, in between a char that is not in the pattern */ | |
| 4287 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; ) | |
| 4288 if (sepchars[++i] == NUL) | |
| 4289 { | |
| 4290 i = 0; /* no good char found, just use the first one */ | |
| 4291 break; | |
| 4292 } | |
| 4293 msg_putchar(sepchars[i]); | |
| 4294 msg_outtrans(spp->sp_pattern); | |
| 4295 msg_putchar(sepchars[i]); | |
| 4296 | |
| 4297 /* output any pattern options */ | |
| 4298 first = TRUE; | |
| 4299 for (i = 0; i < SPO_COUNT; ++i) | |
| 4300 { | |
| 4301 mask = (1 << i); | |
| 4302 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT))) | |
| 4303 { | |
| 4304 if (!first) | |
| 4305 msg_putchar(','); /* separate with commas */ | |
| 4306 msg_puts((char_u *)spo_name_tab[i]); | |
| 4307 n = spp->sp_offsets[i]; | |
| 4308 if (i != SPO_LC_OFF) | |
| 4309 { | |
| 4310 if (spp->sp_off_flags & mask) | |
| 4311 msg_putchar('s'); | |
| 4312 else | |
| 4313 msg_putchar('e'); | |
| 4314 if (n > 0) | |
| 4315 msg_putchar('+'); | |
| 4316 } | |
| 4317 if (n || i == SPO_LC_OFF) | |
| 4318 msg_outnum(n); | |
| 4319 first = FALSE; | |
| 4320 } | |
| 4321 } | |
| 4322 msg_putchar(' '); | |
| 4323 } | |
| 4324 | |
| 4325 /* | |
| 4326 * List or clear the keywords for one syntax group. | |
| 4327 * Return TRUE if the header has been printed. | |
| 4328 */ | |
| 4329 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4330 syn_list_keywords( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4331 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4332 hashtab_T *ht, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4333 int did_header, /* header has already been printed */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4334 int attr) |
| 7 | 4335 { |
| 4336 int outlen; | |
| 134 | 4337 hashitem_T *hi; |
| 4338 keyentry_T *kp; | |
| 4339 int todo; | |
| 7 | 4340 int prev_contained = 0; |
| 4341 short *prev_next_list = NULL; | |
| 4342 short *prev_cont_in_list = NULL; | |
| 4343 int prev_skipnl = 0; | |
| 4344 int prev_skipwhite = 0; | |
| 4345 int prev_skipempty = 0; | |
| 4346 | |
| 4347 /* | |
| 4348 * Unfortunately, this list of keywords is not sorted on alphabet but on | |
| 4349 * hash value... | |
| 4350 */ | |
| 835 | 4351 todo = (int)ht->ht_used; |
| 134 | 4352 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi) |
| 4353 { | |
| 4354 if (!HASHITEM_EMPTY(hi)) | |
| 4355 { | |
| 4356 --todo; | |
| 4357 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next) | |
| 7 | 4358 { |
| 134 | 4359 if (kp->k_syn.id == id) |
| 7 | 4360 { |
| 134 | 4361 if (prev_contained != (kp->flags & HL_CONTAINED) |
| 4362 || prev_skipnl != (kp->flags & HL_SKIPNL) | |
| 4363 || prev_skipwhite != (kp->flags & HL_SKIPWHITE) | |
| 4364 || prev_skipempty != (kp->flags & HL_SKIPEMPTY) | |
| 4365 || prev_cont_in_list != kp->k_syn.cont_in_list | |
| 4366 || prev_next_list != kp->next_list) | |
| 4367 outlen = 9999; | |
| 4368 else | |
| 4369 outlen = (int)STRLEN(kp->keyword); | |
| 4370 /* output "contained" and "nextgroup" on each line */ | |
| 4371 if (syn_list_header(did_header, outlen, id)) | |
| 4372 { | |
| 4373 prev_contained = 0; | |
| 4374 prev_next_list = NULL; | |
| 4375 prev_cont_in_list = NULL; | |
| 4376 prev_skipnl = 0; | |
| 4377 prev_skipwhite = 0; | |
| 4378 prev_skipempty = 0; | |
| 4379 } | |
| 4380 did_header = TRUE; | |
| 4381 if (prev_contained != (kp->flags & HL_CONTAINED)) | |
| 4382 { | |
| 4383 msg_puts_attr((char_u *)"contained", attr); | |
| 4384 msg_putchar(' '); | |
| 4385 prev_contained = (kp->flags & HL_CONTAINED); | |
| 4386 } | |
| 4387 if (kp->k_syn.cont_in_list != prev_cont_in_list) | |
| 4388 { | |
| 4389 put_id_list((char_u *)"containedin", | |
| 4390 kp->k_syn.cont_in_list, attr); | |
| 4391 msg_putchar(' '); | |
| 4392 prev_cont_in_list = kp->k_syn.cont_in_list; | |
| 4393 } | |
| 4394 if (kp->next_list != prev_next_list) | |
| 4395 { | |
| 4396 put_id_list((char_u *)"nextgroup", kp->next_list, attr); | |
| 4397 msg_putchar(' '); | |
| 4398 prev_next_list = kp->next_list; | |
| 4399 if (kp->flags & HL_SKIPNL) | |
| 4400 { | |
| 4401 msg_puts_attr((char_u *)"skipnl", attr); | |
| 4402 msg_putchar(' '); | |
| 4403 prev_skipnl = (kp->flags & HL_SKIPNL); | |
| 4404 } | |
| 4405 if (kp->flags & HL_SKIPWHITE) | |
| 4406 { | |
| 4407 msg_puts_attr((char_u *)"skipwhite", attr); | |
| 4408 msg_putchar(' '); | |
| 4409 prev_skipwhite = (kp->flags & HL_SKIPWHITE); | |
| 4410 } | |
| 4411 if (kp->flags & HL_SKIPEMPTY) | |
| 4412 { | |
| 4413 msg_puts_attr((char_u *)"skipempty", attr); | |
| 4414 msg_putchar(' '); | |
| 4415 prev_skipempty = (kp->flags & HL_SKIPEMPTY); | |
| 4416 } | |
| 4417 } | |
| 4418 msg_outtrans(kp->keyword); | |
| 7 | 4419 } |
| 4420 } | |
| 4421 } | |
| 4422 } | |
| 4423 | |
| 4424 return did_header; | |
| 4425 } | |
| 4426 | |
| 4427 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4428 syn_clear_keyword(int id, hashtab_T *ht) |
| 134 | 4429 { |
| 4430 hashitem_T *hi; | |
| 4431 keyentry_T *kp; | |
| 4432 keyentry_T *kp_prev; | |
| 4433 keyentry_T *kp_next; | |
| 4434 int todo; | |
| 4435 | |
| 4436 hash_lock(ht); | |
| 835 | 4437 todo = (int)ht->ht_used; |
| 134 | 4438 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4439 { | |
| 4440 if (!HASHITEM_EMPTY(hi)) | |
| 4441 { | |
| 4442 --todo; | |
| 4443 kp_prev = NULL; | |
| 4444 for (kp = HI2KE(hi); kp != NULL; ) | |
| 7 | 4445 { |
| 134 | 4446 if (kp->k_syn.id == id) |
| 4447 { | |
| 4448 kp_next = kp->ke_next; | |
| 4449 if (kp_prev == NULL) | |
| 4450 { | |
| 4451 if (kp_next == NULL) | |
| 4452 hash_remove(ht, hi); | |
| 4453 else | |
| 4454 hi->hi_key = KE2HIKEY(kp_next); | |
| 4455 } | |
| 4456 else | |
| 4457 kp_prev->ke_next = kp_next; | |
| 4458 vim_free(kp->next_list); | |
| 4459 vim_free(kp->k_syn.cont_in_list); | |
| 4460 vim_free(kp); | |
| 4461 kp = kp_next; | |
| 4462 } | |
| 7 | 4463 else |
| 134 | 4464 { |
| 4465 kp_prev = kp; | |
| 4466 kp = kp->ke_next; | |
| 4467 } | |
| 7 | 4468 } |
| 134 | 4469 } |
| 4470 } | |
| 4471 hash_unlock(ht); | |
| 4472 } | |
| 4473 | |
| 4474 /* | |
| 4475 * Clear a whole keyword table. | |
| 7 | 4476 */ |
| 4477 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4478 clear_keywtab(hashtab_T *ht) |
| 134 | 4479 { |
| 4480 hashitem_T *hi; | |
| 4481 int todo; | |
| 4482 keyentry_T *kp; | |
| 4483 keyentry_T *kp_next; | |
| 4484 | |
| 835 | 4485 todo = (int)ht->ht_used; |
| 134 | 4486 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4487 { | |
| 4488 if (!HASHITEM_EMPTY(hi)) | |
| 4489 { | |
| 4490 --todo; | |
| 4491 for (kp = HI2KE(hi); kp != NULL; kp = kp_next) | |
| 7 | 4492 { |
| 134 | 4493 kp_next = kp->ke_next; |
| 4494 vim_free(kp->next_list); | |
| 4495 vim_free(kp->k_syn.cont_in_list); | |
| 4496 vim_free(kp); | |
| 7 | 4497 } |
| 134 | 4498 } |
| 4499 } | |
| 4500 hash_clear(ht); | |
| 4501 hash_init(ht); | |
| 7 | 4502 } |
| 4503 | |
| 4504 /* | |
| 4505 * Add a keyword to the list of keywords. | |
| 4506 */ | |
| 4507 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4508 add_keyword( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4509 char_u *name, /* name of keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4510 int id, /* group ID for this keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4511 int flags, /* flags for this keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4512 short *cont_in_list, /* containedin for this keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4513 short *next_list, /* nextgroup for this keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4514 int conceal_char) |
| 7 | 4515 { |
| 134 | 4516 keyentry_T *kp; |
| 4517 hashtab_T *ht; | |
| 4518 hashitem_T *hi; | |
| 154 | 4519 char_u *name_ic; |
| 134 | 4520 long_u hash; |
| 154 | 4521 char_u name_folded[MAXKEYWLEN + 1]; |
| 7 | 4522 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4523 if (curwin->w_s->b_syn_ic) |
| 154 | 4524 name_ic = str_foldcase(name, (int)STRLEN(name), |
| 4525 name_folded, MAXKEYWLEN + 1); | |
| 4526 else | |
| 4527 name_ic = name; | |
| 134 | 4528 kp = (keyentry_T *)alloc((int)(sizeof(keyentry_T) + STRLEN(name_ic))); |
| 4529 if (kp == NULL) | |
| 4530 return; | |
| 4531 STRCPY(kp->keyword, name_ic); | |
| 4532 kp->k_syn.id = id; | |
| 4533 kp->k_syn.inc_tag = current_syn_inc_tag; | |
| 4534 kp->flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4535 kp->k_char = conceal_char; |
| 134 | 4536 kp->k_syn.cont_in_list = copy_id_list(cont_in_list); |
| 4537 if (cont_in_list != NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4538 curwin->w_s->b_syn_containedin = TRUE; |
| 134 | 4539 kp->next_list = copy_id_list(next_list); |
| 4540 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4541 if (curwin->w_s->b_syn_ic) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4542 ht = &curwin->w_s->b_keywtab_ic; |
| 7 | 4543 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4544 ht = &curwin->w_s->b_keywtab; |
| 134 | 4545 |
| 4546 hash = hash_hash(kp->keyword); | |
| 4547 hi = hash_lookup(ht, kp->keyword, hash); | |
| 4548 if (HASHITEM_EMPTY(hi)) | |
| 4549 { | |
| 4550 /* new keyword, add to hashtable */ | |
| 4551 kp->ke_next = NULL; | |
| 4552 hash_add_item(ht, hi, kp->keyword, hash); | |
| 4553 } | |
| 4554 else | |
| 4555 { | |
| 4556 /* keyword already exists, prepend to list */ | |
| 4557 kp->ke_next = HI2KE(hi); | |
| 4558 hi->hi_key = KE2HIKEY(kp); | |
| 4559 } | |
| 7 | 4560 } |
| 4561 | |
| 4562 /* | |
| 4563 * Get the start and end of the group name argument. | |
| 4564 * Return a pointer to the first argument. | |
| 4565 * Return NULL if the end of the command was found instead of further args. | |
| 4566 */ | |
| 4567 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4568 get_group_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4569 char_u *arg, /* start of the argument */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4570 char_u **name_end) /* pointer to end of the name */ |
| 7 | 4571 { |
| 4572 char_u *rest; | |
| 4573 | |
| 4574 *name_end = skiptowhite(arg); | |
| 4575 rest = skipwhite(*name_end); | |
| 4576 | |
| 4577 /* | |
| 4578 * Check if there are enough arguments. The first argument may be a | |
| 4579 * pattern, where '|' is allowed, so only check for NUL. | |
| 4580 */ | |
| 4581 if (ends_excmd(*arg) || *rest == NUL) | |
| 4582 return NULL; | |
| 4583 return rest; | |
| 4584 } | |
| 4585 | |
| 4586 /* | |
| 4587 * Check for syntax command option arguments. | |
| 4588 * This can be called at any place in the list of arguments, and just picks | |
| 4589 * out the arguments that are known. Can be called several times in a row to | |
| 4590 * collect all options in between other arguments. | |
| 4591 * Return a pointer to the next argument (which isn't an option). | |
| 4592 * Return NULL for any error; | |
| 4593 */ | |
| 4594 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4595 get_syn_options( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4596 char_u *arg, /* next argument to be checked */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4597 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
|
4598 int *conceal_char UNUSED, |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4599 int skip) /* TRUE if skipping over command */ |
| 154 | 4600 { |
| 7 | 4601 char_u *gname_start, *gname; |
| 4602 int syn_id; | |
| 4603 int len; | |
| 154 | 4604 char *p; |
| 7 | 4605 int i; |
| 4606 int fidx; | |
| 4607 static struct flag | |
| 4608 { | |
| 4609 char *name; | |
| 154 | 4610 int argtype; |
| 4611 int flags; | |
| 4612 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED}, | |
| 4613 {"oOnNeElLiInNeE", 0, HL_ONELINE}, | |
| 4614 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND}, | |
| 4615 {"eExXtTeEnNdD", 0, HL_EXTEND}, | |
| 4616 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL}, | |
| 4617 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP}, | |
| 4618 {"sSkKiIpPnNlL", 0, HL_SKIPNL}, | |
| 4619 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE}, | |
| 4620 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY}, | |
| 4621 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE}, | |
| 4622 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE}, | |
| 4623 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY}, | |
| 4624 {"fFoOlLdD", 0, HL_FOLD}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4625 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4626 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4627 {"cCcChHaArR", 11, 0}, |
| 154 | 4628 {"cCoOnNtTaAiInNsS", 1, 0}, |
| 4629 {"cCoOnNtTaAiInNeEdDiInN", 2, 0}, | |
| 4630 {"nNeExXtTgGrRoOuUpP", 3, 0}, | |
| 7 | 4631 }; |
| 154 | 4632 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN"; |
| 7 | 4633 |
| 4634 if (arg == NULL) /* already detected error */ | |
| 4635 return NULL; | |
| 4636 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4637 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4638 if (curwin->w_s->b_syn_conceal) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4639 opt->flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4640 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4641 |
| 7 | 4642 for (;;) |
| 4643 { | |
| 154 | 4644 /* |
| 4645 * This is used very often when a large number of keywords is defined. | |
| 4646 * Need to skip quickly when no option name is found. | |
| 4647 * Also avoid tolower(), it's slow. | |
| 4648 */ | |
| 4649 if (strchr(first_letters, *arg) == NULL) | |
| 4650 break; | |
| 7 | 4651 |
| 4652 for (fidx = sizeof(flagtab) / sizeof(struct flag); --fidx >= 0; ) | |
| 4653 { | |
| 154 | 4654 p = flagtab[fidx].name; |
| 4655 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len) | |
| 4656 if (arg[len] != p[i] && arg[len] != p[i + 1]) | |
| 4657 break; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4658 if (p[i] == NUL && (VIM_ISWHITE(arg[len]) |
| 154 | 4659 || (flagtab[fidx].argtype > 0 |
| 4660 ? arg[len] == '=' | |
| 4661 : ends_excmd(arg[len])))) | |
| 7 | 4662 { |
| 154 | 4663 if (opt->keyword |
| 4664 && (flagtab[fidx].flags == HL_DISPLAY | |
| 4665 || flagtab[fidx].flags == HL_FOLD | |
| 4666 || flagtab[fidx].flags == HL_EXTEND)) | |
| 7 | 4667 /* treat "display", "fold" and "extend" as a keyword */ |
| 4668 fidx = -1; | |
| 4669 break; | |
| 4670 } | |
| 4671 } | |
| 154 | 4672 if (fidx < 0) /* no match found */ |
| 4673 break; | |
| 4674 | |
| 4675 if (flagtab[fidx].argtype == 1) | |
| 4676 { | |
| 4677 if (!opt->has_cont_list) | |
| 7 | 4678 { |
| 4679 EMSG(_("E395: contains argument not accepted here")); | |
| 4680 return NULL; | |
| 4681 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4682 if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL) |
| 7 | 4683 return NULL; |
| 4684 } | |
| 154 | 4685 else if (flagtab[fidx].argtype == 2) |
| 4686 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4687 if (get_id_list(&arg, 11, &opt->cont_in_list, skip) == FAIL) |
| 7 | 4688 return NULL; |
| 4689 } | |
| 154 | 4690 else if (flagtab[fidx].argtype == 3) |
| 4691 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4692 if (get_id_list(&arg, 9, &opt->next_list, skip) == FAIL) |
| 7 | 4693 return NULL; |
| 4694 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4695 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
|
4696 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4697 #ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4698 /* cchar=? */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4699 if (has_mbyte) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4700 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4701 # ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4702 *conceal_char = mb_ptr2char(arg + 6); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4703 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4704 arg += mb_ptr2len(arg + 6) - 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4705 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4706 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4707 #endif |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4708 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4709 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4710 *conceal_char = arg[6]; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4711 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4712 ; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4713 #endif |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4714 } |
| 2686 | 4715 #ifdef FEAT_CONCEAL |
| 4716 if (!vim_isprintc_strict(*conceal_char)) | |
| 4717 { | |
| 4718 EMSG(_("E844: invalid cchar value")); | |
| 4719 return NULL; | |
| 4720 } | |
| 4721 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4722 arg = skipwhite(arg + 7); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4723 } |
| 7 | 4724 else |
| 154 | 4725 { |
| 4726 opt->flags |= flagtab[fidx].flags; | |
| 4727 arg = skipwhite(arg + len); | |
| 4728 | |
| 4729 if (flagtab[fidx].flags == HL_SYNC_HERE | |
| 4730 || flagtab[fidx].flags == HL_SYNC_THERE) | |
| 4731 { | |
| 4732 if (opt->sync_idx == NULL) | |
| 4733 { | |
| 4734 EMSG(_("E393: group[t]here not accepted here")); | |
| 4735 return NULL; | |
| 4736 } | |
| 4737 gname_start = arg; | |
| 4738 arg = skiptowhite(arg); | |
| 4739 if (gname_start == arg) | |
| 4740 return NULL; | |
| 4741 gname = vim_strnsave(gname_start, (int)(arg - gname_start)); | |
| 4742 if (gname == NULL) | |
| 4743 return NULL; | |
| 4744 if (STRCMP(gname, "NONE") == 0) | |
| 4745 *opt->sync_idx = NONE_IDX; | |
| 4746 else | |
| 4747 { | |
| 4748 syn_id = syn_name2id(gname); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4749 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
|
4750 if (SYN_ITEMS(curwin->w_s)[i].sp_syn.id == syn_id |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4751 && SYN_ITEMS(curwin->w_s)[i].sp_type == SPTYPE_START) |
| 154 | 4752 { |
| 4753 *opt->sync_idx = i; | |
| 4754 break; | |
| 4755 } | |
| 4756 if (i < 0) | |
| 4757 { | |
| 4758 EMSG2(_("E394: Didn't find region item for %s"), gname); | |
| 4759 vim_free(gname); | |
| 4760 return NULL; | |
| 4761 } | |
| 4762 } | |
| 4763 | |
| 4764 vim_free(gname); | |
| 4765 arg = skipwhite(arg); | |
| 4766 } | |
| 4767 #ifdef FEAT_FOLDING | |
| 4768 else if (flagtab[fidx].flags == HL_FOLD | |
| 4769 && foldmethodIsSyntax(curwin)) | |
| 4770 /* Need to update folds later. */ | |
| 4771 foldUpdateAll(curwin); | |
| 4772 #endif | |
| 4773 } | |
| 4774 } | |
| 7 | 4775 |
| 4776 return arg; | |
| 4777 } | |
| 4778 | |
| 4779 /* | |
| 4780 * Adjustments to syntax item when declared in a ":syn include"'d file. | |
| 4781 * Set the contained flag, and if the item is not already contained, add it | |
| 4782 * to the specified top-level group, if any. | |
| 4783 */ | |
| 4784 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4785 syn_incl_toplevel(int id, int *flagsp) |
| 7 | 4786 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4787 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0) |
| 7 | 4788 return; |
| 4789 *flagsp |= HL_CONTAINED; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4790 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) |
| 7 | 4791 { |
| 4792 /* We have to alloc this, because syn_combine_list() will free it. */ | |
| 4793 short *grp_list = (short *)alloc((unsigned)(2 * sizeof(short))); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4794 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER; |
| 7 | 4795 |
| 4796 if (grp_list != NULL) | |
| 4797 { | |
| 4798 grp_list[0] = id; | |
| 4799 grp_list[1] = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4800 syn_combine_list(&SYN_CLSTR(curwin->w_s)[tlg_id].scl_list, &grp_list, |
| 7 | 4801 CLUSTER_ADD); |
| 4802 } | |
| 4803 } | |
| 4804 } | |
| 4805 | |
| 4806 /* | |
| 4807 * Handle ":syntax include [@{group-name}] filename" command. | |
| 4808 */ | |
| 4809 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4810 syn_cmd_include(exarg_T *eap, int syncing UNUSED) |
| 7 | 4811 { |
| 4812 char_u *arg = eap->arg; | |
| 4813 int sgl_id = 1; | |
| 4814 char_u *group_name_end; | |
| 4815 char_u *rest; | |
| 4816 char_u *errormsg = NULL; | |
| 4817 int prev_toplvl_grp; | |
| 4818 int prev_syn_inc_tag; | |
| 4819 int source = FALSE; | |
| 4820 | |
| 4821 eap->nextcmd = find_nextcmd(arg); | |
| 4822 if (eap->skip) | |
| 4823 return; | |
| 4824 | |
| 4825 if (arg[0] == '@') | |
| 4826 { | |
| 4827 ++arg; | |
| 4828 rest = get_group_name(arg, &group_name_end); | |
| 4829 if (rest == NULL) | |
| 4830 { | |
| 4831 EMSG((char_u *)_("E397: Filename required")); | |
| 4832 return; | |
| 4833 } | |
| 4834 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); | |
| 2743 | 4835 if (sgl_id == 0) |
| 4836 return; | |
| 7 | 4837 /* separate_nextcmd() and expand_filename() depend on this */ |
| 4838 eap->arg = rest; | |
| 4839 } | |
| 4840 | |
| 4841 /* | |
| 4842 * Everything that's left, up to the next command, should be the | |
| 4843 * filename to include. | |
| 4844 */ | |
| 4845 eap->argt |= (XFILE | NOSPC); | |
| 4846 separate_nextcmd(eap); | |
| 4847 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg)) | |
| 4848 { | |
| 4849 /* For an absolute path, "$VIM/..." or "<sfile>.." we ":source" the | |
| 4850 * file. Need to expand the file name first. In other cases | |
| 4851 * ":runtime!" is used. */ | |
| 4852 source = TRUE; | |
| 4853 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL) | |
| 4854 { | |
| 4855 if (errormsg != NULL) | |
| 4856 EMSG(errormsg); | |
| 4857 return; | |
| 4858 } | |
| 4859 } | |
| 4860 | |
| 4861 /* | |
| 4862 * Save and restore the existing top-level grouplist id and ":syn | |
| 4863 * include" tag around the actual inclusion. | |
| 4864 */ | |
| 2743 | 4865 if (running_syn_inc_tag >= MAX_SYN_INC_TAG) |
| 4866 { | |
| 4867 EMSG((char_u *)_("E847: Too many syntax includes")); | |
| 4868 return; | |
| 4869 } | |
| 7 | 4870 prev_syn_inc_tag = current_syn_inc_tag; |
| 4871 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
|
4872 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
|
4873 curwin->w_s->b_syn_topgrp = sgl_id; |
| 1299 | 4874 if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
8514
diff
changeset
|
4875 : source_runtime(eap->arg, DIP_ALL) == FAIL) |
| 7 | 4876 EMSG2(_(e_notopen), eap->arg); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4877 curwin->w_s->b_syn_topgrp = prev_toplvl_grp; |
| 7 | 4878 current_syn_inc_tag = prev_syn_inc_tag; |
| 4879 } | |
| 4880 | |
| 4881 /* | |
| 4882 * Handle ":syntax keyword {group-name} [{option}] keyword .." command. | |
| 4883 */ | |
| 4884 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4885 syn_cmd_keyword(exarg_T *eap, int syncing UNUSED) |
| 7 | 4886 { |
| 4887 char_u *arg = eap->arg; | |
| 4888 char_u *group_name_end; | |
| 4889 int syn_id; | |
| 4890 char_u *rest; | |
| 2743 | 4891 char_u *keyword_copy = NULL; |
| 7 | 4892 char_u *p; |
| 154 | 4893 char_u *kw; |
| 4894 syn_opt_arg_T syn_opt_arg; | |
| 4895 int cnt; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4896 int conceal_char = NUL; |
| 7 | 4897 |
| 4898 rest = get_group_name(arg, &group_name_end); | |
| 4899 | |
| 4900 if (rest != NULL) | |
| 4901 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4902 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
|
4903 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
|
4904 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4905 syn_id = syn_check_group(arg, (int)(group_name_end - arg)); |
| 2743 | 4906 if (syn_id != 0) |
| 4907 /* allocate a buffer, for removing backslashes in the keyword */ | |
| 4908 keyword_copy = alloc((unsigned)STRLEN(rest) + 1); | |
| 7 | 4909 if (keyword_copy != NULL) |
| 4910 { | |
| 154 | 4911 syn_opt_arg.flags = 0; |
| 4912 syn_opt_arg.keyword = TRUE; | |
| 4913 syn_opt_arg.sync_idx = NULL; | |
| 4914 syn_opt_arg.has_cont_list = FALSE; | |
| 4915 syn_opt_arg.cont_in_list = NULL; | |
| 4916 syn_opt_arg.next_list = NULL; | |
| 4917 | |
| 7 | 4918 /* |
| 4919 * The options given apply to ALL keywords, so all options must be | |
| 4920 * found before keywords can be created. | |
| 154 | 4921 * 1: collect the options and copy the keywords to keyword_copy. |
| 7 | 4922 */ |
| 154 | 4923 cnt = 0; |
| 4924 p = keyword_copy; | |
| 4925 for ( ; rest != NULL && !ends_excmd(*rest); rest = skipwhite(rest)) | |
| 7 | 4926 { |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4927 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
|
4928 eap->skip); |
| 154 | 4929 if (rest == NULL || ends_excmd(*rest)) |
| 4930 break; | |
| 4931 /* 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
|
4932 while (*rest != NUL && !VIM_ISWHITE(*rest)) |
| 154 | 4933 { |
| 4934 if (*rest == '\\' && rest[1] != NUL) | |
| 4935 ++rest; | |
| 4936 *p++ = *rest++; | |
| 4937 } | |
| 4938 *p++ = NUL; | |
| 4939 ++cnt; | |
| 4940 } | |
| 4941 | |
| 4942 if (!eap->skip) | |
| 4943 { | |
| 4944 /* Adjust flags for use of ":syn include". */ | |
| 4945 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); | |
| 4946 | |
| 7 | 4947 /* |
| 154 | 4948 * 2: Add an entry for each keyword. |
| 7 | 4949 */ |
| 154 | 4950 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1) |
| 7 | 4951 { |
| 154 | 4952 for (p = vim_strchr(kw, '['); ; ) |
| 7 | 4953 { |
| 154 | 4954 if (p != NULL) |
| 4955 *p = NUL; | |
| 4956 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
|
4957 syn_opt_arg.cont_in_list, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4958 syn_opt_arg.next_list, conceal_char); |
| 168 | 4959 if (p == NULL) |
| 4960 break; | |
| 4961 if (p[1] == NUL) | |
| 4962 { | |
| 838 | 4963 EMSG2(_("E789: Missing ']': %s"), kw); |
| 7017 | 4964 goto error; |
| 168 | 4965 } |
| 4966 if (p[1] == ']') | |
| 4967 { | |
| 7017 | 4968 if (p[2] != NUL) |
| 4969 { | |
| 4970 EMSG3(_("E890: trailing char after ']': %s]%s"), | |
| 4971 kw, &p[2]); | |
| 4972 goto error; | |
| 4973 } | |
| 168 | 4974 kw = p + 1; /* skip over the "]" */ |
| 4975 break; | |
| 4976 } | |
| 154 | 4977 #ifdef FEAT_MBYTE |
| 4978 if (has_mbyte) | |
| 7 | 4979 { |
| 474 | 4980 int l = (*mb_ptr2len)(p + 1); |
| 154 | 4981 |
| 4982 mch_memmove(p, p + 1, l); | |
| 4983 p += l; | |
| 4984 } | |
| 4985 else | |
| 7 | 4986 #endif |
| 154 | 4987 { |
| 4988 p[0] = p[1]; | |
| 4989 ++p; | |
| 7 | 4990 } |
| 4991 } | |
| 4992 } | |
| 4993 } | |
| 7017 | 4994 error: |
| 7 | 4995 vim_free(keyword_copy); |
| 168 | 4996 vim_free(syn_opt_arg.cont_in_list); |
| 4997 vim_free(syn_opt_arg.next_list); | |
| 7 | 4998 } |
| 4999 } | |
| 5000 | |
| 5001 if (rest != NULL) | |
| 5002 eap->nextcmd = check_nextcmd(rest); | |
| 5003 else | |
| 5004 EMSG2(_(e_invarg2), arg); | |
| 5005 | |
| 745 | 5006 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5007 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5008 } |
| 5009 | |
| 5010 /* | |
| 5011 * Handle ":syntax match {name} [{options}] {pattern} [{options}]". | |
| 5012 * | |
| 5013 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .." | |
| 5014 */ | |
| 5015 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5016 syn_cmd_match( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5017 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5018 int syncing) /* TRUE for ":syntax sync match .. " */ |
| 7 | 5019 { |
| 5020 char_u *arg = eap->arg; | |
| 5021 char_u *group_name_end; | |
| 5022 char_u *rest; | |
| 5023 synpat_T item; /* the item found in the line */ | |
| 5024 int syn_id; | |
| 5025 int idx; | |
| 154 | 5026 syn_opt_arg_T syn_opt_arg; |
| 7 | 5027 int sync_idx = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5028 int conceal_char = NUL; |
| 7 | 5029 |
| 5030 /* Isolate the group name, check for validity */ | |
| 5031 rest = get_group_name(arg, &group_name_end); | |
| 5032 | |
| 5033 /* Get options before the pattern */ | |
| 154 | 5034 syn_opt_arg.flags = 0; |
| 5035 syn_opt_arg.keyword = FALSE; | |
| 5036 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL; | |
| 5037 syn_opt_arg.has_cont_list = TRUE; | |
| 5038 syn_opt_arg.cont_list = NULL; | |
| 5039 syn_opt_arg.cont_in_list = NULL; | |
| 5040 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
|
5041 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5042 |
| 5043 /* get the pattern. */ | |
| 5044 init_syn_patterns(); | |
| 5045 vim_memset(&item, 0, sizeof(item)); | |
| 5046 rest = get_syn_pattern(rest, &item); | |
| 154 | 5047 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 5048 syn_opt_arg.flags |= HL_HAS_EOL; | |
| 7 | 5049 |
| 5050 /* 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
|
5051 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5052 |
| 5053 if (rest != NULL) /* all arguments are valid */ | |
| 5054 { | |
| 5055 /* | |
| 5056 * Check for trailing command and illegal trailing arguments. | |
| 5057 */ | |
| 5058 eap->nextcmd = check_nextcmd(rest); | |
| 5059 if (!ends_excmd(*rest) || eap->skip) | |
| 5060 rest = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5061 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL |
| 7 | 5062 && (syn_id = syn_check_group(arg, |
| 5063 (int)(group_name_end - arg))) != 0) | |
| 5064 { | |
| 154 | 5065 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 5066 /* |
| 5067 * Store the pattern in the syn_items list | |
| 5068 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5069 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
|
5070 SYN_ITEMS(curwin->w_s)[idx] = item; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5071 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
|
5072 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
|
5073 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
|
5074 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
|
5075 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
|
5076 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
|
5077 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
|
5078 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 5079 syn_opt_arg.cont_in_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5080 #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
|
5081 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
|
5082 #endif |
| 154 | 5083 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
|
5084 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5085 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
|
5086 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5087 |
| 5088 /* remember that we found a match for syncing on */ | |
| 154 | 5089 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
|
5090 curwin->w_s->b_syn_sync_flags |= SF_MATCH; |
| 7 | 5091 #ifdef FEAT_FOLDING |
| 154 | 5092 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
|
5093 ++curwin->w_s->b_syn_folditems; |
| 7 | 5094 #endif |
| 5095 | |
| 745 | 5096 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5097 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5098 return; /* don't free the progs and patterns now */ |
| 5099 } | |
| 5100 } | |
| 5101 | |
| 5102 /* | |
| 5103 * Something failed, free the allocated memory. | |
| 5104 */ | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5105 vim_regfree(item.sp_prog); |
| 7 | 5106 vim_free(item.sp_pattern); |
| 154 | 5107 vim_free(syn_opt_arg.cont_list); |
| 5108 vim_free(syn_opt_arg.cont_in_list); | |
| 5109 vim_free(syn_opt_arg.next_list); | |
| 7 | 5110 |
| 5111 if (rest == NULL) | |
| 5112 EMSG2(_(e_invarg2), arg); | |
| 5113 } | |
| 5114 | |
| 5115 /* | |
| 5116 * Handle ":syntax region {group-name} [matchgroup={group-name}] | |
| 5117 * start {start} .. [skip {skip}] end {end} .. [{options}]". | |
| 5118 */ | |
| 5119 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5120 syn_cmd_region( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5121 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5122 int syncing) /* TRUE for ":syntax sync region .." */ |
| 7 | 5123 { |
| 5124 char_u *arg = eap->arg; | |
| 5125 char_u *group_name_end; | |
| 5126 char_u *rest; /* next arg, NULL on error */ | |
| 5127 char_u *key_end; | |
| 5128 char_u *key = NULL; | |
| 5129 char_u *p; | |
| 5130 int item; | |
| 5131 #define ITEM_START 0 | |
| 5132 #define ITEM_SKIP 1 | |
| 5133 #define ITEM_END 2 | |
| 5134 #define ITEM_MATCHGROUP 3 | |
| 5135 struct pat_ptr | |
| 5136 { | |
| 5137 synpat_T *pp_synp; /* pointer to syn_pattern */ | |
| 5138 int pp_matchgroup_id; /* matchgroup ID */ | |
| 5139 struct pat_ptr *pp_next; /* pointer to next pat_ptr */ | |
| 5140 } *(pat_ptrs[3]); | |
| 5141 /* patterns found in the line */ | |
| 5142 struct pat_ptr *ppp; | |
| 5143 struct pat_ptr *ppp_next; | |
| 5144 int pat_count = 0; /* nr of syn_patterns found */ | |
| 5145 int syn_id; | |
| 5146 int matchgroup_id = 0; | |
| 5147 int not_enough = FALSE; /* not enough arguments */ | |
| 5148 int illegal = FALSE; /* illegal arguments */ | |
| 5149 int success = FALSE; | |
| 5150 int idx; | |
| 154 | 5151 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
|
5152 int conceal_char = NUL; |
| 7 | 5153 |
| 5154 /* Isolate the group name, check for validity */ | |
| 5155 rest = get_group_name(arg, &group_name_end); | |
| 5156 | |
| 5157 pat_ptrs[0] = NULL; | |
| 5158 pat_ptrs[1] = NULL; | |
| 5159 pat_ptrs[2] = NULL; | |
| 5160 | |
| 5161 init_syn_patterns(); | |
| 5162 | |
| 154 | 5163 syn_opt_arg.flags = 0; |
| 5164 syn_opt_arg.keyword = FALSE; | |
| 5165 syn_opt_arg.sync_idx = NULL; | |
| 5166 syn_opt_arg.has_cont_list = TRUE; | |
| 5167 syn_opt_arg.cont_list = NULL; | |
| 5168 syn_opt_arg.cont_in_list = NULL; | |
| 5169 syn_opt_arg.next_list = NULL; | |
| 5170 | |
| 7 | 5171 /* |
| 5172 * get the options, patterns and matchgroup. | |
| 5173 */ | |
| 5174 while (rest != NULL && !ends_excmd(*rest)) | |
| 5175 { | |
| 5176 /* 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
|
5177 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5178 if (rest == NULL || ends_excmd(*rest)) |
| 5179 break; | |
| 5180 | |
| 5181 /* must be a pattern or matchgroup then */ | |
| 5182 key_end = rest; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5183 while (*key_end && !VIM_ISWHITE(*key_end) && *key_end != '=') |
| 7 | 5184 ++key_end; |
| 5185 vim_free(key); | |
| 5186 key = vim_strnsave_up(rest, (int)(key_end - rest)); | |
| 5187 if (key == NULL) /* out of memory */ | |
| 5188 { | |
| 5189 rest = NULL; | |
| 5190 break; | |
| 5191 } | |
| 5192 if (STRCMP(key, "MATCHGROUP") == 0) | |
| 5193 item = ITEM_MATCHGROUP; | |
| 5194 else if (STRCMP(key, "START") == 0) | |
| 5195 item = ITEM_START; | |
| 5196 else if (STRCMP(key, "END") == 0) | |
| 5197 item = ITEM_END; | |
| 5198 else if (STRCMP(key, "SKIP") == 0) | |
| 5199 { | |
| 5200 if (pat_ptrs[ITEM_SKIP] != NULL) /* one skip pattern allowed */ | |
| 5201 { | |
| 5202 illegal = TRUE; | |
| 5203 break; | |
| 5204 } | |
| 5205 item = ITEM_SKIP; | |
| 5206 } | |
| 5207 else | |
| 5208 break; | |
| 5209 rest = skipwhite(key_end); | |
| 5210 if (*rest != '=') | |
| 5211 { | |
| 5212 rest = NULL; | |
| 5213 EMSG2(_("E398: Missing '=': %s"), arg); | |
| 5214 break; | |
| 5215 } | |
| 5216 rest = skipwhite(rest + 1); | |
| 5217 if (*rest == NUL) | |
| 5218 { | |
| 5219 not_enough = TRUE; | |
| 5220 break; | |
| 5221 } | |
| 5222 | |
| 5223 if (item == ITEM_MATCHGROUP) | |
| 5224 { | |
| 5225 p = skiptowhite(rest); | |
| 5226 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip) | |
| 5227 matchgroup_id = 0; | |
| 5228 else | |
| 5229 { | |
| 5230 matchgroup_id = syn_check_group(rest, (int)(p - rest)); | |
| 5231 if (matchgroup_id == 0) | |
| 5232 { | |
| 5233 illegal = TRUE; | |
| 5234 break; | |
| 5235 } | |
| 5236 } | |
| 5237 rest = skipwhite(p); | |
| 5238 } | |
| 5239 else | |
| 5240 { | |
| 5241 /* | |
| 5242 * Allocate room for a syn_pattern, and link it in the list of | |
| 5243 * syn_patterns for this item, at the start (because the list is | |
| 5244 * used from end to start). | |
| 5245 */ | |
| 5246 ppp = (struct pat_ptr *)alloc((unsigned)sizeof(struct pat_ptr)); | |
| 5247 if (ppp == NULL) | |
| 5248 { | |
| 5249 rest = NULL; | |
| 5250 break; | |
| 5251 } | |
| 5252 ppp->pp_next = pat_ptrs[item]; | |
| 5253 pat_ptrs[item] = ppp; | |
| 5254 ppp->pp_synp = (synpat_T *)alloc_clear((unsigned)sizeof(synpat_T)); | |
| 5255 if (ppp->pp_synp == NULL) | |
| 5256 { | |
| 5257 rest = NULL; | |
| 5258 break; | |
| 5259 } | |
| 5260 | |
| 5261 /* | |
| 5262 * Get the syntax pattern and the following offset(s). | |
| 5263 */ | |
| 5264 /* Enable the appropriate \z specials. */ | |
| 5265 if (item == ITEM_START) | |
| 5266 reg_do_extmatch = REX_SET; | |
| 5267 else if (item == ITEM_SKIP || item == ITEM_END) | |
| 5268 reg_do_extmatch = REX_USE; | |
| 5269 rest = get_syn_pattern(rest, ppp->pp_synp); | |
| 5270 reg_do_extmatch = 0; | |
| 5271 if (item == ITEM_END && vim_regcomp_had_eol() | |
| 154 | 5272 && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 7 | 5273 ppp->pp_synp->sp_flags |= HL_HAS_EOL; |
| 5274 ppp->pp_matchgroup_id = matchgroup_id; | |
| 5275 ++pat_count; | |
| 5276 } | |
| 5277 } | |
| 5278 vim_free(key); | |
| 5279 if (illegal || not_enough) | |
| 5280 rest = NULL; | |
| 5281 | |
| 5282 /* | |
| 5283 * Must have a "start" and "end" pattern. | |
| 5284 */ | |
| 5285 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL || | |
| 5286 pat_ptrs[ITEM_END] == NULL)) | |
| 5287 { | |
| 5288 not_enough = TRUE; | |
| 5289 rest = NULL; | |
| 5290 } | |
| 5291 | |
| 5292 if (rest != NULL) | |
| 5293 { | |
| 5294 /* | |
| 5295 * Check for trailing garbage or command. | |
| 5296 * If OK, add the item. | |
| 5297 */ | |
| 5298 eap->nextcmd = check_nextcmd(rest); | |
| 5299 if (!ends_excmd(*rest) || eap->skip) | |
| 5300 rest = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5301 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL |
| 7 | 5302 && (syn_id = syn_check_group(arg, |
| 5303 (int)(group_name_end - arg))) != 0) | |
| 5304 { | |
| 154 | 5305 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 5306 /* |
| 5307 * Store the start/skip/end in the syn_items list | |
| 5308 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5309 idx = curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5310 for (item = ITEM_START; item <= ITEM_END; ++item) |
| 5311 { | |
| 5312 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next) | |
| 5313 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5314 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
|
5315 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
|
5316 SYN_ITEMS(curwin->w_s)[idx].sp_type = |
| 7 | 5317 (item == ITEM_START) ? SPTYPE_START : |
| 5318 (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
|
5319 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
|
5320 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id; |
| 2743 | 5321 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = |
| 5322 current_syn_inc_tag; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5323 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id = |
| 7 | 5324 ppp->pp_matchgroup_id; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5325 #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
|
5326 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
|
5327 #endif |
| 7 | 5328 if (item == ITEM_START) |
| 5329 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5330 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list = |
| 154 | 5331 syn_opt_arg.cont_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5332 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 5333 syn_opt_arg.cont_in_list; |
| 5334 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
|
5335 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5336 SYN_ITEMS(curwin->w_s)[idx].sp_next_list = |
| 154 | 5337 syn_opt_arg.next_list; |
| 7 | 5338 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5339 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5340 ++idx; |
| 5341 #ifdef FEAT_FOLDING | |
| 154 | 5342 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
|
5343 ++curwin->w_s->b_syn_folditems; |
| 7 | 5344 #endif |
| 5345 } | |
| 5346 } | |
| 5347 | |
| 745 | 5348 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5349 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5350 success = TRUE; /* don't free the progs and patterns now */ |
| 5351 } | |
| 5352 } | |
| 5353 | |
| 5354 /* | |
| 5355 * Free the allocated memory. | |
| 5356 */ | |
| 5357 for (item = ITEM_START; item <= ITEM_END; ++item) | |
| 5358 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next) | |
| 5359 { | |
| 5360 if (!success) | |
| 5361 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5362 vim_regfree(ppp->pp_synp->sp_prog); |
| 7 | 5363 vim_free(ppp->pp_synp->sp_pattern); |
| 5364 } | |
| 5365 vim_free(ppp->pp_synp); | |
| 5366 ppp_next = ppp->pp_next; | |
| 5367 vim_free(ppp); | |
| 5368 } | |
| 5369 | |
| 5370 if (!success) | |
| 5371 { | |
| 154 | 5372 vim_free(syn_opt_arg.cont_list); |
| 5373 vim_free(syn_opt_arg.cont_in_list); | |
| 5374 vim_free(syn_opt_arg.next_list); | |
| 7 | 5375 if (not_enough) |
| 5376 EMSG2(_("E399: Not enough arguments: syntax region %s"), arg); | |
| 5377 else if (illegal || rest == NULL) | |
| 5378 EMSG2(_(e_invarg2), arg); | |
| 5379 } | |
| 5380 } | |
| 5381 | |
| 5382 /* | |
| 5383 * A simple syntax group ID comparison function suitable for use in qsort() | |
| 5384 */ | |
| 5385 static int | |
| 5386 #ifdef __BORLANDC__ | |
| 5387 _RTLENTRYF | |
| 5388 #endif | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5389 syn_compare_stub(const void *v1, const void *v2) |
| 7 | 5390 { |
| 5391 const short *s1 = v1; | |
| 5392 const short *s2 = v2; | |
| 5393 | |
| 5394 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0); | |
| 5395 } | |
| 5396 | |
| 5397 /* | |
| 5398 * Combines lists of syntax clusters. | |
| 5399 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed. | |
| 5400 */ | |
| 5401 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5402 syn_combine_list(short **clstr1, short **clstr2, int list_op) |
| 7 | 5403 { |
| 5404 int count1 = 0; | |
| 5405 int count2 = 0; | |
| 5406 short *g1; | |
| 5407 short *g2; | |
| 5408 short *clstr = NULL; | |
| 5409 int count; | |
| 5410 int round; | |
| 5411 | |
| 5412 /* | |
| 5413 * Handle degenerate cases. | |
| 5414 */ | |
| 5415 if (*clstr2 == NULL) | |
| 5416 return; | |
| 5417 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE) | |
| 5418 { | |
| 5419 if (list_op == CLUSTER_REPLACE) | |
| 5420 vim_free(*clstr1); | |
| 5421 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD) | |
| 5422 *clstr1 = *clstr2; | |
| 5423 else | |
| 5424 vim_free(*clstr2); | |
| 5425 return; | |
| 5426 } | |
| 5427 | |
| 5428 for (g1 = *clstr1; *g1; g1++) | |
| 5429 ++count1; | |
| 5430 for (g2 = *clstr2; *g2; g2++) | |
| 5431 ++count2; | |
| 5432 | |
| 5433 /* | |
| 5434 * For speed purposes, sort both lists. | |
| 5435 */ | |
| 5436 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub); | |
| 5437 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub); | |
| 5438 | |
| 5439 /* | |
| 5440 * We proceed in two passes; in round 1, we count the elements to place | |
| 5441 * in the new list, and in round 2, we allocate and populate the new | |
| 5442 * list. For speed, we use a mergesort-like method, adding the smaller | |
| 5443 * of the current elements in each list to the new list. | |
| 5444 */ | |
| 5445 for (round = 1; round <= 2; round++) | |
| 5446 { | |
| 5447 g1 = *clstr1; | |
| 5448 g2 = *clstr2; | |
| 5449 count = 0; | |
| 5450 | |
| 5451 /* | |
| 5452 * First, loop through the lists until one of them is empty. | |
| 5453 */ | |
| 5454 while (*g1 && *g2) | |
| 5455 { | |
| 5456 /* | |
| 5457 * We always want to add from the first list. | |
| 5458 */ | |
| 5459 if (*g1 < *g2) | |
| 5460 { | |
| 5461 if (round == 2) | |
| 5462 clstr[count] = *g1; | |
| 5463 count++; | |
| 5464 g1++; | |
| 5465 continue; | |
| 5466 } | |
| 5467 /* | |
| 5468 * We only want to add from the second list if we're adding the | |
| 5469 * lists. | |
| 5470 */ | |
| 5471 if (list_op == CLUSTER_ADD) | |
| 5472 { | |
| 5473 if (round == 2) | |
| 5474 clstr[count] = *g2; | |
| 5475 count++; | |
| 5476 } | |
| 5477 if (*g1 == *g2) | |
| 5478 g1++; | |
| 5479 g2++; | |
| 5480 } | |
| 5481 | |
| 5482 /* | |
| 5483 * Now add the leftovers from whichever list didn't get finished | |
| 5484 * first. As before, we only want to add from the second list if | |
| 5485 * we're adding the lists. | |
| 5486 */ | |
| 5487 for (; *g1; g1++, count++) | |
| 5488 if (round == 2) | |
| 5489 clstr[count] = *g1; | |
| 5490 if (list_op == CLUSTER_ADD) | |
| 5491 for (; *g2; g2++, count++) | |
| 5492 if (round == 2) | |
| 5493 clstr[count] = *g2; | |
| 5494 | |
| 5495 if (round == 1) | |
| 5496 { | |
| 5497 /* | |
| 5498 * If the group ended up empty, we don't need to allocate any | |
| 5499 * space for it. | |
| 5500 */ | |
| 5501 if (count == 0) | |
| 5502 { | |
| 5503 clstr = NULL; | |
| 5504 break; | |
| 5505 } | |
| 5506 clstr = (short *)alloc((unsigned)((count + 1) * sizeof(short))); | |
| 5507 if (clstr == NULL) | |
| 5508 break; | |
| 5509 clstr[count] = 0; | |
| 5510 } | |
| 5511 } | |
| 5512 | |
| 5513 /* | |
| 5514 * Finally, put the new list in place. | |
| 5515 */ | |
| 5516 vim_free(*clstr1); | |
| 5517 vim_free(*clstr2); | |
| 5518 *clstr1 = clstr; | |
| 5519 } | |
| 5520 | |
| 5521 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5522 * Lookup a syntax cluster name and return its ID. |
| 7 | 5523 * If it is not found, 0 is returned. |
| 5524 */ | |
| 5525 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5526 syn_scl_name2id(char_u *name) |
| 7 | 5527 { |
| 5528 int i; | |
| 5529 char_u *name_u; | |
| 5530 | |
| 5531 /* Avoid using stricmp() too much, it's slow on some systems */ | |
| 5532 name_u = vim_strsave_up(name); | |
| 5533 if (name_u == NULL) | |
| 5534 return 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5535 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
|
5536 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
|
5537 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0) |
| 7 | 5538 break; |
| 5539 vim_free(name_u); | |
| 5540 return (i < 0 ? 0 : i + SYNID_CLUSTER); | |
| 5541 } | |
| 5542 | |
| 5543 /* | |
| 5544 * Like syn_scl_name2id(), but take a pointer + length argument. | |
| 5545 */ | |
| 5546 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5547 syn_scl_namen2id(char_u *linep, int len) |
| 7 | 5548 { |
| 5549 char_u *name; | |
| 5550 int id = 0; | |
| 5551 | |
| 5552 name = vim_strnsave(linep, len); | |
| 5553 if (name != NULL) | |
| 5554 { | |
| 5555 id = syn_scl_name2id(name); | |
| 5556 vim_free(name); | |
| 5557 } | |
| 5558 return id; | |
| 5559 } | |
| 5560 | |
| 5561 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5562 * Find syntax cluster name in the table and return its ID. |
| 7 | 5563 * The argument is a pointer to the name and the length of the name. |
| 5564 * If it doesn't exist yet, a new entry is created. | |
| 5565 * Return 0 for failure. | |
| 5566 */ | |
| 5567 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5568 syn_check_cluster(char_u *pp, int len) |
| 7 | 5569 { |
| 5570 int id; | |
| 5571 char_u *name; | |
| 5572 | |
| 5573 name = vim_strnsave(pp, len); | |
| 5574 if (name == NULL) | |
| 5575 return 0; | |
| 5576 | |
| 5577 id = syn_scl_name2id(name); | |
| 5578 if (id == 0) /* doesn't exist yet */ | |
| 5579 id = syn_add_cluster(name); | |
| 5580 else | |
| 5581 vim_free(name); | |
| 5582 return id; | |
| 5583 } | |
| 5584 | |
| 5585 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5586 * Add new syntax cluster and return its ID. |
| 7 | 5587 * "name" must be an allocated string, it will be consumed. |
| 5588 * Return 0 for failure. | |
| 5589 */ | |
| 5590 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5591 syn_add_cluster(char_u *name) |
| 221 | 5592 { |
| 5593 int len; | |
| 7 | 5594 |
| 5595 /* | |
| 5596 * First call for this growarray: init growing array. | |
| 5597 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5598 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
|
5599 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5600 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
|
5601 curwin->w_s->b_syn_clusters.ga_growsize = 10; |
| 7 | 5602 } |
| 5603 | |
| 2743 | 5604 len = curwin->w_s->b_syn_clusters.ga_len; |
| 5605 if (len >= MAX_CLUSTER_ID) | |
| 5606 { | |
| 5607 EMSG((char_u *)_("E848: Too many syntax clusters")); | |
| 5608 vim_free(name); | |
| 5609 return 0; | |
| 5610 } | |
| 5611 | |
| 7 | 5612 /* |
| 5613 * Make room for at least one other cluster entry. | |
| 5614 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5615 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL) |
| 7 | 5616 { |
| 5617 vim_free(name); | |
| 5618 return 0; | |
| 5619 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5620 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5621 vim_memset(&(SYN_CLSTR(curwin->w_s)[len]), 0, sizeof(syn_cluster_T)); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5622 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
|
5623 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
|
5624 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
|
5625 ++curwin->w_s->b_syn_clusters.ga_len; |
| 7 | 5626 |
| 221 | 5627 if (STRICMP(name, "Spell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5628 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER; |
| 227 | 5629 if (STRICMP(name, "NoSpell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5630 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER; |
| 221 | 5631 |
| 7 | 5632 return len + SYNID_CLUSTER; |
| 5633 } | |
| 5634 | |
| 5635 /* | |
| 5636 * Handle ":syntax cluster {cluster-name} [contains={groupname},..] | |
| 5637 * [add={groupname},..] [remove={groupname},..]". | |
| 5638 */ | |
| 5639 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5640 syn_cmd_cluster(exarg_T *eap, int syncing UNUSED) |
| 7 | 5641 { |
| 5642 char_u *arg = eap->arg; | |
| 5643 char_u *group_name_end; | |
| 5644 char_u *rest; | |
| 5645 int scl_id; | |
| 5646 short *clstr_list; | |
| 5647 int got_clstr = FALSE; | |
| 5648 int opt_len; | |
| 5649 int list_op; | |
| 5650 | |
| 5651 eap->nextcmd = find_nextcmd(arg); | |
| 5652 if (eap->skip) | |
| 5653 return; | |
| 5654 | |
| 5655 rest = get_group_name(arg, &group_name_end); | |
| 5656 | |
| 5657 if (rest != NULL) | |
| 5658 { | |
| 2743 | 5659 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); |
| 5660 if (scl_id == 0) | |
| 5661 return; | |
| 5662 scl_id -= SYNID_CLUSTER; | |
| 7 | 5663 |
| 5664 for (;;) | |
| 5665 { | |
| 5666 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
|
5667 && (VIM_ISWHITE(rest[3]) || rest[3] == '=')) |
| 7 | 5668 { |
| 5669 opt_len = 3; | |
| 5670 list_op = CLUSTER_ADD; | |
| 5671 } | |
| 5672 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
|
5673 && (VIM_ISWHITE(rest[6]) || rest[6] == '=')) |
| 7 | 5674 { |
| 5675 opt_len = 6; | |
| 5676 list_op = CLUSTER_SUBTRACT; | |
| 5677 } | |
| 5678 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
|
5679 && (VIM_ISWHITE(rest[8]) || rest[8] == '=')) |
| 7 | 5680 { |
| 5681 opt_len = 8; | |
| 5682 list_op = CLUSTER_REPLACE; | |
| 5683 } | |
| 5684 else | |
| 5685 break; | |
| 5686 | |
| 5687 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
|
5688 if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) |
| 7 | 5689 { |
| 5690 EMSG2(_(e_invarg2), rest); | |
| 5691 break; | |
| 5692 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5693 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
|
5694 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list, |
| 7 | 5695 &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
|
5696 else |
|
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
5697 vim_free(clstr_list); |
| 7 | 5698 got_clstr = TRUE; |
| 5699 } | |
| 5700 | |
| 5701 if (got_clstr) | |
| 5702 { | |
| 745 | 5703 redraw_curbuf_later(SOME_VALID); |
| 2743 | 5704 syn_stack_free_all(curwin->w_s); /* Need to recompute all. */ |
| 7 | 5705 } |
| 5706 } | |
| 5707 | |
| 5708 if (!got_clstr) | |
| 5709 EMSG(_("E400: No cluster specified")); | |
| 5710 if (rest == NULL || !ends_excmd(*rest)) | |
| 5711 EMSG2(_(e_invarg2), arg); | |
| 5712 } | |
| 5713 | |
| 5714 /* | |
| 5715 * On first call for current buffer: Init growing array. | |
| 5716 */ | |
| 5717 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5718 init_syn_patterns(void) |
| 7 | 5719 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5720 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
|
5721 curwin->w_s->b_syn_patterns.ga_growsize = 10; |
| 7 | 5722 } |
| 5723 | |
| 5724 /* | |
| 5725 * Get one pattern for a ":syntax match" or ":syntax region" command. | |
| 5726 * Stores the pattern and program in a synpat_T. | |
| 5727 * Returns a pointer to the next argument, or NULL in case of an error. | |
| 5728 */ | |
| 5729 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5730 get_syn_pattern(char_u *arg, synpat_T *ci) |
| 7 | 5731 { |
| 5732 char_u *end; | |
| 5733 int *p; | |
| 5734 int idx; | |
| 5735 char_u *cpo_save; | |
| 5736 | |
| 5737 /* need at least three chars */ | |
| 6993 | 5738 if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL) |
| 7 | 5739 return NULL; |
| 5740 | |
| 5741 end = skip_regexp(arg + 1, *arg, TRUE, NULL); | |
| 5742 if (*end != *arg) /* end delimiter not found */ | |
| 5743 { | |
| 5744 EMSG2(_("E401: Pattern delimiter not found: %s"), arg); | |
| 5745 return NULL; | |
| 5746 } | |
| 5747 /* store the pattern and compiled regexp program */ | |
| 5748 if ((ci->sp_pattern = vim_strnsave(arg + 1, (int)(end - arg - 1))) == NULL) | |
| 5749 return NULL; | |
| 5750 | |
| 5751 /* Make 'cpoptions' empty, to avoid the 'l' flag */ | |
| 5752 cpo_save = p_cpo; | |
| 5753 p_cpo = (char_u *)""; | |
| 5754 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC); | |
| 5755 p_cpo = cpo_save; | |
| 5756 | |
| 5757 if (ci->sp_prog == NULL) | |
| 5758 return NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5759 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
|
5760 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5761 syn_clear_time(&ci->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5762 #endif |
| 7 | 5763 |
| 5764 /* | |
| 5765 * Check for a match, highlight or region offset. | |
| 5766 */ | |
| 5767 ++end; | |
| 5768 do | |
| 5769 { | |
| 5770 for (idx = SPO_COUNT; --idx >= 0; ) | |
| 5771 if (STRNCMP(end, spo_name_tab[idx], 3) == 0) | |
| 5772 break; | |
| 5773 if (idx >= 0) | |
| 5774 { | |
| 5775 p = &(ci->sp_offsets[idx]); | |
| 5776 if (idx != SPO_LC_OFF) | |
| 5777 switch (end[3]) | |
| 5778 { | |
| 5779 case 's': break; | |
| 5780 case 'b': break; | |
| 5781 case 'e': idx += SPO_COUNT; break; | |
| 5782 default: idx = -1; break; | |
| 5783 } | |
| 5784 if (idx >= 0) | |
| 5785 { | |
| 5786 ci->sp_off_flags |= (1 << idx); | |
| 5787 if (idx == SPO_LC_OFF) /* lc=99 */ | |
| 5788 { | |
| 5789 end += 3; | |
| 5790 *p = getdigits(&end); | |
| 5791 | |
| 5792 /* "lc=" offset automatically sets "ms=" offset */ | |
| 5793 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF))) | |
| 5794 { | |
| 5795 ci->sp_off_flags |= (1 << SPO_MS_OFF); | |
| 5796 ci->sp_offsets[SPO_MS_OFF] = *p; | |
| 5797 } | |
| 5798 } | |
| 5799 else /* yy=x+99 */ | |
| 5800 { | |
| 5801 end += 4; | |
| 5802 if (*end == '+') | |
| 5803 { | |
| 5804 ++end; | |
| 5805 *p = getdigits(&end); /* positive offset */ | |
| 5806 } | |
| 5807 else if (*end == '-') | |
| 5808 { | |
| 5809 ++end; | |
| 5810 *p = -getdigits(&end); /* negative offset */ | |
| 5811 } | |
| 5812 } | |
| 5813 if (*end != ',') | |
| 5814 break; | |
| 5815 ++end; | |
| 5816 } | |
| 5817 } | |
| 5818 } while (idx >= 0); | |
| 5819 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5820 if (!ends_excmd(*end) && !VIM_ISWHITE(*end)) |
| 7 | 5821 { |
| 5822 EMSG2(_("E402: Garbage after pattern: %s"), arg); | |
| 5823 return NULL; | |
| 5824 } | |
| 5825 return skipwhite(end); | |
| 5826 } | |
| 5827 | |
| 5828 /* | |
| 5829 * Handle ":syntax sync .." command. | |
| 5830 */ | |
| 5831 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5832 syn_cmd_sync(exarg_T *eap, int syncing UNUSED) |
| 7 | 5833 { |
| 5834 char_u *arg_start = eap->arg; | |
| 5835 char_u *arg_end; | |
| 5836 char_u *key = NULL; | |
| 5837 char_u *next_arg; | |
| 5838 int illegal = FALSE; | |
| 5839 int finished = FALSE; | |
| 5840 long n; | |
| 5841 char_u *cpo_save; | |
| 5842 | |
| 5843 if (ends_excmd(*arg_start)) | |
| 5844 { | |
| 5845 syn_cmd_list(eap, TRUE); | |
| 5846 return; | |
| 5847 } | |
| 5848 | |
| 5849 while (!ends_excmd(*arg_start)) | |
| 5850 { | |
| 5851 arg_end = skiptowhite(arg_start); | |
| 5852 next_arg = skipwhite(arg_end); | |
| 5853 vim_free(key); | |
| 5854 key = vim_strnsave_up(arg_start, (int)(arg_end - arg_start)); | |
| 5855 if (STRCMP(key, "CCOMMENT") == 0) | |
| 5856 { | |
| 5857 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5858 curwin->w_s->b_syn_sync_flags |= SF_CCOMMENT; |
| 7 | 5859 if (!ends_excmd(*next_arg)) |
| 5860 { | |
| 5861 arg_end = skiptowhite(next_arg); | |
| 5862 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5863 curwin->w_s->b_syn_sync_id = syn_check_group(next_arg, |
| 7 | 5864 (int)(arg_end - next_arg)); |
| 5865 next_arg = skipwhite(arg_end); | |
| 5866 } | |
| 5867 else if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5868 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment"); |
| 7 | 5869 } |
| 5870 else if ( STRNCMP(key, "LINES", 5) == 0 | |
| 5871 || STRNCMP(key, "MINLINES", 8) == 0 | |
| 5872 || STRNCMP(key, "MAXLINES", 8) == 0 | |
| 5873 || STRNCMP(key, "LINEBREAKS", 10) == 0) | |
| 5874 { | |
| 5875 if (key[4] == 'S') | |
| 5876 arg_end = key + 6; | |
| 5877 else if (key[0] == 'L') | |
| 5878 arg_end = key + 11; | |
| 5879 else | |
| 5880 arg_end = key + 9; | |
| 5881 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end)) | |
| 5882 { | |
| 5883 illegal = TRUE; | |
| 5884 break; | |
| 5885 } | |
| 5886 n = getdigits(&arg_end); | |
| 5887 if (!eap->skip) | |
| 5888 { | |
| 5889 if (key[4] == 'B') | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5890 curwin->w_s->b_syn_sync_linebreaks = n; |
| 7 | 5891 else if (key[1] == 'A') |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5892 curwin->w_s->b_syn_sync_maxlines = n; |
| 7 | 5893 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5894 curwin->w_s->b_syn_sync_minlines = n; |
| 7 | 5895 } |
| 5896 } | |
| 5897 else if (STRCMP(key, "FROMSTART") == 0) | |
| 5898 { | |
| 5899 if (!eap->skip) | |
| 5900 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5901 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
|
5902 curwin->w_s->b_syn_sync_maxlines = 0; |
| 7 | 5903 } |
| 5904 } | |
| 5905 else if (STRCMP(key, "LINECONT") == 0) | |
| 5906 { | |
|
7504
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5907 if (*next_arg == NUL) /* missing pattern */ |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5908 { |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5909 illegal = TRUE; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5910 break; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5911 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5912 if (curwin->w_s->b_syn_linecont_pat != NULL) |
| 7 | 5913 { |
| 5914 EMSG(_("E403: syntax sync: line continuations pattern specified twice")); | |
| 5915 finished = TRUE; | |
| 5916 break; | |
| 5917 } | |
| 5918 arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE, NULL); | |
| 5919 if (*arg_end != *next_arg) /* end delimiter not found */ | |
| 5920 { | |
| 5921 illegal = TRUE; | |
| 5922 break; | |
| 5923 } | |
| 5924 | |
| 5925 if (!eap->skip) | |
| 5926 { | |
| 5927 /* store the pattern and compiled regexp program */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5928 if ((curwin->w_s->b_syn_linecont_pat = vim_strnsave(next_arg + 1, |
| 7 | 5929 (int)(arg_end - next_arg - 1))) == NULL) |
| 5930 { | |
| 5931 finished = TRUE; | |
| 5932 break; | |
| 5933 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5934 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic; |
| 7 | 5935 |
| 5936 /* Make 'cpoptions' empty, to avoid the 'l' flag */ | |
| 5937 cpo_save = p_cpo; | |
| 5938 p_cpo = (char_u *)""; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5939 curwin->w_s->b_syn_linecont_prog = |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5940 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); |
| 7 | 5941 p_cpo = cpo_save; |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
5942 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5943 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
|
5944 #endif |
| 7 | 5945 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5946 if (curwin->w_s->b_syn_linecont_prog == NULL) |
| 7 | 5947 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5948 vim_free(curwin->w_s->b_syn_linecont_pat); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5949 curwin->w_s->b_syn_linecont_pat = NULL; |
| 7 | 5950 finished = TRUE; |
| 5951 break; | |
| 5952 } | |
| 5953 } | |
| 5954 next_arg = skipwhite(arg_end + 1); | |
| 5955 } | |
| 5956 else | |
| 5957 { | |
| 5958 eap->arg = next_arg; | |
| 5959 if (STRCMP(key, "MATCH") == 0) | |
| 5960 syn_cmd_match(eap, TRUE); | |
| 5961 else if (STRCMP(key, "REGION") == 0) | |
| 5962 syn_cmd_region(eap, TRUE); | |
| 5963 else if (STRCMP(key, "CLEAR") == 0) | |
| 5964 syn_cmd_clear(eap, TRUE); | |
| 5965 else | |
| 5966 illegal = TRUE; | |
| 5967 finished = TRUE; | |
| 5968 break; | |
| 5969 } | |
| 5970 arg_start = next_arg; | |
| 5971 } | |
| 5972 vim_free(key); | |
| 5973 if (illegal) | |
| 5974 EMSG2(_("E404: Illegal arguments: %s"), arg_start); | |
| 5975 else if (!finished) | |
| 5976 { | |
| 5977 eap->nextcmd = check_nextcmd(arg_start); | |
| 745 | 5978 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5979 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5980 } |
| 5981 } | |
| 5982 | |
| 5983 /* | |
| 5984 * Convert a line of highlight group names into a list of group ID numbers. | |
| 5985 * "arg" should point to the "contains" or "nextgroup" keyword. | |
| 5986 * "arg" is advanced to after the last group name. | |
| 5987 * Careful: the argument is modified (NULs added). | |
| 5988 * returns FAIL for some error, OK for success. | |
| 5989 */ | |
| 5990 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5991 get_id_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5992 char_u **arg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5993 int keylen, /* length of keyword */ |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5994 short **list, /* where to store the resulting list, if not |
| 7 | 5995 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
|
5996 int skip) |
| 7 | 5997 { |
| 5998 char_u *p = NULL; | |
| 5999 char_u *end; | |
| 6000 int round; | |
| 6001 int count; | |
| 6002 int total_count = 0; | |
| 6003 short *retval = NULL; | |
| 6004 char_u *name; | |
| 6005 regmatch_T regmatch; | |
| 6006 int id; | |
| 6007 int i; | |
| 6008 int failed = FALSE; | |
| 6009 | |
| 6010 /* | |
| 6011 * We parse the list twice: | |
| 6012 * round == 1: count the number of items, allocate the array. | |
| 6013 * round == 2: fill the array with the items. | |
| 6014 * In round 1 new groups may be added, causing the number of items to | |
| 6015 * grow when a regexp is used. In that case round 1 is done once again. | |
| 6016 */ | |
| 6017 for (round = 1; round <= 2; ++round) | |
| 6018 { | |
| 6019 /* | |
| 6020 * skip "contains" | |
| 6021 */ | |
| 6022 p = skipwhite(*arg + keylen); | |
| 6023 if (*p != '=') | |
| 6024 { | |
| 6025 EMSG2(_("E405: Missing equal sign: %s"), *arg); | |
| 6026 break; | |
| 6027 } | |
| 6028 p = skipwhite(p + 1); | |
| 6029 if (ends_excmd(*p)) | |
| 6030 { | |
| 6031 EMSG2(_("E406: Empty argument: %s"), *arg); | |
| 6032 break; | |
| 6033 } | |
| 6034 | |
| 6035 /* | |
| 6036 * parse the arguments after "contains" | |
| 6037 */ | |
| 6038 count = 0; | |
| 6039 while (!ends_excmd(*p)) | |
| 6040 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6041 for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end) |
| 7 | 6042 ; |
| 6043 name = alloc((int)(end - p + 3)); /* leave room for "^$" */ | |
| 6044 if (name == NULL) | |
| 6045 { | |
| 6046 failed = TRUE; | |
| 6047 break; | |
| 6048 } | |
| 419 | 6049 vim_strncpy(name + 1, p, end - p); |
| 7 | 6050 if ( STRCMP(name + 1, "ALLBUT") == 0 |
| 6051 || STRCMP(name + 1, "ALL") == 0 | |
| 6052 || STRCMP(name + 1, "TOP") == 0 | |
| 6053 || STRCMP(name + 1, "CONTAINED") == 0) | |
| 6054 { | |
| 6055 if (TOUPPER_ASC(**arg) != 'C') | |
| 6056 { | |
| 6057 EMSG2(_("E407: %s not allowed here"), name + 1); | |
| 6058 failed = TRUE; | |
| 6059 vim_free(name); | |
| 6060 break; | |
| 6061 } | |
| 6062 if (count != 0) | |
| 6063 { | |
|
10648
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
6064 EMSG2(_("E408: %s must be first in contains list"), |
|
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
6065 name + 1); |
| 7 | 6066 failed = TRUE; |
| 6067 vim_free(name); | |
| 6068 break; | |
| 6069 } | |
| 6070 if (name[1] == 'A') | |
| 6071 id = SYNID_ALLBUT; | |
| 6072 else if (name[1] == 'T') | |
| 6073 id = SYNID_TOP; | |
| 6074 else | |
| 6075 id = SYNID_CONTAINED; | |
| 6076 id += current_syn_inc_tag; | |
| 6077 } | |
| 6078 else if (name[1] == '@') | |
| 6079 { | |
|
10629
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6080 if (skip) |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6081 id = -1; |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6082 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
|
6083 id = syn_check_cluster(name + 2, (int)(end - p - 1)); |
| 7 | 6084 } |
| 6085 else | |
| 6086 { | |
| 6087 /* | |
| 6088 * Handle full group name. | |
| 6089 */ | |
| 6090 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL) | |
| 6091 id = syn_check_group(name + 1, (int)(end - p)); | |
| 6092 else | |
| 6093 { | |
| 6094 /* | |
| 6095 * Handle match of regexp with group names. | |
| 6096 */ | |
| 6097 *name = '^'; | |
| 6098 STRCAT(name, "$"); | |
| 6099 regmatch.regprog = vim_regcomp(name, RE_MAGIC); | |
| 6100 if (regmatch.regprog == NULL) | |
| 6101 { | |
| 6102 failed = TRUE; | |
| 6103 vim_free(name); | |
| 6104 break; | |
| 6105 } | |
| 6106 | |
| 6107 regmatch.rm_ic = TRUE; | |
| 6108 id = 0; | |
| 6109 for (i = highlight_ga.ga_len; --i >= 0; ) | |
| 6110 { | |
| 6111 if (vim_regexec(®match, HL_TABLE()[i].sg_name, | |
| 6112 (colnr_T)0)) | |
| 6113 { | |
| 6114 if (round == 2) | |
| 6115 { | |
| 6116 /* Got more items than expected; can happen | |
| 6117 * when adding items that match: | |
| 6118 * "contains=a.*b,axb". | |
| 6119 * Go back to first round */ | |
| 6120 if (count >= total_count) | |
| 6121 { | |
| 6122 vim_free(retval); | |
| 6123 round = 1; | |
| 6124 } | |
| 6125 else | |
| 6126 retval[count] = i + 1; | |
| 6127 } | |
| 6128 ++count; | |
| 6129 id = -1; /* remember that we found one */ | |
| 6130 } | |
| 6131 } | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
6132 vim_regfree(regmatch.regprog); |
| 7 | 6133 } |
| 6134 } | |
| 6135 vim_free(name); | |
| 6136 if (id == 0) | |
| 6137 { | |
| 6138 EMSG2(_("E409: Unknown group name: %s"), p); | |
| 6139 failed = TRUE; | |
| 6140 break; | |
| 6141 } | |
| 6142 if (id > 0) | |
| 6143 { | |
| 6144 if (round == 2) | |
| 6145 { | |
| 6146 /* Got more items than expected, go back to first round */ | |
| 6147 if (count >= total_count) | |
| 6148 { | |
| 6149 vim_free(retval); | |
| 6150 round = 1; | |
| 6151 } | |
| 6152 else | |
| 6153 retval[count] = id; | |
| 6154 } | |
| 6155 ++count; | |
| 6156 } | |
| 6157 p = skipwhite(end); | |
| 6158 if (*p != ',') | |
| 6159 break; | |
| 6160 p = skipwhite(p + 1); /* skip comma in between arguments */ | |
| 6161 } | |
| 6162 if (failed) | |
| 6163 break; | |
| 6164 if (round == 1) | |
| 6165 { | |
| 6166 retval = (short *)alloc((unsigned)((count + 1) * sizeof(short))); | |
| 6167 if (retval == NULL) | |
| 6168 break; | |
| 6169 retval[count] = 0; /* zero means end of the list */ | |
| 6170 total_count = count; | |
| 6171 } | |
| 6172 } | |
| 6173 | |
| 6174 *arg = p; | |
| 6175 if (failed || retval == NULL) | |
| 6176 { | |
| 6177 vim_free(retval); | |
| 6178 return FAIL; | |
| 6179 } | |
| 6180 | |
| 6181 if (*list == NULL) | |
| 6182 *list = retval; | |
| 6183 else | |
| 6184 vim_free(retval); /* list already found, don't overwrite it */ | |
| 6185 | |
| 6186 return OK; | |
| 6187 } | |
| 6188 | |
| 6189 /* | |
| 6190 * Make a copy of an ID list. | |
| 6191 */ | |
| 6192 static short * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6193 copy_id_list(short *list) |
| 7 | 6194 { |
| 6195 int len; | |
| 6196 int count; | |
| 6197 short *retval; | |
| 6198 | |
| 6199 if (list == NULL) | |
| 6200 return NULL; | |
| 6201 | |
| 6202 for (count = 0; list[count]; ++count) | |
| 6203 ; | |
| 6204 len = (count + 1) * sizeof(short); | |
| 6205 retval = (short *)alloc((unsigned)len); | |
| 6206 if (retval != NULL) | |
| 6207 mch_memmove(retval, list, (size_t)len); | |
| 6208 | |
| 6209 return retval; | |
| 6210 } | |
| 6211 | |
| 6212 /* | |
| 6213 * Check if syntax group "ssp" is in the ID list "list" of "cur_si". | |
| 6214 * "cur_si" can be NULL if not checking the "containedin" list. | |
| 6215 * Used to check if a syntax item is in the "contains" or "nextgroup" list of | |
| 6216 * the current item. | |
| 6217 * This function is called very often, keep it fast!! | |
| 6218 */ | |
| 6219 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6220 in_id_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6221 stateitem_T *cur_si, /* current item or NULL */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6222 short *list, /* id list */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6223 struct sp_syn *ssp, /* group id and ":syn include" tag of group */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6224 int contained) /* group id is contained */ |
| 7 | 6225 { |
| 6226 int retval; | |
| 6227 short *scl_list; | |
| 6228 short item; | |
| 6229 short id = ssp->id; | |
| 6230 static int depth = 0; | |
| 6231 int r; | |
| 6232 | |
| 4352 | 6233 /* If ssp has a "containedin" list and "cur_si" is in it, return TRUE. */ |
| 36 | 6234 if (cur_si != NULL && ssp->cont_in_list != NULL |
| 6235 && !(cur_si->si_flags & HL_MATCH)) | |
| 7 | 6236 { |
| 6237 /* Ignore transparent items without a contains argument. Double check | |
| 6238 * that we don't go back past the first one. */ | |
| 6239 while ((cur_si->si_flags & HL_TRANS_CONT) | |
| 6240 && cur_si > (stateitem_T *)(current_state.ga_data)) | |
| 6241 --cur_si; | |
| 6242 /* cur_si->si_idx is -1 for keywords, these never contain anything. */ | |
| 6243 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
|
6244 &(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
|
6245 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED)) |
| 7 | 6246 return TRUE; |
| 6247 } | |
| 6248 | |
| 6249 if (list == NULL) | |
| 6250 return FALSE; | |
| 6251 | |
| 6252 /* | |
| 6253 * If list is ID_LIST_ALL, we are in a transparent item that isn't | |
| 6254 * inside anything. Only allow not-contained groups. | |
| 6255 */ | |
| 6256 if (list == ID_LIST_ALL) | |
| 6257 return !contained; | |
| 6258 | |
| 6259 /* | |
| 6260 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the | |
| 6261 * contains list. We also require that "id" is at the same ":syn include" | |
| 6262 * level as the list. | |
| 6263 */ | |
| 6264 item = *list; | |
| 6265 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) | |
| 6266 { | |
| 6267 if (item < SYNID_TOP) | |
| 6268 { | |
| 6269 /* ALL or ALLBUT: accept all groups in the same file */ | |
| 6270 if (item - SYNID_ALLBUT != ssp->inc_tag) | |
| 6271 return FALSE; | |
| 6272 } | |
| 6273 else if (item < SYNID_CONTAINED) | |
| 6274 { | |
| 6275 /* TOP: accept all not-contained groups in the same file */ | |
| 6276 if (item - SYNID_TOP != ssp->inc_tag || contained) | |
| 6277 return FALSE; | |
| 6278 } | |
| 6279 else | |
| 6280 { | |
| 6281 /* CONTAINED: accept all contained groups in the same file */ | |
| 6282 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) | |
| 6283 return FALSE; | |
| 6284 } | |
| 6285 item = *++list; | |
| 6286 retval = FALSE; | |
| 6287 } | |
| 6288 else | |
| 6289 retval = TRUE; | |
| 6290 | |
| 6291 /* | |
| 6292 * Return "retval" if id is in the contains list. | |
| 6293 */ | |
| 6294 while (item != 0) | |
| 6295 { | |
| 6296 if (item == id) | |
| 6297 return retval; | |
| 6298 if (item >= SYNID_CLUSTER) | |
| 6299 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6300 scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list; |
| 7 | 6301 /* restrict recursiveness to 30 to avoid an endless loop for a |
| 6302 * cluster that includes itself (indirectly) */ | |
| 6303 if (scl_list != NULL && depth < 30) | |
| 6304 { | |
| 6305 ++depth; | |
| 6306 r = in_id_list(NULL, scl_list, ssp, contained); | |
| 6307 --depth; | |
| 6308 if (r) | |
| 6309 return retval; | |
| 6310 } | |
| 6311 } | |
| 6312 item = *++list; | |
| 6313 } | |
| 6314 return !retval; | |
| 6315 } | |
| 6316 | |
| 6317 struct subcommand | |
| 6318 { | |
|
7807
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6319 char *name; /* subcommand name */ |
|
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6320 void (*func)(exarg_T *, int); /* function to call */ |
| 7 | 6321 }; |
| 6322 | |
| 6323 static struct subcommand subcommands[] = | |
| 6324 { | |
| 6325 {"case", syn_cmd_case}, | |
| 6326 {"clear", syn_cmd_clear}, | |
| 6327 {"cluster", syn_cmd_cluster}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6328 {"conceal", syn_cmd_conceal}, |
| 7 | 6329 {"enable", syn_cmd_enable}, |
| 6330 {"include", syn_cmd_include}, | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6331 {"iskeyword", syn_cmd_iskeyword}, |
| 7 | 6332 {"keyword", syn_cmd_keyword}, |
| 6333 {"list", syn_cmd_list}, | |
| 6334 {"manual", syn_cmd_manual}, | |
| 6335 {"match", syn_cmd_match}, | |
| 6336 {"on", syn_cmd_on}, | |
| 6337 {"off", syn_cmd_off}, | |
| 6338 {"region", syn_cmd_region}, | |
| 6339 {"reset", syn_cmd_reset}, | |
| 419 | 6340 {"spell", syn_cmd_spell}, |
| 7 | 6341 {"sync", syn_cmd_sync}, |
| 6342 {"", syn_cmd_list}, | |
| 6343 {NULL, NULL} | |
| 6344 }; | |
| 6345 | |
| 6346 /* | |
| 6347 * ":syntax". | |
| 6348 * This searches the subcommands[] table for the subcommand name, and calls a | |
| 6349 * syntax_subcommand() function to do the rest. | |
| 6350 */ | |
| 6351 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6352 ex_syntax(exarg_T *eap) |
| 7 | 6353 { |
| 6354 char_u *arg = eap->arg; | |
| 6355 char_u *subcmd_end; | |
| 6356 char_u *subcmd_name; | |
| 6357 int i; | |
| 6358 | |
| 6359 syn_cmdlinep = eap->cmdlinep; | |
| 6360 | |
| 6361 /* isolate subcommand name */ | |
| 6362 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end) | |
| 6363 ; | |
| 6364 subcmd_name = vim_strnsave(arg, (int)(subcmd_end - arg)); | |
| 6365 if (subcmd_name != NULL) | |
| 6366 { | |
| 6367 if (eap->skip) /* skip error messages for all subcommands */ | |
| 6368 ++emsg_skip; | |
| 6369 for (i = 0; ; ++i) | |
| 6370 { | |
| 6371 if (subcommands[i].name == NULL) | |
| 6372 { | |
| 6373 EMSG2(_("E410: Invalid :syntax subcommand: %s"), subcmd_name); | |
| 6374 break; | |
| 6375 } | |
| 6376 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0) | |
| 6377 { | |
| 6378 eap->arg = skipwhite(subcmd_end); | |
| 6379 (subcommands[i].func)(eap, FALSE); | |
| 6380 break; | |
| 6381 } | |
| 6382 } | |
| 6383 vim_free(subcmd_name); | |
| 6384 if (eap->skip) | |
| 6385 --emsg_skip; | |
| 6386 } | |
| 6387 } | |
| 6388 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6389 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6390 ex_ownsyntax(exarg_T *eap) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6391 { |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6392 char_u *old_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6393 char_u *new_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6394 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6395 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
|
6396 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6397 curwin->w_s = (synblock_T *)alloc(sizeof(synblock_T)); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6398 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
|
6399 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
|
6400 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
|
6401 #ifdef FEAT_SPELL |
| 6386 | 6402 /* TODO: keep the spell checking as it was. */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6403 curwin->w_p_spell = FALSE; /* No spell checking */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6404 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
|
6405 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
|
6406 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
|
6407 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6408 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
|
6409 } |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6410 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6411 /* save value of b:current_syntax */ |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6412 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
|
6413 if (old_value != NULL) |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6414 old_value = vim_strsave(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6415 |
|
8362
a541dd5cfd3a
commit https://github.com/vim/vim/commit/d1413d90983fc6c579ad66ba4d4611b057197f94
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
6416 #ifdef FEAT_AUTOCMD |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6417 /* Apply the "syntax" autocommand event, this finds and loads the syntax |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6418 * file. */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6419 apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf); |
|
8362
a541dd5cfd3a
commit https://github.com/vim/vim/commit/d1413d90983fc6c579ad66ba4d4611b057197f94
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
6420 #endif |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6421 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6422 /* move value of b:current_syntax to w:current_syntax */ |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6423 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
|
6424 if (new_value != NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6425 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
|
6426 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6427 /* restore value of b:current_syntax */ |
|
2256
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6428 if (old_value == NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6429 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6430 else |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6431 { |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6432 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
|
6433 vim_free(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6434 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6435 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6436 |
| 7 | 6437 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6438 syntax_present(win_T *win) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6439 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6440 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
|
6441 || 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
|
6442 || 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
|
6443 || win->w_s->b_keywtab_ic.ht_used > 0); |
| 7 | 6444 } |
| 6445 | |
| 6446 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) | |
| 6447 | |
| 6448 static enum | |
| 6449 { | |
| 6450 EXP_SUBCMD, /* expand ":syn" sub-commands */ | |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6451 EXP_CASE, /* expand ":syn case" arguments */ |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6452 EXP_SPELL, /* expand ":syn spell" arguments */ |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6453 EXP_SYNC /* expand ":syn sync" arguments */ |
| 7 | 6454 } expand_what; |
| 6455 | |
| 1322 | 6456 /* |
| 6457 * Reset include_link, include_default, include_none to 0. | |
| 6458 * Called when we are done expanding. | |
| 6459 */ | |
| 6460 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6461 reset_expand_highlight(void) |
| 1322 | 6462 { |
| 6463 include_link = include_default = include_none = 0; | |
| 6464 } | |
| 6465 | |
| 6466 /* | |
| 6467 * Handle command line completion for :match and :echohl command: Add "None" | |
| 6468 * as highlight group. | |
| 6469 */ | |
| 6470 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6471 set_context_in_echohl_cmd(expand_T *xp, char_u *arg) |
| 1322 | 6472 { |
| 6473 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 6474 xp->xp_pattern = arg; | |
| 6475 include_none = 1; | |
| 6476 } | |
| 7 | 6477 |
| 6478 /* | |
| 6479 * Handle command line completion for :syntax command. | |
| 6480 */ | |
| 6481 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6482 set_context_in_syntax_cmd(expand_T *xp, char_u *arg) |
| 7 | 6483 { |
| 6484 char_u *p; | |
| 6485 | |
| 6486 /* Default: expand subcommands */ | |
| 6487 xp->xp_context = EXPAND_SYNTAX; | |
| 6488 expand_what = EXP_SUBCMD; | |
| 6489 xp->xp_pattern = arg; | |
| 1322 | 6490 include_link = 0; |
| 6491 include_default = 0; | |
| 7 | 6492 |
| 6493 /* (part of) subcommand already typed */ | |
| 6494 if (*arg != NUL) | |
| 6495 { | |
| 6496 p = skiptowhite(arg); | |
| 6497 if (*p != NUL) /* past first word */ | |
| 6498 { | |
| 6499 xp->xp_pattern = skipwhite(p); | |
| 6500 if (*skiptowhite(xp->xp_pattern) != NUL) | |
| 6501 xp->xp_context = EXPAND_NOTHING; | |
| 6502 else if (STRNICMP(arg, "case", p - arg) == 0) | |
| 6503 expand_what = EXP_CASE; | |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6504 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
|
6505 expand_what = EXP_SPELL; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6506 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
|
6507 expand_what = EXP_SYNC; |
| 7 | 6508 else if ( STRNICMP(arg, "keyword", p - arg) == 0 |
| 6509 || STRNICMP(arg, "region", p - arg) == 0 | |
| 6510 || STRNICMP(arg, "match", p - arg) == 0 | |
| 6511 || STRNICMP(arg, "list", p - arg) == 0) | |
| 6512 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 6513 else | |
| 6514 xp->xp_context = EXPAND_NOTHING; | |
| 6515 } | |
| 6516 } | |
| 6517 } | |
| 6518 | |
| 6519 /* | |
| 6520 * Function given to ExpandGeneric() to obtain the list syntax names for | |
| 6521 * expansion. | |
| 6522 */ | |
| 6523 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6524 get_syntax_name(expand_T *xp UNUSED, int idx) |
| 7 | 6525 { |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6526 switch (expand_what) |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6527 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6528 case EXP_SUBCMD: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6529 return (char_u *)subcommands[idx].name; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6530 case EXP_CASE: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6531 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6532 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
|
6533 return (char_u *)case_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6534 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6535 case EXP_SPELL: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6536 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6537 static char *spell_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6538 {"toplevel", "notoplevel", "default", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6539 return (char_u *)spell_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6540 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6541 case EXP_SYNC: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6542 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6543 static char *sync_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6544 {"ccomment", "clear", "fromstart", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6545 "linebreaks=", "linecont", "lines=", "match", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6546 "maxlines=", "minlines=", "region", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6547 return (char_u *)sync_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6548 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6549 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6550 return NULL; |
| 7 | 6551 } |
| 6552 | |
| 6553 #endif /* FEAT_CMDL_COMPL */ | |
| 6554 | |
| 6555 /* | |
| 6556 * Function called for expression evaluation: get syntax ID at file position. | |
| 6557 */ | |
| 6558 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6559 syn_get_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6560 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6561 long lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6562 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6563 int trans, /* remove transparency */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6564 int *spellp, /* return: can do spell checking */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6565 int keep_state) /* keep state of char at "col" */ |
| 7 | 6566 { |
| 6567 /* When the position is not after the current position and in the same | |
| 6568 * line of the same buffer, need to restart parsing. */ | |
| 499 | 6569 if (wp->w_buffer != syn_buf |
| 7 | 6570 || lnum != current_lnum |
| 253 | 6571 || col < current_col) |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6572 syntax_start(wp, lnum, NULL); |
|
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6573 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
|
6574 && lnum == current_lnum |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6575 && col > current_col) |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6576 /* next_match may not be correct when moving around, e.g. with the |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6577 * "skip" expression in searchpair() */ |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6578 next_match_idx = -1; |
| 7 | 6579 |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6580 (void)get_syntax_attr(col, spellp, keep_state); |
| 7 | 6581 |
| 6582 return (trans ? current_trans_id : current_id); | |
| 6583 } | |
| 6584 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6585 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6586 /* |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6587 * 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
|
6588 * 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
|
6589 * 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
|
6590 * 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
|
6591 */ |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6592 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6593 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
|
6594 { |
|
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
|
6595 *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
|
6596 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
|
6597 } |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6598 |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6599 /* |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6600 * Return conceal substitution character |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6601 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6602 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6603 syn_get_sub_char(void) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6604 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6605 return current_sub_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6606 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6607 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6608 |
| 1500 | 6609 #if defined(FEAT_EVAL) || defined(PROTO) |
| 6610 /* | |
| 6611 * Return the syntax ID at position "i" in the current stack. | |
| 6612 * The caller must have called syn_get_id() before to fill the stack. | |
| 6613 * Returns -1 when "i" is out of range. | |
| 6614 */ | |
| 6615 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6616 syn_get_stack_item(int i) |
| 1500 | 6617 { |
| 1504 | 6618 if (i >= current_state.ga_len) |
| 6619 { | |
| 6620 /* Need to invalidate the state, because we didn't properly finish it | |
| 6621 * for the last character, "keep_state" was TRUE. */ | |
| 6622 invalidate_current_state(); | |
| 6623 current_col = MAXCOL; | |
| 1500 | 6624 return -1; |
| 1504 | 6625 } |
| 1500 | 6626 return CUR_STATE(i).si_id; |
| 6627 } | |
| 6628 #endif | |
| 6629 | |
| 7 | 6630 #if defined(FEAT_FOLDING) || defined(PROTO) |
| 6631 /* | |
| 6632 * Function called to get folding level for line "lnum" in window "wp". | |
| 6633 */ | |
| 6634 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6635 syn_get_foldlevel(win_T *wp, long lnum) |
| 7 | 6636 { |
| 6637 int level = 0; | |
| 6638 int i; | |
| 6639 | |
| 6640 /* 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
|
6641 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
|
6642 && !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
|
6643 # 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
|
6644 && !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
|
6645 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6646 ) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6647 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6648 syntax_start(wp, lnum, NULL); |
| 7 | 6649 |
| 6650 for (i = 0; i < current_state.ga_len; ++i) | |
| 6651 if (CUR_STATE(i).si_flags & HL_FOLD) | |
| 6652 ++level; | |
| 6653 } | |
| 6654 if (level > wp->w_p_fdn) | |
| 1028 | 6655 { |
| 7 | 6656 level = wp->w_p_fdn; |
| 1028 | 6657 if (level < 0) |
| 6658 level = 0; | |
| 6659 } | |
| 7 | 6660 return level; |
| 6661 } | |
| 6662 #endif | |
| 6663 | |
| 6567 | 6664 #if defined(FEAT_PROFILE) || defined(PROTO) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6665 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6666 * ":syntime". |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6667 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6668 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6669 ex_syntime(exarg_T *eap) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6670 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6671 if (STRCMP(eap->arg, "on") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6672 syn_time_on = TRUE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6673 else if (STRCMP(eap->arg, "off") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6674 syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6675 else if (STRCMP(eap->arg, "clear") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6676 syntime_clear(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6677 else if (STRCMP(eap->arg, "report") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6678 syntime_report(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6679 else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6680 EMSG2(_(e_invarg2), eap->arg); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6681 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6682 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6683 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6684 syn_clear_time(syn_time_T *st) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6685 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6686 profile_zero(&st->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6687 profile_zero(&st->slowest); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6688 st->count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6689 st->match = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6690 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6691 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6692 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6693 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6694 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6695 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6696 syntime_clear(void) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6697 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6698 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6699 synpat_T *spp; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6700 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6701 if (!syntax_present(curwin)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6702 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6703 MSG(_(msg_no_items)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6704 return; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6705 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6706 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
|
6707 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6708 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6709 syn_clear_time(&spp->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6710 } |
|
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 |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6713 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6714 /* |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6715 * 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
|
6716 * ":syntime {on,off,clear,report}" command. |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6717 */ |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6718 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6719 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
|
6720 { |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6721 switch (idx) |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6722 { |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6723 case 0: return (char_u *)"on"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6724 case 1: return (char_u *)"off"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6725 case 2: return (char_u *)"clear"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6726 case 3: return (char_u *)"report"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6727 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6728 return NULL; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6729 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6730 #endif |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6731 |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6732 typedef struct |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6733 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6734 proftime_T total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6735 int count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6736 int match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6737 proftime_T slowest; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6738 proftime_T average; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6739 int id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6740 char_u *pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6741 } time_entry_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6742 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6743 static int |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6744 #ifdef __BORLANDC__ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6745 _RTLENTRYF |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6746 #endif |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6747 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
|
6748 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6749 const time_entry_T *s1 = v1; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6750 const time_entry_T *s2 = v2; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6751 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6752 return profile_cmp(&s1->total, &s2->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6753 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6754 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6755 /* |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6756 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6757 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6758 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6759 syntime_report(void) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6760 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6761 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6762 synpat_T *spp; |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6763 # ifdef FEAT_FLOAT |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6764 proftime_T tm; |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6765 # endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6766 int len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6767 proftime_T total_total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6768 int total_count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6769 garray_T ga; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6770 time_entry_T *p; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6771 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6772 if (!syntax_present(curwin)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6773 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6774 MSG(_(msg_no_items)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6775 return; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6776 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6777 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6778 ga_init2(&ga, sizeof(time_entry_T), 50); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6779 profile_zero(&total_total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6780 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
|
6781 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6782 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6783 if (spp->sp_time.count > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6784 { |
| 7009 | 6785 (void)ga_grow(&ga, 1); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6786 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
|
6787 p->total = spp->sp_time.total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6788 profile_add(&total_total, &spp->sp_time.total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6789 p->count = spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6790 p->match = spp->sp_time.match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6791 total_count += spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6792 p->slowest = spp->sp_time.slowest; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6793 # ifdef FEAT_FLOAT |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6794 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
|
6795 p->average = tm; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6796 # endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6797 p->id = spp->sp_syn.id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6798 p->pattern = spp->sp_pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6799 ++ga.ga_len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6800 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6801 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6802 |
|
10530
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6803 /* Sort on total time. Skip if there are no items to avoid passing NULL |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6804 * pointer to qsort(). */ |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6805 if (ga.ga_len > 1) |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6806 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
|
6807 syn_compare_syntime); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6808 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6809 MSG_PUTS_TITLE(_(" TOTAL COUNT MATCH SLOWEST AVERAGE NAME PATTERN")); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6810 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6811 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
|
6812 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6813 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6814 p = ((time_entry_T *)ga.ga_data) + idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6815 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6816 MSG_PUTS(profile_msg(&p->total)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6817 MSG_PUTS(" "); /* make sure there is always a separating space */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6818 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6819 msg_outnum(p->count); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6820 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6821 msg_advance(20); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6822 msg_outnum(p->match); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6823 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6824 msg_advance(26); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6825 MSG_PUTS(profile_msg(&p->slowest)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6826 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6827 msg_advance(38); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6828 # ifdef FEAT_FLOAT |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6829 MSG_PUTS(profile_msg(&p->average)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6830 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6831 # endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6832 msg_advance(50); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6833 msg_outtrans(HL_TABLE()[p->id - 1].sg_name); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6834 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6835 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6836 msg_advance(69); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6837 if (Columns < 80) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6838 len = 20; /* will wrap anyway */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6839 else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6840 len = Columns - 70; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6841 if (len > (int)STRLEN(p->pattern)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6842 len = (int)STRLEN(p->pattern); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6843 msg_outtrans_len(p->pattern, len); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6844 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6845 } |
|
4791
65cef998f860
updated for version 7.3.1142
Bram Moolenaar <bram@vim.org>
parents:
4776
diff
changeset
|
6846 ga_clear(&ga); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6847 if (!got_int) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6848 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6849 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6850 MSG_PUTS(profile_msg(&total_total)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6851 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6852 msg_outnum(total_count); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6853 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6854 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6855 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6856 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6857 |
| 7 | 6858 #endif /* FEAT_SYN_HL */ |
| 6859 | |
| 6860 /************************************** | |
| 6861 * Highlighting stuff * | |
| 6862 **************************************/ | |
| 6863 | |
| 6864 /* | |
| 6865 * The default highlight groups. These are compiled-in for fast startup and | |
| 6866 * they still work when the runtime files can't be found. | |
| 6867 * When making changes here, also change runtime/colors/default.vim! | |
| 806 | 6868 * The #ifdefs are needed to reduce the amount of static data. Helps to make |
| 6869 * the 16 bit DOS (museum) version compile. | |
| 7 | 6870 */ |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6871 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 809 | 6872 # define CENT(a, b) b |
| 6873 #else | |
| 6874 # define CENT(a, b) a | |
| 6875 #endif | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6876 static char *(highlight_init_both[]) = { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6877 CENT("ErrorMsg term=standout ctermbg=DarkRed ctermfg=White", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6878 "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6879 CENT("IncSearch term=reverse cterm=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6880 "IncSearch term=reverse cterm=reverse gui=reverse"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6881 CENT("ModeMsg term=bold cterm=bold", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6882 "ModeMsg term=bold cterm=bold gui=bold"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6883 CENT("NonText term=bold ctermfg=Blue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6884 "NonText term=bold ctermfg=Blue gui=bold guifg=Blue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6885 CENT("StatusLine term=reverse,bold cterm=reverse,bold", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6886 "StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6887 CENT("StatusLineNC term=reverse cterm=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6888 "StatusLineNC term=reverse cterm=reverse gui=reverse"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6889 "default link EndOfBuffer NonText", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6890 CENT("VertSplit term=reverse cterm=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6891 "VertSplit term=reverse cterm=reverse gui=reverse"), |
| 806 | 6892 #ifdef FEAT_CLIPBOARD |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6893 CENT("VisualNOS term=underline,bold cterm=underline,bold", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6894 "VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold"), |
| 806 | 6895 #endif |
| 6896 #ifdef FEAT_DIFF | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6897 CENT("DiffText term=reverse cterm=bold ctermbg=Red", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6898 "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"), |
| 806 | 6899 #endif |
| 6900 #ifdef FEAT_INS_EXPAND | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6901 CENT("PmenuSbar ctermbg=Grey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6902 "PmenuSbar ctermbg=Grey guibg=Grey"), |
| 806 | 6903 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6904 CENT("TabLineSel term=bold cterm=bold", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6905 "TabLineSel term=bold cterm=bold gui=bold"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6906 CENT("TabLineFill term=reverse cterm=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6907 "TabLineFill term=reverse cterm=reverse gui=reverse"), |
| 7 | 6908 #ifdef FEAT_GUI |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6909 "Cursor guibg=fg guifg=bg", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6910 "lCursor guibg=fg guifg=bg", /* should be different, but what? */ |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6911 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6912 "default link QuickFixLine Search", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6913 NULL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6914 }; |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6915 |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6916 /* Default colors only used with a light background. */ |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6917 static char *(highlight_init_light[]) = { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6918 CENT("Directory term=bold ctermfg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6919 "Directory term=bold ctermfg=DarkBlue guifg=Blue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6920 CENT("LineNr term=underline ctermfg=Brown", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6921 "LineNr term=underline ctermfg=Brown guifg=Brown"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6922 CENT("CursorLineNr term=bold ctermfg=Brown", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6923 "CursorLineNr term=bold ctermfg=Brown gui=bold guifg=Brown"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6924 CENT("MoreMsg term=bold ctermfg=DarkGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6925 "MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6926 CENT("Question term=standout ctermfg=DarkGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6927 "Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6928 CENT("Search term=reverse ctermbg=Yellow ctermfg=NONE", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6929 "Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE"), |
| 806 | 6930 #ifdef FEAT_SPELL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6931 CENT("SpellBad term=reverse ctermbg=LightRed", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6932 "SpellBad term=reverse ctermbg=LightRed guisp=Red gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6933 CENT("SpellCap term=reverse ctermbg=LightBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6934 "SpellCap term=reverse ctermbg=LightBlue guisp=Blue gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6935 CENT("SpellRare term=reverse ctermbg=LightMagenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6936 "SpellRare term=reverse ctermbg=LightMagenta guisp=Magenta gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6937 CENT("SpellLocal term=underline ctermbg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6938 "SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"), |
| 806 | 6939 #endif |
| 6940 #ifdef FEAT_INS_EXPAND | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6941 CENT("PmenuThumb ctermbg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6942 "PmenuThumb ctermbg=Black guibg=Black"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6943 CENT("Pmenu ctermbg=LightMagenta ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6944 "Pmenu ctermbg=LightMagenta ctermfg=Black guibg=LightMagenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6945 CENT("PmenuSel ctermbg=LightGrey ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6946 "PmenuSel ctermbg=LightGrey ctermfg=Black guibg=Grey"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6947 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6948 CENT("SpecialKey term=bold ctermfg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6949 "SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6950 CENT("Title term=bold ctermfg=DarkMagenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6951 "Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6952 CENT("WarningMsg term=standout ctermfg=DarkRed", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6953 "WarningMsg term=standout ctermfg=DarkRed guifg=Red"), |
| 806 | 6954 #ifdef FEAT_WILDMENU |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6955 CENT("WildMenu term=standout ctermbg=Yellow ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6956 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"), |
| 806 | 6957 #endif |
| 6958 #ifdef FEAT_FOLDING | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6959 CENT("Folded term=standout ctermbg=Grey ctermfg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6960 "Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6961 CENT("FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6962 "FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"), |
| 806 | 6963 #endif |
| 6964 #ifdef FEAT_SIGNS | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6965 CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6966 "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6967 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6968 CENT("Visual term=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6969 "Visual term=reverse guibg=LightGrey"), |
| 806 | 6970 #ifdef FEAT_DIFF |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6971 CENT("DiffAdd term=bold ctermbg=LightBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6972 "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6973 CENT("DiffChange term=bold ctermbg=LightMagenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6974 "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6975 CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6976 "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan"), |
| 806 | 6977 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6978 CENT("TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6979 "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey"), |
| 806 | 6980 #ifdef FEAT_SYN_HL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6981 CENT("CursorColumn term=reverse ctermbg=LightGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6982 "CursorColumn term=reverse ctermbg=LightGrey guibg=Grey90"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6983 CENT("CursorLine term=underline cterm=underline", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6984 "CursorLine term=underline cterm=underline guibg=Grey90"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6985 CENT("ColorColumn term=reverse ctermbg=LightRed", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6986 "ColorColumn term=reverse ctermbg=LightRed guibg=LightRed"), |
| 806 | 6987 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6988 #ifdef FEAT_CONCEAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6989 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6990 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"), |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6991 #endif |
| 834 | 6992 #ifdef FEAT_AUTOCMD |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6993 CENT("MatchParen term=reverse ctermbg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6994 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"), |
| 834 | 6995 #endif |
| 806 | 6996 #ifdef FEAT_GUI |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6997 "Normal gui=NONE", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6998 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6999 #ifdef FEAT_TERMINAL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7000 CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7001 "StatusLineTerm term=reverse,bold cterm=bold ctermfg=White ctermbg=DarkGreen gui=bold guifg=bg guibg=DarkGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7002 CENT("StatusLineTermNC term=reverse ctermfg=White ctermbg=DarkGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7003 "StatusLineTermNC term=reverse ctermfg=White ctermbg=DarkGreen guifg=bg guibg=DarkGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7004 #endif |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7005 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7006 CENT("ToolbarLine term=underline ctermbg=LightGrey", |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7007 "ToolbarLine term=underline ctermbg=LightGrey guibg=LightGrey"), |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7008 CENT("ToolbarButton cterm=bold ctermfg=White ctermbg=DarkGrey", |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7009 "ToolbarButton cterm=bold ctermfg=White ctermbg=DarkGrey gui=bold guifg=White guibg=DarkGrey"), |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7010 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7011 NULL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7012 }; |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7013 |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7014 /* Default colors only used with a dark background. */ |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7015 static char *(highlight_init_dark[]) = { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7016 CENT("Directory term=bold ctermfg=LightCyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7017 "Directory term=bold ctermfg=LightCyan guifg=Cyan"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7018 CENT("LineNr term=underline ctermfg=Yellow", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7019 "LineNr term=underline ctermfg=Yellow guifg=Yellow"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7020 CENT("CursorLineNr term=bold ctermfg=Yellow", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7021 "CursorLineNr term=bold ctermfg=Yellow gui=bold guifg=Yellow"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7022 CENT("MoreMsg term=bold ctermfg=LightGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7023 "MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7024 CENT("Question term=standout ctermfg=LightGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7025 "Question term=standout ctermfg=LightGreen gui=bold guifg=Green"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7026 CENT("Search term=reverse ctermbg=Yellow ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7027 "Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7028 CENT("SpecialKey term=bold ctermfg=LightBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7029 "SpecialKey term=bold ctermfg=LightBlue guifg=Cyan"), |
| 806 | 7030 #ifdef FEAT_SPELL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7031 CENT("SpellBad term=reverse ctermbg=Red", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7032 "SpellBad term=reverse ctermbg=Red guisp=Red gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7033 CENT("SpellCap term=reverse ctermbg=Blue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7034 "SpellCap term=reverse ctermbg=Blue guisp=Blue gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7035 CENT("SpellRare term=reverse ctermbg=Magenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7036 "SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7037 CENT("SpellLocal term=underline ctermbg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7038 "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"), |
| 806 | 7039 #endif |
| 7040 #ifdef FEAT_INS_EXPAND | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7041 CENT("PmenuThumb ctermbg=White", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7042 "PmenuThumb ctermbg=White guibg=White"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7043 CENT("Pmenu ctermbg=Magenta ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7044 "Pmenu ctermbg=Magenta ctermfg=Black guibg=Magenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7045 CENT("PmenuSel ctermbg=Black ctermfg=DarkGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7046 "PmenuSel ctermbg=Black ctermfg=DarkGrey guibg=DarkGrey"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7047 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7048 CENT("Title term=bold ctermfg=LightMagenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7049 "Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7050 CENT("WarningMsg term=standout ctermfg=LightRed", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7051 "WarningMsg term=standout ctermfg=LightRed guifg=Red"), |
| 806 | 7052 #ifdef FEAT_WILDMENU |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7053 CENT("WildMenu term=standout ctermbg=Yellow ctermfg=Black", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7054 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"), |
| 806 | 7055 #endif |
| 7056 #ifdef FEAT_FOLDING | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7057 CENT("Folded term=standout ctermbg=DarkGrey ctermfg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7058 "Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7059 CENT("FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7060 "FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"), |
| 806 | 7061 #endif |
| 7062 #ifdef FEAT_SIGNS | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7063 CENT("SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7064 "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7065 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7066 CENT("Visual term=reverse", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7067 "Visual term=reverse guibg=DarkGrey"), |
| 806 | 7068 #ifdef FEAT_DIFF |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7069 CENT("DiffAdd term=bold ctermbg=DarkBlue", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7070 "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7071 CENT("DiffChange term=bold ctermbg=DarkMagenta", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7072 "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7073 CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7074 "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan"), |
| 806 | 7075 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7076 CENT("TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7077 "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey"), |
| 806 | 7078 #ifdef FEAT_SYN_HL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7079 CENT("CursorColumn term=reverse ctermbg=DarkGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7080 "CursorColumn term=reverse ctermbg=DarkGrey guibg=Grey40"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7081 CENT("CursorLine term=underline cterm=underline", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7082 "CursorLine term=underline cterm=underline guibg=Grey40"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7083 CENT("ColorColumn term=reverse ctermbg=DarkRed", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7084 "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"), |
| 834 | 7085 #endif |
| 7086 #ifdef FEAT_AUTOCMD | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7087 CENT("MatchParen term=reverse ctermbg=DarkCyan", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7088 "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"), |
| 806 | 7089 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
7090 #ifdef FEAT_CONCEAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7091 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7092 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"), |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
7093 #endif |
| 806 | 7094 #ifdef FEAT_GUI |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7095 "Normal gui=NONE", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7096 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7097 #ifdef FEAT_TERMINAL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7098 CENT("StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7099 "StatusLineTerm term=reverse,bold cterm=bold ctermfg=Black ctermbg=LightGreen gui=bold guifg=bg guibg=LightGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7100 CENT("StatusLineTermNC term=reverse ctermfg=Black ctermbg=LightGreen", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7101 "StatusLineTermNC term=reverse ctermfg=Black ctermbg=LightGreen guifg=bg guibg=LightGreen"), |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7102 #endif |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7103 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7104 CENT("ToolbarLine term=underline ctermbg=DarkGrey", |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7105 "ToolbarLine term=underline ctermbg=DarkGrey guibg=DarkGrey"), |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7106 CENT("ToolbarButton cterm=bold ctermfg=Black ctermbg=LightGrey", |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7107 "ToolbarButton cterm=bold ctermfg=Black ctermbg=LightGrey gui=bold guifg=Black guibg=LightGrey"), |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7108 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7109 NULL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7110 }; |
| 7 | 7111 |
| 7112 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7113 init_highlight( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7114 int both, /* include groups where 'bg' doesn't matter */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7115 int reset) /* clear group first */ |
| 7 | 7116 { |
| 7117 int i; | |
| 7118 char **pp; | |
| 7119 static int had_both = FALSE; | |
| 7120 #ifdef FEAT_EVAL | |
| 7121 char_u *p; | |
| 7122 | |
| 7123 /* | |
| 7124 * Try finding the color scheme file. Used when a color file was loaded | |
| 7125 * and 'background' or 't_Co' is changed. | |
| 7126 */ | |
| 7127 p = get_var_value((char_u *)"g:colors_name"); | |
| 6671 | 7128 if (p != NULL) |
| 7129 { | |
| 7130 /* The value of g:colors_name could be freed when sourcing the script, | |
| 7131 * making "p" invalid, so copy it. */ | |
| 7132 char_u *copy_p = vim_strsave(p); | |
| 7133 int r; | |
| 7134 | |
| 7135 if (copy_p != NULL) | |
| 7136 { | |
| 7137 r = load_colors(copy_p); | |
| 7138 vim_free(copy_p); | |
| 7139 if (r == OK) | |
| 7140 return; | |
| 7141 } | |
| 7142 } | |
| 7143 | |
| 7 | 7144 #endif |
| 7145 | |
| 7146 /* | |
| 7147 * Didn't use a color file, use the compiled-in colors. | |
| 7148 */ | |
| 7149 if (both) | |
| 7150 { | |
| 7151 had_both = TRUE; | |
| 7152 pp = highlight_init_both; | |
| 7153 for (i = 0; pp[i] != NULL; ++i) | |
| 7154 do_highlight((char_u *)pp[i], reset, TRUE); | |
| 7155 } | |
| 7156 else if (!had_both) | |
| 7157 /* Don't do anything before the call with both == TRUE from main(). | |
| 7158 * Not everything has been setup then, and that call will overrule | |
| 7159 * everything anyway. */ | |
| 7160 return; | |
| 7161 | |
| 7162 if (*p_bg == 'l') | |
| 7163 pp = highlight_init_light; | |
| 7164 else | |
| 7165 pp = highlight_init_dark; | |
| 7166 for (i = 0; pp[i] != NULL; ++i) | |
| 7167 do_highlight((char_u *)pp[i], reset, TRUE); | |
| 7168 | |
| 836 | 7169 /* Reverse looks ugly, but grey may not work for 8 colors. Thus let it |
| 844 | 7170 * depend on the number of colors available. |
| 7171 * With 8 colors brown is equal to yellow, need to use black for Search fg | |
| 1697 | 7172 * to avoid Statement highlighted text disappears. |
| 7173 * Clear the attributes, needed when changing the t_Co value. */ | |
| 527 | 7174 if (t_colors > 8) |
| 1697 | 7175 do_highlight((char_u *)(*p_bg == 'l' |
| 7176 ? "Visual cterm=NONE ctermbg=LightGrey" | |
| 7177 : "Visual cterm=NONE ctermbg=DarkGrey"), FALSE, TRUE); | |
| 836 | 7178 else |
| 844 | 7179 { |
| 1697 | 7180 do_highlight((char_u *)"Visual cterm=reverse ctermbg=NONE", |
| 7181 FALSE, TRUE); | |
| 844 | 7182 if (*p_bg == 'l') |
| 7183 do_highlight((char_u *)"Search ctermfg=black", FALSE, TRUE); | |
| 7184 } | |
| 527 | 7185 |
| 7 | 7186 #ifdef FEAT_SYN_HL |
| 7187 /* | |
| 7188 * If syntax highlighting is enabled load the highlighting for it. | |
| 7189 */ | |
| 7190 if (get_var_value((char_u *)"g:syntax_on") != NULL) | |
| 24 | 7191 { |
| 7192 static int recursive = 0; | |
| 7193 | |
| 7194 if (recursive >= 5) | |
| 7195 EMSG(_("E679: recursive loop loading syncolor.vim")); | |
| 7196 else | |
| 7197 { | |
| 7198 ++recursive; | |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
8514
diff
changeset
|
7199 (void)source_runtime((char_u *)"syntax/syncolor.vim", DIP_ALL); |
| 24 | 7200 --recursive; |
| 7201 } | |
| 7202 } | |
| 7 | 7203 #endif |
| 7204 } | |
| 7205 | |
| 7206 /* | |
| 12 | 7207 * Load color file "name". |
| 7 | 7208 * Return OK for success, FAIL for failure. |
| 7209 */ | |
| 7210 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7211 load_colors(char_u *name) |
| 7 | 7212 { |
| 7213 char_u *buf; | |
| 7214 int retval = FAIL; | |
| 7215 static int recursive = FALSE; | |
| 7216 | |
| 7217 /* When being called recursively, this is probably because setting | |
| 7218 * 'background' caused the highlighting to be reloaded. This means it is | |
| 7219 * working, thus we should return OK. */ | |
| 7220 if (recursive) | |
| 7221 return OK; | |
| 7222 | |
| 7223 recursive = TRUE; | |
| 12 | 7224 buf = alloc((unsigned)(STRLEN(name) + 12)); |
| 7 | 7225 if (buf != NULL) |
| 7226 { | |
| 12 | 7227 sprintf((char *)buf, "colors/%s.vim", name); |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
8514
diff
changeset
|
7228 retval = source_runtime(buf, DIP_START + DIP_OPT); |
| 7 | 7229 vim_free(buf); |
| 12 | 7230 #ifdef FEAT_AUTOCMD |
| 5521 | 7231 apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf); |
| 12 | 7232 #endif |
| 7 | 7233 } |
| 7234 recursive = FALSE; | |
| 7235 | |
| 7236 return retval; | |
| 7237 } | |
| 7238 | |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7239 static char *(color_names[28]) = { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7240 "Black", "DarkBlue", "DarkGreen", "DarkCyan", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7241 "DarkRed", "DarkMagenta", "Brown", "DarkYellow", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7242 "Gray", "Grey", "LightGray", "LightGrey", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7243 "DarkGray", "DarkGrey", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7244 "Blue", "LightBlue", "Green", "LightGreen", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7245 "Cyan", "LightCyan", "Red", "LightRed", "Magenta", |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7246 "LightMagenta", "Yellow", "LightYellow", "White", "NONE"}; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7247 /* indices: |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7248 * 0, 1, 2, 3, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7249 * 4, 5, 6, 7, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7250 * 8, 9, 10, 11, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7251 * 12, 13, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7252 * 14, 15, 16, 17, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7253 * 18, 19, 20, 21, 22, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7254 * 23, 24, 25, 26, 27 */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7255 static int color_numbers_16[28] = {0, 1, 2, 3, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7256 4, 5, 6, 6, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7257 7, 7, 7, 7, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7258 8, 8, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7259 9, 9, 10, 10, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7260 11, 11, 12, 12, 13, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7261 13, 14, 14, 15, -1}; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7262 /* for xterm with 88 colors... */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7263 static int color_numbers_88[28] = {0, 4, 2, 6, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7264 1, 5, 32, 72, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7265 84, 84, 7, 7, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7266 82, 82, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7267 12, 43, 10, 61, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7268 14, 63, 9, 74, 13, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7269 75, 11, 78, 15, -1}; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7270 /* for xterm with 256 colors... */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7271 static int color_numbers_256[28] = {0, 4, 2, 6, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7272 1, 5, 130, 130, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7273 248, 248, 7, 7, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7274 242, 242, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7275 12, 81, 10, 121, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7276 14, 159, 9, 224, 13, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7277 225, 11, 229, 15, -1}; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7278 /* for terminals with less than 16 colors... */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7279 static int color_numbers_8[28] = {0, 4, 2, 6, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7280 1, 5, 3, 3, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7281 7, 7, 7, 7, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7282 0+8, 0+8, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7283 4+8, 4+8, 2+8, 2+8, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7284 6+8, 6+8, 1+8, 1+8, 5+8, |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7285 5+8, 3+8, 3+8, 7+8, -1}; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7286 |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7287 /* |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7288 * Lookup the "cterm" value to be used for color with index "idx" in |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7289 * color_names[]. |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7290 * "boldp" will be set to TRUE or FALSE for a foreground color when using 8 |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7291 * colors, otherwise it will be unchanged. |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7292 */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7293 int |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7294 lookup_color(int idx, int foreground, int *boldp) |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7295 { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7296 int color = color_numbers_16[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7297 char_u *p; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7298 |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7299 /* Use the _16 table to check if it's a valid color name. */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7300 if (color < 0) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7301 return -1; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7302 |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7303 if (t_colors == 8) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7304 { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7305 /* t_Co is 8: use the 8 colors table */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7306 #if defined(__QNXNTO__) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7307 color = color_numbers_8_qansi[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7308 #else |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7309 color = color_numbers_8[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7310 #endif |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7311 if (foreground) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7312 { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7313 /* set/reset bold attribute to get light foreground |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7314 * colors (on some terminals, e.g. "linux") */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7315 if (color & 8) |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7316 *boldp = TRUE; |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7317 else |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7318 *boldp = FALSE; |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7319 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7320 color &= 7; /* truncate to 8 colors */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7321 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7322 else if (t_colors == 16 || t_colors == 88 |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7323 || t_colors >= 256) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7324 { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7325 /* |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7326 * Guess: if the termcap entry ends in 'm', it is |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7327 * probably an xterm-like terminal. Use the changed |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7328 * order for colors. |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7329 */ |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7330 if (*T_CAF != NUL) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7331 p = T_CAF; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7332 else |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7333 p = T_CSF; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7334 if (*p != NUL && (t_colors > 256 |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7335 || *(p + STRLEN(p) - 1) == 'm')) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7336 { |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7337 if (t_colors == 88) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7338 color = color_numbers_88[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7339 else if (t_colors >= 256) |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7340 color = color_numbers_256[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7341 else |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7342 color = color_numbers_8[idx]; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7343 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7344 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7345 return color; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7346 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7347 |
| 7 | 7348 /* |
| 7349 * Handle the ":highlight .." command. | |
| 7350 * When using ":hi clear" this is called recursively for each group with | |
| 7351 * "forceit" and "init" both TRUE. | |
| 7352 */ | |
| 7353 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7354 do_highlight( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7355 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7356 int forceit, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7357 int init) /* TRUE when called for initializing */ |
| 7 | 7358 { |
| 7359 char_u *name_end; | |
| 7360 char_u *p; | |
| 7361 char_u *linep; | |
| 7362 char_u *key_start; | |
| 7363 char_u *arg_start; | |
| 7364 char_u *key = NULL, *arg = NULL; | |
| 7365 long i; | |
| 7366 int off; | |
| 7367 int len; | |
| 7368 int attr; | |
| 7369 int id; | |
| 7370 int idx; | |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7371 struct hl_group item_before; |
| 7 | 7372 int dodefault = FALSE; |
| 7373 int doclear = FALSE; | |
| 7374 int dolink = FALSE; | |
| 7375 int error = FALSE; | |
| 7376 int color; | |
| 7377 int is_normal_group = FALSE; /* "Normal" group */ | |
| 7378 #ifdef FEAT_GUI_X11 | |
| 7379 int is_menu_group = FALSE; /* "Menu" group */ | |
| 7380 int is_scrollbar_group = FALSE; /* "Scrollbar" group */ | |
| 7381 int is_tooltip_group = FALSE; /* "Tooltip" group */ | |
| 7382 int do_colors = FALSE; /* need to update colors? */ | |
| 7383 #else | |
| 7384 # define is_menu_group 0 | |
| 7385 # define is_tooltip_group 0 | |
| 7386 #endif | |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7387 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7388 int did_highlight_changed = FALSE; |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7389 #endif |
| 7 | 7390 |
| 7391 /* | |
| 7392 * If no argument, list current highlighting. | |
| 7393 */ | |
| 7394 if (ends_excmd(*line)) | |
| 7395 { | |
| 7396 for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i) | |
| 7397 /* TODO: only call when the group has attributes set */ | |
| 7398 highlight_list_one((int)i); | |
| 7399 return; | |
| 7400 } | |
| 7401 | |
| 7402 /* | |
| 7403 * Isolate the name. | |
| 7404 */ | |
| 7405 name_end = skiptowhite(line); | |
| 7406 linep = skipwhite(name_end); | |
| 7407 | |
| 7408 /* | |
| 7409 * Check for "default" argument. | |
| 7410 */ | |
| 7411 if (STRNCMP(line, "default", name_end - line) == 0) | |
| 7412 { | |
| 7413 dodefault = TRUE; | |
| 7414 line = linep; | |
| 7415 name_end = skiptowhite(line); | |
| 7416 linep = skipwhite(name_end); | |
| 7417 } | |
| 7418 | |
| 7419 /* | |
| 7420 * Check for "clear" or "link" argument. | |
| 7421 */ | |
| 7422 if (STRNCMP(line, "clear", name_end - line) == 0) | |
| 7423 doclear = TRUE; | |
| 7424 if (STRNCMP(line, "link", name_end - line) == 0) | |
| 7425 dolink = TRUE; | |
| 7426 | |
| 7427 /* | |
| 7428 * ":highlight {group-name}": list highlighting for one group. | |
| 7429 */ | |
| 7430 if (!doclear && !dolink && ends_excmd(*linep)) | |
| 7431 { | |
| 7432 id = syn_namen2id(line, (int)(name_end - line)); | |
| 7433 if (id == 0) | |
| 7434 EMSG2(_("E411: highlight group not found: %s"), line); | |
| 7435 else | |
| 7436 highlight_list_one(id); | |
| 7437 return; | |
| 7438 } | |
| 7439 | |
| 7440 /* | |
| 7441 * Handle ":highlight link {from} {to}" command. | |
| 7442 */ | |
| 7443 if (dolink) | |
| 7444 { | |
| 7445 char_u *from_start = linep; | |
| 7446 char_u *from_end; | |
| 7447 char_u *to_start; | |
| 7448 char_u *to_end; | |
| 7449 int from_id; | |
| 7450 int to_id; | |
| 7451 | |
| 7452 from_end = skiptowhite(from_start); | |
| 7453 to_start = skipwhite(from_end); | |
| 7454 to_end = skiptowhite(to_start); | |
| 7455 | |
| 7456 if (ends_excmd(*from_start) || ends_excmd(*to_start)) | |
| 7457 { | |
| 7458 EMSG2(_("E412: Not enough arguments: \":highlight link %s\""), | |
| 7459 from_start); | |
| 7460 return; | |
| 7461 } | |
| 7462 | |
| 7463 if (!ends_excmd(*skipwhite(to_end))) | |
| 7464 { | |
| 7465 EMSG2(_("E413: Too many arguments: \":highlight link %s\""), from_start); | |
| 7466 return; | |
| 7467 } | |
| 7468 | |
| 7469 from_id = syn_check_group(from_start, (int)(from_end - from_start)); | |
| 7470 if (STRNCMP(to_start, "NONE", 4) == 0) | |
| 7471 to_id = 0; | |
| 7472 else | |
| 7473 to_id = syn_check_group(to_start, (int)(to_end - to_start)); | |
| 7474 | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7475 if (from_id > 0 && (!init || HL_TABLE()[from_id - 1].sg_set == 0)) |
| 7 | 7476 { |
| 7477 /* | |
| 7478 * Don't allow a link when there already is some highlighting | |
| 7479 * for the group, unless '!' is used | |
| 7480 */ | |
| 7481 if (to_id > 0 && !forceit && !init | |
| 7482 && hl_has_settings(from_id - 1, dodefault)) | |
| 7483 { | |
| 7484 if (sourcing_name == NULL && !dodefault) | |
| 7485 EMSG(_("E414: group has settings, highlight link ignored")); | |
| 7486 } | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7487 else if (HL_TABLE()[from_id - 1].sg_link != to_id |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7488 #ifdef FEAT_EVAL |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7489 || HL_TABLE()[from_id - 1].sg_scriptID != current_SID |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7490 #endif |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7491 || HL_TABLE()[from_id - 1].sg_cleared) |
| 7 | 7492 { |
| 7493 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7494 HL_TABLE()[from_id - 1].sg_set |= SG_LINK; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7495 HL_TABLE()[from_id - 1].sg_link = to_id; |
| 448 | 7496 #ifdef FEAT_EVAL |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7497 HL_TABLE()[from_id - 1].sg_scriptID = current_SID; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7498 #endif |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7499 HL_TABLE()[from_id - 1].sg_cleared = FALSE; |
| 745 | 7500 redraw_all_later(SOME_VALID); |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7501 |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7502 /* Only call highlight_changed() once after multiple changes. */ |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7503 need_highlight_changed = TRUE; |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7504 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7505 } |
| 7 | 7506 |
| 7507 return; | |
| 7508 } | |
| 7509 | |
| 7510 if (doclear) | |
| 7511 { | |
| 7512 /* | |
| 7513 * ":highlight clear [group]" command. | |
| 7514 */ | |
| 7515 line = linep; | |
| 7516 if (ends_excmd(*line)) | |
| 7517 { | |
| 7518 #ifdef FEAT_GUI | |
| 7519 /* First, we do not destroy the old values, but allocate the new | |
| 7520 * ones and update the display. THEN we destroy the old values. | |
| 7521 * If we destroy the old values first, then the old values | |
| 7522 * (such as GuiFont's or GuiFontset's) will still be displayed but | |
| 7523 * invalid because they were free'd. | |
| 7524 */ | |
| 7525 if (gui.in_use) | |
| 7526 { | |
| 7527 # ifdef FEAT_BEVAL_TIP | |
| 7528 gui_init_tooltip_font(); | |
| 7529 # endif | |
| 7530 # if defined(FEAT_MENU) && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) | |
| 7531 gui_init_menu_font(); | |
| 7532 # endif | |
| 7533 } | |
| 7534 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_X11) | |
| 7535 gui_mch_def_colors(); | |
| 7536 # endif | |
| 7537 # ifdef FEAT_GUI_X11 | |
| 7538 # ifdef FEAT_MENU | |
| 7539 | |
| 7540 /* This only needs to be done when there is no Menu highlight | |
| 7541 * group defined by default, which IS currently the case. | |
| 7542 */ | |
| 7543 gui_mch_new_menu_colors(); | |
| 7544 # endif | |
| 7545 if (gui.in_use) | |
| 7546 { | |
| 7547 gui_new_scrollbar_colors(); | |
| 7548 # ifdef FEAT_BEVAL | |
| 7549 gui_mch_new_tooltip_colors(); | |
| 7550 # endif | |
| 7551 # ifdef FEAT_MENU | |
| 7552 gui_mch_new_menu_font(); | |
| 7553 # endif | |
| 7554 } | |
| 7555 # endif | |
| 7556 | |
| 7557 /* Ok, we're done allocating the new default graphics items. | |
| 7558 * The screen should already be refreshed at this point. | |
| 7559 * It is now Ok to clear out the old data. | |
| 7560 */ | |
| 7561 #endif | |
| 7562 #ifdef FEAT_EVAL | |
| 148 | 7563 do_unlet((char_u *)"colors_name", TRUE); |
| 7 | 7564 #endif |
| 7565 restore_cterm_colors(); | |
| 7566 | |
| 7567 /* | |
| 7568 * Clear all default highlight groups and load the defaults. | |
| 7569 */ | |
| 7570 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 7571 highlight_clear(idx); | |
| 7572 init_highlight(TRUE, TRUE); | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7573 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
7574 if (USE_24BIT) |
| 7 | 7575 highlight_gui_started(); |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7576 else |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7577 #endif |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7578 highlight_changed(); |
| 7 | 7579 redraw_later_clear(); |
| 7580 return; | |
| 7581 } | |
| 7582 name_end = skiptowhite(line); | |
| 7583 linep = skipwhite(name_end); | |
| 7584 } | |
| 7585 | |
| 7586 /* | |
| 7587 * Find the group name in the table. If it does not exist yet, add it. | |
| 7588 */ | |
| 7589 id = syn_check_group(line, (int)(name_end - line)); | |
| 7590 if (id == 0) /* failed (out of memory) */ | |
| 7591 return; | |
| 7592 idx = id - 1; /* index is ID minus one */ | |
| 7593 | |
| 7594 /* Return if "default" was used and the group already has settings. */ | |
| 7595 if (dodefault && hl_has_settings(idx, TRUE)) | |
| 7596 return; | |
| 7597 | |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7598 /* Make a copy so we can check if any attribute actually changed. */ |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7599 item_before = HL_TABLE()[idx]; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7600 |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7601 if (STRCMP(HL_TABLE()[idx].sg_name_u, "NORMAL") == 0) |
| 7 | 7602 is_normal_group = TRUE; |
| 7603 #ifdef FEAT_GUI_X11 | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7604 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "MENU") == 0) |
| 7 | 7605 is_menu_group = TRUE; |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7606 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "SCROLLBAR") == 0) |
| 7 | 7607 is_scrollbar_group = TRUE; |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7608 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "TOOLTIP") == 0) |
| 7 | 7609 is_tooltip_group = TRUE; |
| 7610 #endif | |
| 7611 | |
| 7612 /* Clear the highlighting for ":hi clear {group}" and ":hi clear". */ | |
| 7613 if (doclear || (forceit && init)) | |
| 7614 { | |
| 7615 highlight_clear(idx); | |
| 7616 if (!doclear) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7617 HL_TABLE()[idx].sg_set = 0; |
| 7 | 7618 } |
| 7619 | |
| 7620 if (!doclear) | |
| 7621 while (!ends_excmd(*linep)) | |
| 7622 { | |
| 7623 key_start = linep; | |
| 7624 if (*linep == '=') | |
| 7625 { | |
| 7626 EMSG2(_("E415: unexpected equal sign: %s"), key_start); | |
| 7627 error = TRUE; | |
| 7628 break; | |
| 7629 } | |
| 7630 | |
| 7631 /* | |
| 7632 * Isolate the key ("term", "ctermfg", "ctermbg", "font", "guifg" or | |
| 7633 * "guibg"). | |
| 7634 */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
7635 while (*linep && !VIM_ISWHITE(*linep) && *linep != '=') |
| 7 | 7636 ++linep; |
| 7637 vim_free(key); | |
| 7638 key = vim_strnsave_up(key_start, (int)(linep - key_start)); | |
| 7639 if (key == NULL) | |
| 7640 { | |
| 7641 error = TRUE; | |
| 7642 break; | |
| 7643 } | |
| 7644 linep = skipwhite(linep); | |
| 7645 | |
| 7646 if (STRCMP(key, "NONE") == 0) | |
| 7647 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7648 if (!init || HL_TABLE()[idx].sg_set == 0) |
| 7 | 7649 { |
| 7650 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7651 HL_TABLE()[idx].sg_set |= SG_TERM+SG_CTERM+SG_GUI; |
| 7 | 7652 highlight_clear(idx); |
| 7653 } | |
| 7654 continue; | |
| 7655 } | |
| 7656 | |
| 7657 /* | |
| 7658 * Check for the equal sign. | |
| 7659 */ | |
| 7660 if (*linep != '=') | |
| 7661 { | |
| 7662 EMSG2(_("E416: missing equal sign: %s"), key_start); | |
| 7663 error = TRUE; | |
| 7664 break; | |
| 7665 } | |
| 7666 ++linep; | |
| 7667 | |
| 7668 /* | |
| 7669 * Isolate the argument. | |
| 7670 */ | |
| 7671 linep = skipwhite(linep); | |
| 7672 if (*linep == '\'') /* guifg='color name' */ | |
| 7673 { | |
| 7674 arg_start = ++linep; | |
| 7675 linep = vim_strchr(linep, '\''); | |
| 7676 if (linep == NULL) | |
| 7677 { | |
| 7678 EMSG2(_(e_invarg2), key_start); | |
| 7679 error = TRUE; | |
| 7680 break; | |
| 7681 } | |
| 7682 } | |
| 7683 else | |
| 7684 { | |
| 7685 arg_start = linep; | |
| 7686 linep = skiptowhite(linep); | |
| 7687 } | |
| 7688 if (linep == arg_start) | |
| 7689 { | |
| 7690 EMSG2(_("E417: missing argument: %s"), key_start); | |
| 7691 error = TRUE; | |
| 7692 break; | |
| 7693 } | |
| 7694 vim_free(arg); | |
| 7695 arg = vim_strnsave(arg_start, (int)(linep - arg_start)); | |
| 7696 if (arg == NULL) | |
| 7697 { | |
| 7698 error = TRUE; | |
| 7699 break; | |
| 7700 } | |
| 7701 if (*linep == '\'') | |
| 7702 ++linep; | |
| 7703 | |
| 7704 /* | |
| 7705 * Store the argument. | |
| 7706 */ | |
| 7707 if ( STRCMP(key, "TERM") == 0 | |
| 7708 || STRCMP(key, "CTERM") == 0 | |
| 7709 || STRCMP(key, "GUI") == 0) | |
| 7710 { | |
| 7711 attr = 0; | |
| 7712 off = 0; | |
| 7713 while (arg[off] != NUL) | |
| 7714 { | |
| 7715 for (i = sizeof(hl_attr_table) / sizeof(int); --i >= 0; ) | |
| 7716 { | |
| 7717 len = (int)STRLEN(hl_name_table[i]); | |
| 7718 if (STRNICMP(arg + off, hl_name_table[i], len) == 0) | |
| 7719 { | |
| 7720 attr |= hl_attr_table[i]; | |
| 7721 off += len; | |
| 7722 break; | |
| 7723 } | |
| 7724 } | |
| 7725 if (i < 0) | |
| 7726 { | |
| 7727 EMSG2(_("E418: Illegal value: %s"), arg); | |
| 7728 error = TRUE; | |
| 7729 break; | |
| 7730 } | |
| 7731 if (arg[off] == ',') /* another one follows */ | |
| 7732 ++off; | |
| 7733 } | |
| 7734 if (error) | |
| 7735 break; | |
| 7736 if (*key == 'T') | |
| 7737 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7738 if (!init || !(HL_TABLE()[idx].sg_set & SG_TERM)) |
| 7 | 7739 { |
| 7740 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7741 HL_TABLE()[idx].sg_set |= SG_TERM; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7742 HL_TABLE()[idx].sg_term = attr; |
| 7 | 7743 } |
| 7744 } | |
| 7745 else if (*key == 'C') | |
| 7746 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7747 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM)) |
| 7 | 7748 { |
| 7749 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7750 HL_TABLE()[idx].sg_set |= SG_CTERM; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7751 HL_TABLE()[idx].sg_cterm = attr; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7752 HL_TABLE()[idx].sg_cterm_bold = FALSE; |
| 7 | 7753 } |
| 7754 } | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7755 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 7756 else |
| 7757 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7758 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 7759 { |
| 7760 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7761 HL_TABLE()[idx].sg_set |= SG_GUI; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7762 HL_TABLE()[idx].sg_gui = attr; |
| 7 | 7763 } |
| 7764 } | |
| 7765 #endif | |
| 7766 } | |
| 7767 else if (STRCMP(key, "FONT") == 0) | |
| 7768 { | |
| 7769 /* in non-GUI fonts are simply ignored */ | |
| 7770 #ifdef FEAT_GUI | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7771 if (HL_TABLE()[idx].sg_font_name != NULL |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7772 && STRCMP(HL_TABLE()[idx].sg_font_name, arg) == 0) |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7773 { |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7774 /* Font name didn't change, ignore. */ |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7775 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7776 else if (!gui.shell_created) |
| 7 | 7777 { |
| 7778 /* GUI not started yet, always accept the name. */ | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7779 vim_free(HL_TABLE()[idx].sg_font_name); |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7780 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
| 7 | 7781 } |
| 7782 else | |
| 7783 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7784 GuiFont temp_sg_font = HL_TABLE()[idx].sg_font; |
| 7 | 7785 # ifdef FEAT_XFONTSET |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7786 GuiFontset temp_sg_fontset = HL_TABLE()[idx].sg_fontset; |
| 7 | 7787 # endif |
| 7788 /* First, save the current font/fontset. | |
| 7789 * Then try to allocate the font/fontset. | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7790 * If the allocation fails, HL_TABLE()[idx].sg_font OR |
| 7 | 7791 * sg_fontset will be set to NOFONT or NOFONTSET respectively. |
| 7792 */ | |
| 7793 | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7794 HL_TABLE()[idx].sg_font = NOFONT; |
| 7 | 7795 # ifdef FEAT_XFONTSET |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7796 HL_TABLE()[idx].sg_fontset = NOFONTSET; |
| 7 | 7797 # endif |
| 7798 hl_do_font(idx, arg, is_normal_group, is_menu_group, | |
| 3881 | 7799 is_tooltip_group, FALSE); |
| 7 | 7800 |
| 7801 # ifdef FEAT_XFONTSET | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7802 if (HL_TABLE()[idx].sg_fontset != NOFONTSET) |
| 7 | 7803 { |
| 3881 | 7804 /* New fontset was accepted. Free the old one, if there |
| 7805 * was one. */ | |
| 7 | 7806 gui_mch_free_fontset(temp_sg_fontset); |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7807 vim_free(HL_TABLE()[idx].sg_font_name); |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7808 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
| 7 | 7809 } |
| 7810 else | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7811 HL_TABLE()[idx].sg_fontset = temp_sg_fontset; |
| 7 | 7812 # endif |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7813 if (HL_TABLE()[idx].sg_font != NOFONT) |
| 7 | 7814 { |
| 7815 /* New font was accepted. Free the old one, if there was | |
| 3881 | 7816 * one. */ |
| 7 | 7817 gui_mch_free_font(temp_sg_font); |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7818 vim_free(HL_TABLE()[idx].sg_font_name); |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7819 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
| 7 | 7820 } |
| 7821 else | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7822 HL_TABLE()[idx].sg_font = temp_sg_font; |
| 7 | 7823 } |
| 7824 #endif | |
| 7825 } | |
| 7826 else if (STRCMP(key, "CTERMFG") == 0 || STRCMP(key, "CTERMBG") == 0) | |
| 7827 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7828 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM)) |
| 7 | 7829 { |
| 7830 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7831 HL_TABLE()[idx].sg_set |= SG_CTERM; |
| 7 | 7832 |
| 7833 /* When setting the foreground color, and previously the "bold" | |
| 7834 * flag was set for a light color, reset it now */ | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7835 if (key[5] == 'F' && HL_TABLE()[idx].sg_cterm_bold) |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7836 { |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7837 HL_TABLE()[idx].sg_cterm &= ~HL_BOLD; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7838 HL_TABLE()[idx].sg_cterm_bold = FALSE; |
| 7 | 7839 } |
| 7840 | |
| 7841 if (VIM_ISDIGIT(*arg)) | |
| 7842 color = atoi((char *)arg); | |
| 7843 else if (STRICMP(arg, "fg") == 0) | |
| 7844 { | |
| 7845 if (cterm_normal_fg_color) | |
| 7846 color = cterm_normal_fg_color - 1; | |
| 7847 else | |
| 7848 { | |
| 7849 EMSG(_("E419: FG color unknown")); | |
| 7850 error = TRUE; | |
| 7851 break; | |
| 7852 } | |
| 7853 } | |
| 7854 else if (STRICMP(arg, "bg") == 0) | |
| 7855 { | |
| 7856 if (cterm_normal_bg_color > 0) | |
| 7857 color = cterm_normal_bg_color - 1; | |
| 7858 else | |
| 7859 { | |
| 7860 EMSG(_("E420: BG color unknown")); | |
| 7861 error = TRUE; | |
| 7862 break; | |
| 7863 } | |
| 7864 } | |
| 7865 else | |
| 7866 { | |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7867 int bold = MAYBE; |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7868 |
| 7 | 7869 #if defined(__QNXNTO__) |
| 7870 static int *color_numbers_8_qansi = color_numbers_8; | |
| 7871 /* On qnx, the 8 & 16 color arrays are the same */ | |
| 7872 if (STRNCMP(T_NAME, "qansi", 5) == 0) | |
| 7873 color_numbers_8_qansi = color_numbers_16; | |
| 7874 #endif | |
| 7875 | |
| 7876 /* reduce calls to STRICMP a bit, it can be slow */ | |
| 7877 off = TOUPPER_ASC(*arg); | |
| 7878 for (i = (sizeof(color_names) / sizeof(char *)); --i >= 0; ) | |
| 7879 if (off == color_names[i][0] | |
| 7880 && STRICMP(arg + 1, color_names[i] + 1) == 0) | |
| 7881 break; | |
| 7882 if (i < 0) | |
| 7883 { | |
| 7884 EMSG2(_("E421: Color name or number not recognized: %s"), key_start); | |
| 7885 error = TRUE; | |
| 7886 break; | |
| 7887 } | |
| 7888 | |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7889 color = lookup_color(i, key[5] == 'F', &bold); |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7890 |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7891 /* set/reset bold attribute to get light foreground |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7892 * colors (on some terminals, e.g. "linux") */ |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7893 if (bold == TRUE) |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7894 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7895 HL_TABLE()[idx].sg_cterm |= HL_BOLD; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7896 HL_TABLE()[idx].sg_cterm_bold = TRUE; |
|
11902
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7897 } |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7898 else if (bold == FALSE) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7899 HL_TABLE()[idx].sg_cterm &= ~HL_BOLD; |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7900 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7901 |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7902 /* Add one to the argument, to avoid zero. Zero is used for |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7903 * "NONE", then "color" is -1. */ |
| 7 | 7904 if (key[5] == 'F') |
| 7905 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7906 HL_TABLE()[idx].sg_cterm_fg = color + 1; |
| 7 | 7907 if (is_normal_group) |
| 7908 { | |
| 7909 cterm_normal_fg_color = color + 1; | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7910 cterm_normal_fg_bold = (HL_TABLE()[idx].sg_cterm & HL_BOLD); |
| 7 | 7911 #ifdef FEAT_GUI |
| 7912 /* Don't do this if the GUI is used. */ | |
| 7913 if (!gui.in_use && !gui.starting) | |
| 7914 #endif | |
| 7915 { | |
| 7916 must_redraw = CLEAR; | |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7917 if (termcap_active && color >= 0) |
| 7 | 7918 term_fg_color(color); |
| 7919 } | |
| 7920 } | |
| 7921 } | |
| 7922 else | |
| 7923 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7924 HL_TABLE()[idx].sg_cterm_bg = color + 1; |
| 7 | 7925 if (is_normal_group) |
| 7926 { | |
| 7927 cterm_normal_bg_color = color + 1; | |
| 7928 #ifdef FEAT_GUI | |
| 7929 /* Don't mess with 'background' if the GUI is used. */ | |
| 7930 if (!gui.in_use && !gui.starting) | |
| 7931 #endif | |
| 7932 { | |
| 7933 must_redraw = CLEAR; | |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7934 if (color >= 0) |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7935 { |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7936 int dark = -1; |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7937 |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7938 if (termcap_active) |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7939 term_bg_color(color); |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7940 if (t_colors < 16) |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7941 dark = (color == 0 || color == 4); |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7942 /* Limit the heuristic to the standard 16 colors */ |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7943 else if (color < 16) |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7944 dark = (color < 7 || color == 8); |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7945 /* Set the 'background' option if the value is |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7946 * wrong. */ |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7947 if (dark != -1 |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7948 && dark != (*p_bg == 'd') |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7949 && !option_was_set((char_u *)"bg")) |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7950 { |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7951 set_option_value((char_u *)"bg", 0L, |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7952 (char_u *)(dark ? "dark" : "light"), 0); |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7953 reset_option_was_set((char_u *)"bg"); |
|
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7954 } |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7955 } |
| 7 | 7956 } |
| 7957 } | |
| 7958 } | |
| 7959 } | |
| 7960 } | |
| 7961 else if (STRCMP(key, "GUIFG") == 0) | |
| 7962 { | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7963 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7964 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 7965 { |
| 205 | 7966 if (!init) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7967 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 7968 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7969 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7970 /* In GUI guifg colors are only used when recognized */ |
| 205 | 7971 i = color_name2handle(arg); |
|
9029
f06767547415
commit https://github.com/vim/vim/commit/631225627d448b591e529a5d3e7ac74ef44b8459
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
7972 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !USE_24BIT) |
| 205 | 7973 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7974 HL_TABLE()[idx].sg_gui_fg = i; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7975 # endif |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7976 vim_free(HL_TABLE()[idx].sg_gui_fg_name); |
|
11745
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
7977 if (STRCMP(arg, "NONE") != 0) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7978 HL_TABLE()[idx].sg_gui_fg_name = vim_strsave(arg); |
| 205 | 7979 else |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7980 HL_TABLE()[idx].sg_gui_fg_name = NULL; |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7981 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7982 # ifdef FEAT_GUI_X11 |
| 205 | 7983 if (is_menu_group) |
| 7984 gui.menu_fg_pixel = i; | |
| 7985 if (is_scrollbar_group) | |
| 7986 gui.scroll_fg_pixel = i; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7987 # ifdef FEAT_BEVAL |
| 205 | 7988 if (is_tooltip_group) |
| 7989 gui.tooltip_fg_pixel = i; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7990 # endif |
| 205 | 7991 do_colors = TRUE; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7992 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7993 } |
| 7 | 7994 # endif |
| 7995 } | |
| 7996 #endif | |
| 7997 } | |
| 7998 else if (STRCMP(key, "GUIBG") == 0) | |
| 7999 { | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8000 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8001 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 8002 { |
| 205 | 8003 if (!init) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8004 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 8005 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8006 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8007 /* In GUI guifg colors are only used when recognized */ |
| 205 | 8008 i = color_name2handle(arg); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8009 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !USE_24BIT) |
| 205 | 8010 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8011 HL_TABLE()[idx].sg_gui_bg = i; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8012 # endif |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8013 vim_free(HL_TABLE()[idx].sg_gui_bg_name); |
| 205 | 8014 if (STRCMP(arg, "NONE") != 0) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8015 HL_TABLE()[idx].sg_gui_bg_name = vim_strsave(arg); |
| 205 | 8016 else |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8017 HL_TABLE()[idx].sg_gui_bg_name = NULL; |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8018 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8019 # ifdef FEAT_GUI_X11 |
| 205 | 8020 if (is_menu_group) |
| 8021 gui.menu_bg_pixel = i; | |
| 8022 if (is_scrollbar_group) | |
| 8023 gui.scroll_bg_pixel = i; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8024 # ifdef FEAT_BEVAL |
| 205 | 8025 if (is_tooltip_group) |
| 8026 gui.tooltip_bg_pixel = i; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8027 # endif |
| 205 | 8028 do_colors = TRUE; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8029 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8030 } |
| 7 | 8031 # endif |
| 8032 } | |
| 205 | 8033 #endif |
| 8034 } | |
| 8035 else if (STRCMP(key, "GUISP") == 0) | |
| 8036 { | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8037 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8038 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 205 | 8039 { |
| 8040 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8041 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 8042 |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8043 # ifdef FEAT_GUI |
| 205 | 8044 i = color_name2handle(arg); |
| 8045 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use) | |
| 8046 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8047 HL_TABLE()[idx].sg_gui_sp = i; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8048 # endif |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8049 vim_free(HL_TABLE()[idx].sg_gui_sp_name); |
| 205 | 8050 if (STRCMP(arg, "NONE") != 0) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8051 HL_TABLE()[idx].sg_gui_sp_name = vim_strsave(arg); |
| 205 | 8052 else |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8053 HL_TABLE()[idx].sg_gui_sp_name = NULL; |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8054 # ifdef FEAT_GUI |
| 205 | 8055 } |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8056 # endif |
| 205 | 8057 } |
| 7 | 8058 #endif |
| 8059 } | |
| 8060 else if (STRCMP(key, "START") == 0 || STRCMP(key, "STOP") == 0) | |
| 8061 { | |
| 8062 char_u buf[100]; | |
| 8063 char_u *tname; | |
| 8064 | |
| 8065 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8066 HL_TABLE()[idx].sg_set |= SG_TERM; |
| 7 | 8067 |
| 8068 /* | |
| 8069 * The "start" and "stop" arguments can be a literal escape | |
| 1222 | 8070 * sequence, or a comma separated list of terminal codes. |
| 7 | 8071 */ |
| 8072 if (STRNCMP(arg, "t_", 2) == 0) | |
| 8073 { | |
| 8074 off = 0; | |
| 8075 buf[0] = 0; | |
| 8076 while (arg[off] != NUL) | |
| 8077 { | |
| 8078 /* Isolate one termcap name */ | |
| 8079 for (len = 0; arg[off + len] && | |
| 8080 arg[off + len] != ','; ++len) | |
| 8081 ; | |
| 8082 tname = vim_strnsave(arg + off, len); | |
| 8083 if (tname == NULL) /* out of memory */ | |
| 8084 { | |
| 8085 error = TRUE; | |
| 8086 break; | |
| 8087 } | |
| 8088 /* lookup the escape sequence for the item */ | |
| 8089 p = get_term_code(tname); | |
| 8090 vim_free(tname); | |
| 8091 if (p == NULL) /* ignore non-existing things */ | |
| 8092 p = (char_u *)""; | |
| 8093 | |
| 8094 /* Append it to the already found stuff */ | |
| 8095 if ((int)(STRLEN(buf) + STRLEN(p)) >= 99) | |
| 8096 { | |
| 8097 EMSG2(_("E422: terminal code too long: %s"), arg); | |
| 8098 error = TRUE; | |
| 8099 break; | |
| 8100 } | |
| 8101 STRCAT(buf, p); | |
| 8102 | |
| 8103 /* Advance to the next item */ | |
| 8104 off += len; | |
| 8105 if (arg[off] == ',') /* another one follows */ | |
| 8106 ++off; | |
| 8107 } | |
| 8108 } | |
| 8109 else | |
| 8110 { | |
| 8111 /* | |
| 8112 * Copy characters from arg[] to buf[], translating <> codes. | |
| 8113 */ | |
| 2593 | 8114 for (p = arg, off = 0; off < 100 - 6 && *p; ) |
| 7 | 8115 { |
|
9869
989d44d35a66
commit https://github.com/vim/vim/commit/35a4cfa200917dd171b1fff3cd5b6cee9add673d
Christian Brabandt <cb@256bit.org>
parents:
9141
diff
changeset
|
8116 len = trans_special(&p, buf + off, FALSE, FALSE); |
| 2593 | 8117 if (len > 0) /* recognized special char */ |
| 7 | 8118 off += len; |
| 8119 else /* copy as normal char */ | |
| 8120 buf[off++] = *p++; | |
| 8121 } | |
| 8122 buf[off] = NUL; | |
| 8123 } | |
| 8124 if (error) | |
| 8125 break; | |
| 8126 | |
| 8127 if (STRCMP(buf, "NONE") == 0) /* resetting the value */ | |
| 8128 p = NULL; | |
| 8129 else | |
| 8130 p = vim_strsave(buf); | |
| 8131 if (key[2] == 'A') | |
| 8132 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8133 vim_free(HL_TABLE()[idx].sg_start); |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8134 HL_TABLE()[idx].sg_start = p; |
| 7 | 8135 } |
| 8136 else | |
| 8137 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8138 vim_free(HL_TABLE()[idx].sg_stop); |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8139 HL_TABLE()[idx].sg_stop = p; |
| 7 | 8140 } |
| 8141 } | |
| 8142 else | |
| 8143 { | |
| 8144 EMSG2(_("E423: Illegal argument: %s"), key_start); | |
| 8145 error = TRUE; | |
| 8146 break; | |
| 8147 } | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8148 HL_TABLE()[idx].sg_cleared = FALSE; |
| 7 | 8149 |
| 8150 /* | |
| 8151 * When highlighting has been given for a group, don't link it. | |
| 8152 */ | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8153 if (!init || !(HL_TABLE()[idx].sg_set & SG_LINK)) |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8154 HL_TABLE()[idx].sg_link = 0; |
| 7 | 8155 |
| 8156 /* | |
| 8157 * Continue with next argument. | |
| 8158 */ | |
| 8159 linep = skipwhite(linep); | |
| 8160 } | |
| 8161 | |
| 8162 /* | |
| 8163 * If there is an error, and it's a new entry, remove it from the table. | |
| 8164 */ | |
| 8165 if (error && idx == highlight_ga.ga_len) | |
| 8166 syn_unadd_group(); | |
| 8167 else | |
| 8168 { | |
| 8169 if (is_normal_group) | |
| 8170 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8171 HL_TABLE()[idx].sg_term_attr = 0; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8172 HL_TABLE()[idx].sg_cterm_attr = 0; |
| 7 | 8173 #ifdef FEAT_GUI |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8174 HL_TABLE()[idx].sg_gui_attr = 0; |
| 7 | 8175 /* |
| 8176 * Need to update all groups, because they might be using "bg" | |
| 8177 * and/or "fg", which have been changed now. | |
| 8178 */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8179 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8180 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8181 if (USE_24BIT) |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8182 { |
| 7 | 8183 highlight_gui_started(); |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8184 did_highlight_changed = TRUE; |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8185 redraw_all_later(NOT_VALID); |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8186 } |
| 7 | 8187 #endif |
| 8188 } | |
| 8189 #ifdef FEAT_GUI_X11 | |
| 8190 # ifdef FEAT_MENU | |
| 8191 else if (is_menu_group) | |
| 8192 { | |
| 8193 if (gui.in_use && do_colors) | |
| 8194 gui_mch_new_menu_colors(); | |
| 8195 } | |
| 8196 # endif | |
| 8197 else if (is_scrollbar_group) | |
| 8198 { | |
| 8199 if (gui.in_use && do_colors) | |
| 8200 gui_new_scrollbar_colors(); | |
| 8201 } | |
| 8202 # ifdef FEAT_BEVAL | |
| 8203 else if (is_tooltip_group) | |
| 8204 { | |
| 8205 if (gui.in_use && do_colors) | |
| 8206 gui_mch_new_tooltip_colors(); | |
| 8207 } | |
| 8208 # endif | |
| 8209 #endif | |
| 8210 else | |
| 8211 set_hl_attr(idx); | |
| 448 | 8212 #ifdef FEAT_EVAL |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8213 HL_TABLE()[idx].sg_scriptID = current_SID; |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8214 #endif |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8215 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8216 |
| 7 | 8217 vim_free(key); |
| 8218 vim_free(arg); | |
| 8219 | |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8220 /* Only call highlight_changed() once, after a sequence of highlight |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8221 * commands, and only if an attribute actually changed. */ |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8222 if (memcmp(&HL_TABLE()[idx], &item_before, sizeof(item_before)) != 0 |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8223 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8224 && !did_highlight_changed |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8225 #endif |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8226 ) |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8227 { |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8228 redraw_all_later(NOT_VALID); |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8229 need_highlight_changed = TRUE; |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8230 } |
| 7 | 8231 } |
| 8232 | |
| 356 | 8233 #if defined(EXITFREE) || defined(PROTO) |
| 8234 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8235 free_highlight(void) |
| 356 | 8236 { |
| 8237 int i; | |
| 8238 | |
| 8239 for (i = 0; i < highlight_ga.ga_len; ++i) | |
| 359 | 8240 { |
| 356 | 8241 highlight_clear(i); |
| 359 | 8242 vim_free(HL_TABLE()[i].sg_name); |
| 8243 vim_free(HL_TABLE()[i].sg_name_u); | |
| 8244 } | |
| 356 | 8245 ga_clear(&highlight_ga); |
| 8246 } | |
| 8247 #endif | |
| 8248 | |
| 7 | 8249 /* |
| 8250 * Reset the cterm colors to what they were before Vim was started, if | |
| 8251 * possible. Otherwise reset them to zero. | |
| 8252 */ | |
| 8253 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8254 restore_cterm_colors(void) |
| 7 | 8255 { |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7835
diff
changeset
|
8256 #if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 7 | 8257 /* Since t_me has been set, this probably means that the user |
| 8258 * wants to use this as default colors. Need to reset default | |
| 8259 * background/foreground colors. */ | |
| 8260 mch_set_normal_colors(); | |
| 8261 #else | |
| 8262 cterm_normal_fg_color = 0; | |
| 8263 cterm_normal_fg_bold = 0; | |
| 8264 cterm_normal_bg_color = 0; | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8265 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8266 cterm_normal_fg_gui_color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8267 cterm_normal_bg_gui_color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8268 # endif |
| 7 | 8269 #endif |
| 8270 } | |
| 8271 | |
| 8272 /* | |
| 8273 * Return TRUE if highlight group "idx" has any settings. | |
| 8274 * When "check_link" is TRUE also check for an existing link. | |
| 8275 */ | |
| 8276 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8277 hl_has_settings(int idx, int check_link) |
| 7 | 8278 { |
| 8279 return ( HL_TABLE()[idx].sg_term_attr != 0 | |
| 8280 || HL_TABLE()[idx].sg_cterm_attr != 0 | |
| 5954 | 8281 || HL_TABLE()[idx].sg_cterm_fg != 0 |
| 8282 || HL_TABLE()[idx].sg_cterm_bg != 0 | |
| 7 | 8283 #ifdef FEAT_GUI |
| 8284 || HL_TABLE()[idx].sg_gui_attr != 0 | |
| 5954 | 8285 || HL_TABLE()[idx].sg_gui_fg_name != NULL |
| 8286 || HL_TABLE()[idx].sg_gui_bg_name != NULL | |
| 8287 || HL_TABLE()[idx].sg_gui_sp_name != NULL | |
|
11119
d8a550329a97
patch 8.0.0447: getting font name does not work on X11
Christian Brabandt <cb@256bit.org>
parents:
11073
diff
changeset
|
8288 || HL_TABLE()[idx].sg_font_name != NULL |
| 7 | 8289 #endif |
| 8290 || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK))); | |
| 8291 } | |
| 8292 | |
| 8293 /* | |
| 8294 * Clear highlighting for one group. | |
| 8295 */ | |
| 8296 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8297 highlight_clear(int idx) |
| 7 | 8298 { |
|
10624
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
8299 HL_TABLE()[idx].sg_cleared = TRUE; |
|
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
8300 |
| 7 | 8301 HL_TABLE()[idx].sg_term = 0; |
| 8302 vim_free(HL_TABLE()[idx].sg_start); | |
| 8303 HL_TABLE()[idx].sg_start = NULL; | |
| 8304 vim_free(HL_TABLE()[idx].sg_stop); | |
| 8305 HL_TABLE()[idx].sg_stop = NULL; | |
| 8306 HL_TABLE()[idx].sg_term_attr = 0; | |
| 8307 HL_TABLE()[idx].sg_cterm = 0; | |
| 8308 HL_TABLE()[idx].sg_cterm_bold = FALSE; | |
| 8309 HL_TABLE()[idx].sg_cterm_fg = 0; | |
| 8310 HL_TABLE()[idx].sg_cterm_bg = 0; | |
| 8311 HL_TABLE()[idx].sg_cterm_attr = 0; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8312 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 8313 HL_TABLE()[idx].sg_gui = 0; |
| 8314 vim_free(HL_TABLE()[idx].sg_gui_fg_name); | |
| 8315 HL_TABLE()[idx].sg_gui_fg_name = NULL; | |
| 8316 vim_free(HL_TABLE()[idx].sg_gui_bg_name); | |
| 8317 HL_TABLE()[idx].sg_gui_bg_name = NULL; | |
| 205 | 8318 vim_free(HL_TABLE()[idx].sg_gui_sp_name); |
| 8319 HL_TABLE()[idx].sg_gui_sp_name = NULL; | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8320 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8321 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8322 HL_TABLE()[idx].sg_gui_fg = INVALCOLOR; |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8323 HL_TABLE()[idx].sg_gui_bg = INVALCOLOR; |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8324 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8325 #ifdef FEAT_GUI |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8326 HL_TABLE()[idx].sg_gui_sp = INVALCOLOR; |
| 7 | 8327 gui_mch_free_font(HL_TABLE()[idx].sg_font); |
| 8328 HL_TABLE()[idx].sg_font = NOFONT; | |
| 8329 # ifdef FEAT_XFONTSET | |
| 8330 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); | |
| 8331 HL_TABLE()[idx].sg_fontset = NOFONTSET; | |
| 8332 # endif | |
| 8333 vim_free(HL_TABLE()[idx].sg_font_name); | |
| 8334 HL_TABLE()[idx].sg_font_name = NULL; | |
| 8335 HL_TABLE()[idx].sg_gui_attr = 0; | |
| 8336 #endif | |
| 448 | 8337 #ifdef FEAT_EVAL |
| 8338 /* Clear the script ID only when there is no link, since that is not | |
| 8339 * cleared. */ | |
| 8340 if (HL_TABLE()[idx].sg_link == 0) | |
| 8341 HL_TABLE()[idx].sg_scriptID = 0; | |
| 8342 #endif | |
| 7 | 8343 } |
| 8344 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8345 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
| 7 | 8346 /* |
| 8347 * Set the normal foreground and background colors according to the "Normal" | |
| 2020 | 8348 * highlighting group. For X11 also set "Menu", "Scrollbar", and |
| 7 | 8349 * "Tooltip" colors. |
| 8350 */ | |
| 8351 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8352 set_normal_colors(void) |
| 7 | 8353 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8354 #ifdef FEAT_GUI |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8355 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8356 if (gui.in_use) |
| 7 | 8357 # endif |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8358 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8359 if (set_group_colors((char_u *)"Normal", |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8360 &gui.norm_pixel, &gui.back_pixel, |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8361 FALSE, TRUE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8362 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8363 gui_mch_new_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8364 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8365 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8366 # ifdef FEAT_GUI_X11 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8367 if (set_group_colors((char_u *)"Menu", |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8368 &gui.menu_fg_pixel, &gui.menu_bg_pixel, |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8369 TRUE, FALSE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8370 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8371 # ifdef FEAT_MENU |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8372 gui_mch_new_menu_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8373 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8374 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8375 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8376 # ifdef FEAT_BEVAL |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8377 if (set_group_colors((char_u *)"Tooltip", |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8378 &gui.tooltip_fg_pixel, &gui.tooltip_bg_pixel, |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8379 FALSE, FALSE, TRUE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8380 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8381 # ifdef FEAT_TOOLBAR |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8382 gui_mch_new_tooltip_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8383 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8384 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8385 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8386 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8387 if (set_group_colors((char_u *)"Scrollbar", |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8388 &gui.scroll_fg_pixel, &gui.scroll_bg_pixel, |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8389 FALSE, FALSE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8390 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8391 gui_new_scrollbar_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8392 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8393 } |
| 7 | 8394 # endif |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8395 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8396 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8397 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8398 # ifdef FEAT_GUI |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8399 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8400 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8401 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8402 int idx; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8403 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8404 idx = syn_name2id((char_u *)"Normal") - 1; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8405 if (idx >= 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8406 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8407 gui_do_one_color(idx, FALSE, FALSE); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8408 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8409 if (HL_TABLE()[idx].sg_gui_fg != INVALCOLOR) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8410 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8411 cterm_normal_fg_gui_color = HL_TABLE()[idx].sg_gui_fg; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8412 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8413 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8414 if (HL_TABLE()[idx].sg_gui_bg != INVALCOLOR) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8415 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8416 cterm_normal_bg_gui_color = HL_TABLE()[idx].sg_gui_bg; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8417 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8418 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8419 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8420 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8421 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8422 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8423 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8424 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8425 #if defined(FEAT_GUI) || defined(PROTO) |
| 7 | 8426 /* |
| 8427 * Set the colors for "Normal", "Menu", "Tooltip" or "Scrollbar". | |
| 8428 */ | |
| 8429 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8430 set_group_colors( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8431 char_u *name, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8432 guicolor_T *fgp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8433 guicolor_T *bgp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8434 int do_menu, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8435 int use_norm, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8436 int do_tooltip) |
| 7 | 8437 { |
| 8438 int idx; | |
| 8439 | |
| 8440 idx = syn_name2id(name) - 1; | |
| 8441 if (idx >= 0) | |
| 8442 { | |
| 8443 gui_do_one_color(idx, do_menu, do_tooltip); | |
| 8444 | |
| 8445 if (HL_TABLE()[idx].sg_gui_fg != INVALCOLOR) | |
| 8446 *fgp = HL_TABLE()[idx].sg_gui_fg; | |
| 8447 else if (use_norm) | |
| 8448 *fgp = gui.def_norm_pixel; | |
| 8449 if (HL_TABLE()[idx].sg_gui_bg != INVALCOLOR) | |
| 8450 *bgp = HL_TABLE()[idx].sg_gui_bg; | |
| 8451 else if (use_norm) | |
| 8452 *bgp = gui.def_back_pixel; | |
| 8453 return TRUE; | |
| 8454 } | |
| 8455 return FALSE; | |
| 8456 } | |
| 8457 | |
| 8458 /* | |
| 8459 * Get the font of the "Normal" group. | |
| 8460 * Returns "" when it's not found or not set. | |
| 8461 */ | |
| 8462 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8463 hl_get_font_name(void) |
| 7 | 8464 { |
| 8465 int id; | |
| 8466 char_u *s; | |
| 8467 | |
| 8468 id = syn_name2id((char_u *)"Normal"); | |
| 8469 if (id > 0) | |
| 8470 { | |
| 8471 s = HL_TABLE()[id - 1].sg_font_name; | |
| 8472 if (s != NULL) | |
| 8473 return s; | |
| 8474 } | |
| 8475 return (char_u *)""; | |
| 8476 } | |
| 8477 | |
| 8478 /* | |
| 8479 * Set font for "Normal" group. Called by gui_mch_init_font() when a font has | |
| 8480 * actually chosen to be used. | |
| 8481 */ | |
| 8482 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8483 hl_set_font_name(char_u *font_name) |
| 7 | 8484 { |
| 8485 int id; | |
| 8486 | |
| 8487 id = syn_name2id((char_u *)"Normal"); | |
| 8488 if (id > 0) | |
| 8489 { | |
| 8490 vim_free(HL_TABLE()[id - 1].sg_font_name); | |
| 8491 HL_TABLE()[id - 1].sg_font_name = vim_strsave(font_name); | |
| 8492 } | |
| 8493 } | |
| 8494 | |
| 8495 /* | |
| 8496 * Set background color for "Normal" group. Called by gui_set_bg_color() | |
| 8497 * when the color is known. | |
| 8498 */ | |
| 8499 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8500 hl_set_bg_color_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8501 char_u *name) /* must have been allocated */ |
| 7 | 8502 { |
| 8503 int id; | |
| 8504 | |
| 8505 if (name != NULL) | |
| 8506 { | |
| 8507 id = syn_name2id((char_u *)"Normal"); | |
| 8508 if (id > 0) | |
| 8509 { | |
| 8510 vim_free(HL_TABLE()[id - 1].sg_gui_bg_name); | |
| 8511 HL_TABLE()[id - 1].sg_gui_bg_name = name; | |
| 8512 } | |
| 8513 } | |
| 8514 } | |
| 8515 | |
| 8516 /* | |
| 8517 * Set foreground color for "Normal" group. Called by gui_set_fg_color() | |
| 8518 * when the color is known. | |
| 8519 */ | |
| 8520 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8521 hl_set_fg_color_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8522 char_u *name) /* must have been allocated */ |
| 7 | 8523 { |
| 8524 int id; | |
| 8525 | |
| 8526 if (name != NULL) | |
| 8527 { | |
| 8528 id = syn_name2id((char_u *)"Normal"); | |
| 8529 if (id > 0) | |
| 8530 { | |
| 8531 vim_free(HL_TABLE()[id - 1].sg_gui_fg_name); | |
| 8532 HL_TABLE()[id - 1].sg_gui_fg_name = name; | |
| 8533 } | |
| 8534 } | |
| 8535 } | |
| 8536 | |
| 8537 /* | |
| 8538 * Return the handle for a font name. | |
| 8539 * Returns NOFONT when failed. | |
| 8540 */ | |
| 8541 static GuiFont | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8542 font_name2handle(char_u *name) |
| 7 | 8543 { |
| 8544 if (STRCMP(name, "NONE") == 0) | |
| 8545 return NOFONT; | |
| 8546 | |
| 8547 return gui_mch_get_font(name, TRUE); | |
| 8548 } | |
| 8549 | |
| 8550 # ifdef FEAT_XFONTSET | |
| 8551 /* | |
| 8552 * Return the handle for a fontset name. | |
| 8553 * Returns NOFONTSET when failed. | |
| 8554 */ | |
| 8555 static GuiFontset | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8556 fontset_name2handle(char_u *name, int fixed_width) |
| 7 | 8557 { |
| 8558 if (STRCMP(name, "NONE") == 0) | |
| 8559 return NOFONTSET; | |
| 8560 | |
| 8561 return gui_mch_get_fontset(name, TRUE, fixed_width); | |
| 8562 } | |
| 8563 # endif | |
| 8564 | |
| 8565 /* | |
| 8566 * Get the font or fontset for one highlight group. | |
| 8567 */ | |
| 8568 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8569 hl_do_font( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8570 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8571 char_u *arg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8572 int do_normal, /* set normal font */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8573 int do_menu UNUSED, /* set menu font */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8574 int do_tooltip UNUSED, /* set tooltip font */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8575 int free_font) /* free current font/fontset */ |
| 7 | 8576 { |
| 8577 # ifdef FEAT_XFONTSET | |
| 8578 /* If 'guifontset' is not empty, first try using the name as a | |
| 8579 * fontset. If that doesn't work, use it as a font name. */ | |
| 8580 if (*p_guifontset != NUL | |
| 8581 # ifdef FONTSET_ALWAYS | |
| 8582 || do_menu | |
| 8583 # endif | |
| 8584 # ifdef FEAT_BEVAL_TIP | |
| 8585 /* In Athena & Motif, the Tooltip highlight group is always a fontset */ | |
| 8586 || do_tooltip | |
| 8587 # endif | |
| 8588 ) | |
| 4344 | 8589 { |
| 3900 | 8590 if (free_font) |
| 3881 | 8591 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); |
| 7 | 8592 HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0 |
| 8593 # ifdef FONTSET_ALWAYS | |
| 8594 || do_menu | |
| 8595 # endif | |
| 8596 # ifdef FEAT_BEVAL_TIP | |
| 8597 || do_tooltip | |
| 8598 # endif | |
| 8599 ); | |
| 4344 | 8600 } |
| 7 | 8601 if (HL_TABLE()[idx].sg_fontset != NOFONTSET) |
| 8602 { | |
| 3881 | 8603 /* If it worked and it's the Normal group, use it as the normal |
| 8604 * fontset. Same for the Menu group. */ | |
| 7 | 8605 if (do_normal) |
| 8606 gui_init_font(arg, TRUE); | |
| 8607 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU) | |
| 8608 if (do_menu) | |
| 8609 { | |
| 8610 # ifdef FONTSET_ALWAYS | |
| 8611 gui.menu_fontset = HL_TABLE()[idx].sg_fontset; | |
| 8612 # else | |
| 8613 /* YIKES! This is a bug waiting to crash the program */ | |
| 8614 gui.menu_font = HL_TABLE()[idx].sg_fontset; | |
| 8615 # endif | |
| 8616 gui_mch_new_menu_font(); | |
| 8617 } | |
| 8618 # ifdef FEAT_BEVAL | |
| 8619 if (do_tooltip) | |
| 8620 { | |
| 8621 /* The Athena widget set cannot currently handle switching between | |
| 8622 * displaying a single font and a fontset. | |
| 8623 * If the XtNinternational resource is set to True at widget | |
| 1222 | 8624 * creation, then a fontset is always used, otherwise an |
| 7 | 8625 * XFontStruct is used. |
| 8626 */ | |
| 8627 gui.tooltip_fontset = (XFontSet)HL_TABLE()[idx].sg_fontset; | |
| 8628 gui_mch_new_tooltip_font(); | |
| 8629 } | |
| 8630 # endif | |
| 8631 # endif | |
| 8632 } | |
| 8633 else | |
| 8634 # endif | |
| 8635 { | |
| 3881 | 8636 if (free_font) |
| 8637 gui_mch_free_font(HL_TABLE()[idx].sg_font); | |
| 7 | 8638 HL_TABLE()[idx].sg_font = font_name2handle(arg); |
| 8639 /* If it worked and it's the Normal group, use it as the | |
| 8640 * normal font. Same for the Menu group. */ | |
| 8641 if (HL_TABLE()[idx].sg_font != NOFONT) | |
| 8642 { | |
| 8643 if (do_normal) | |
| 8644 gui_init_font(arg, FALSE); | |
| 8645 #ifndef FONTSET_ALWAYS | |
| 8646 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU) | |
| 8647 if (do_menu) | |
| 8648 { | |
| 8649 gui.menu_font = HL_TABLE()[idx].sg_font; | |
| 8650 gui_mch_new_menu_font(); | |
| 8651 } | |
| 8652 # endif | |
| 8653 #endif | |
| 8654 } | |
| 8655 } | |
| 8656 } | |
| 8657 | |
| 8658 #endif /* FEAT_GUI */ | |
| 8659 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8660 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8661 /* |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8662 * Return the handle for a color name. |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8663 * Returns INVALCOLOR when failed. |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8664 */ |
|
12082
504df4aa84c6
patch 8.0.0921: terminal window cursor shape not supported in the GUI
Christian Brabandt <cb@256bit.org>
parents:
12068
diff
changeset
|
8665 guicolor_T |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8666 color_name2handle(char_u *name) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8667 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8668 if (STRCMP(name, "NONE") == 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8669 return INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8670 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8671 if (STRICMP(name, "fg") == 0 || STRICMP(name, "foreground") == 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8672 { |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8673 #if defined(FEAT_TERMGUICOLORS) && defined(FEAT_GUI) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8674 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8675 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8676 #ifdef FEAT_GUI |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8677 return gui.norm_pixel; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8678 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8679 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
8680 if (cterm_normal_fg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8681 return cterm_normal_fg_gui_color; |
|
9141
d6662acfc3de
commit https://github.com/vim/vim/commit/d80629cef03cd40b0bf06c402dfe0b720b3bf608
Christian Brabandt <cb@256bit.org>
parents:
9054
diff
changeset
|
8682 /* Guess that the foreground is black or white. */ |
|
d6662acfc3de
commit https://github.com/vim/vim/commit/d80629cef03cd40b0bf06c402dfe0b720b3bf608
Christian Brabandt <cb@256bit.org>
parents:
9054
diff
changeset
|
8683 return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "black" : "white")); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8684 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8685 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8686 if (STRICMP(name, "bg") == 0 || STRICMP(name, "background") == 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8687 { |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8688 #if defined(FEAT_TERMGUICOLORS) && defined(FEAT_GUI) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8689 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8690 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8691 #ifdef FEAT_GUI |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8692 return gui.back_pixel; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8693 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8694 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
8695 if (cterm_normal_bg_gui_color != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8696 return cterm_normal_bg_gui_color; |
|
9141
d6662acfc3de
commit https://github.com/vim/vim/commit/d80629cef03cd40b0bf06c402dfe0b720b3bf608
Christian Brabandt <cb@256bit.org>
parents:
9054
diff
changeset
|
8697 /* Guess that the background is white or black. */ |
|
d6662acfc3de
commit https://github.com/vim/vim/commit/d80629cef03cd40b0bf06c402dfe0b720b3bf608
Christian Brabandt <cb@256bit.org>
parents:
9054
diff
changeset
|
8698 return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "white" : "black")); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8699 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8700 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8701 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8702 return GUI_GET_COLOR(name); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8703 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8704 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8705 |
| 7 | 8706 /* |
| 8707 * Table with the specifications for an attribute number. | |
| 8708 * Note that this table is used by ALL buffers. This is required because the | |
| 8709 * GUI can redraw at any time for any buffer. | |
| 8710 */ | |
| 298 | 8711 static garray_T term_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8712 |
| 8713 #define TERM_ATTR_ENTRY(idx) ((attrentry_T *)term_attr_table.ga_data)[idx] | |
| 8714 | |
| 298 | 8715 static garray_T cterm_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8716 |
| 8717 #define CTERM_ATTR_ENTRY(idx) ((attrentry_T *)cterm_attr_table.ga_data)[idx] | |
| 8718 | |
| 8719 #ifdef FEAT_GUI | |
| 298 | 8720 static garray_T gui_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8721 |
| 8722 #define GUI_ATTR_ENTRY(idx) ((attrentry_T *)gui_attr_table.ga_data)[idx] | |
| 8723 #endif | |
| 8724 | |
| 8725 /* | |
| 8726 * Return the attr number for a set of colors and font. | |
| 8727 * Add a new entry to the term_attr_table, cterm_attr_table or gui_attr_table | |
| 8728 * if the combination is new. | |
| 8729 * Return 0 for error (no more room). | |
| 8730 */ | |
| 8731 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8732 get_attr_entry(garray_T *table, attrentry_T *aep) |
| 7 | 8733 { |
| 8734 int i; | |
| 359 | 8735 attrentry_T *taep; |
| 7 | 8736 static int recursive = FALSE; |
| 8737 | |
| 8738 /* | |
| 8739 * Init the table, in case it wasn't done yet. | |
| 8740 */ | |
| 8741 table->ga_itemsize = sizeof(attrentry_T); | |
| 8742 table->ga_growsize = 7; | |
| 8743 | |
| 8744 /* | |
| 8745 * Try to find an entry with the same specifications. | |
| 8746 */ | |
| 8747 for (i = 0; i < table->ga_len; ++i) | |
| 8748 { | |
| 359 | 8749 taep = &(((attrentry_T *)table->ga_data)[i]); |
| 8750 if ( aep->ae_attr == taep->ae_attr | |
| 7 | 8751 && ( |
| 8752 #ifdef FEAT_GUI | |
| 8753 (table == &gui_attr_table | |
| 359 | 8754 && (aep->ae_u.gui.fg_color == taep->ae_u.gui.fg_color |
| 8755 && aep->ae_u.gui.bg_color | |
| 8756 == taep->ae_u.gui.bg_color | |
| 8757 && aep->ae_u.gui.sp_color | |
| 8758 == taep->ae_u.gui.sp_color | |
| 8759 && aep->ae_u.gui.font == taep->ae_u.gui.font | |
| 7 | 8760 # ifdef FEAT_XFONTSET |
| 359 | 8761 && aep->ae_u.gui.fontset == taep->ae_u.gui.fontset |
| 7 | 8762 # endif |
| 8763 )) | |
| 8764 || | |
| 8765 #endif | |
| 8766 (table == &term_attr_table | |
| 359 | 8767 && (aep->ae_u.term.start == NULL) |
| 8768 == (taep->ae_u.term.start == NULL) | |
| 7 | 8769 && (aep->ae_u.term.start == NULL |
| 8770 || STRCMP(aep->ae_u.term.start, | |
| 359 | 8771 taep->ae_u.term.start) == 0) |
| 8772 && (aep->ae_u.term.stop == NULL) | |
| 8773 == (taep->ae_u.term.stop == NULL) | |
| 7 | 8774 && (aep->ae_u.term.stop == NULL |
| 8775 || STRCMP(aep->ae_u.term.stop, | |
| 359 | 8776 taep->ae_u.term.stop) == 0)) |
| 7 | 8777 || (table == &cterm_attr_table |
| 359 | 8778 && aep->ae_u.cterm.fg_color |
| 8779 == taep->ae_u.cterm.fg_color | |
| 8780 && aep->ae_u.cterm.bg_color | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8781 == taep->ae_u.cterm.bg_color |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8782 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8783 && aep->ae_u.cterm.fg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8784 == taep->ae_u.cterm.fg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8785 && aep->ae_u.cterm.bg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8786 == taep->ae_u.cterm.bg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8787 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8788 ))) |
| 7 | 8789 |
| 8790 return i + ATTR_OFF; | |
| 8791 } | |
| 8792 | |
| 271 | 8793 if (table->ga_len + ATTR_OFF > MAX_TYPENR) |
| 7 | 8794 { |
| 8795 /* | |
| 8796 * Running out of attribute entries! remove all attributes, and | |
| 8797 * compute new ones for all groups. | |
| 8798 * When called recursively, we are really out of numbers. | |
| 8799 */ | |
| 8800 if (recursive) | |
| 8801 { | |
| 8802 EMSG(_("E424: Too many different highlighting attributes in use")); | |
| 8803 return 0; | |
| 8804 } | |
| 8805 recursive = TRUE; | |
| 8806 | |
| 359 | 8807 clear_hl_tables(); |
| 8808 | |
| 7 | 8809 must_redraw = CLEAR; |
| 8810 | |
| 8811 for (i = 0; i < highlight_ga.ga_len; ++i) | |
| 8812 set_hl_attr(i); | |
| 8813 | |
| 8814 recursive = FALSE; | |
| 8815 } | |
| 8816 | |
| 8817 /* | |
| 8818 * This is a new combination of colors and font, add an entry. | |
| 8819 */ | |
| 8820 if (ga_grow(table, 1) == FAIL) | |
| 8821 return 0; | |
| 8822 | |
| 359 | 8823 taep = &(((attrentry_T *)table->ga_data)[table->ga_len]); |
| 8824 vim_memset(taep, 0, sizeof(attrentry_T)); | |
| 8825 taep->ae_attr = aep->ae_attr; | |
| 7 | 8826 #ifdef FEAT_GUI |
| 8827 if (table == &gui_attr_table) | |
| 8828 { | |
| 359 | 8829 taep->ae_u.gui.fg_color = aep->ae_u.gui.fg_color; |
| 8830 taep->ae_u.gui.bg_color = aep->ae_u.gui.bg_color; | |
| 8831 taep->ae_u.gui.sp_color = aep->ae_u.gui.sp_color; | |
| 8832 taep->ae_u.gui.font = aep->ae_u.gui.font; | |
| 7 | 8833 # ifdef FEAT_XFONTSET |
| 359 | 8834 taep->ae_u.gui.fontset = aep->ae_u.gui.fontset; |
| 7 | 8835 # endif |
| 8836 } | |
| 8837 #endif | |
| 8838 if (table == &term_attr_table) | |
| 8839 { | |
| 8840 if (aep->ae_u.term.start == NULL) | |
| 359 | 8841 taep->ae_u.term.start = NULL; |
| 7 | 8842 else |
| 359 | 8843 taep->ae_u.term.start = vim_strsave(aep->ae_u.term.start); |
| 7 | 8844 if (aep->ae_u.term.stop == NULL) |
| 359 | 8845 taep->ae_u.term.stop = NULL; |
| 7 | 8846 else |
| 359 | 8847 taep->ae_u.term.stop = vim_strsave(aep->ae_u.term.stop); |
| 7 | 8848 } |
| 8849 else if (table == &cterm_attr_table) | |
| 8850 { | |
| 359 | 8851 taep->ae_u.cterm.fg_color = aep->ae_u.cterm.fg_color; |
| 8852 taep->ae_u.cterm.bg_color = aep->ae_u.cterm.bg_color; | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8853 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8854 taep->ae_u.cterm.fg_rgb = aep->ae_u.cterm.fg_rgb; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8855 taep->ae_u.cterm.bg_rgb = aep->ae_u.cterm.bg_rgb; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8856 #endif |
| 7 | 8857 } |
| 8858 ++table->ga_len; | |
| 8859 return (table->ga_len - 1 + ATTR_OFF); | |
| 8860 } | |
| 8861 | |
| 359 | 8862 /* |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8863 * Get an attribute index for a cterm entry. |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8864 * Uses an existing entry when possible or adds one when needed. |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8865 */ |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8866 int |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8867 get_cterm_attr_idx(int attr, int fg, int bg) |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8868 { |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8869 attrentry_T at_en; |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8870 |
|
11745
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8871 vim_memset(&at_en, 0, sizeof(attrentry_T)); |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8872 at_en.ae_attr = attr; |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8873 at_en.ae_u.cterm.fg_color = fg; |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8874 at_en.ae_u.cterm.bg_color = bg; |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8875 return get_attr_entry(&cterm_attr_table, &at_en); |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8876 } |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8877 |
|
11755
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8878 #if defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8879 /* |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8880 * Get an attribute index for a 'termguicolors' entry. |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8881 * Uses an existing entry when possible or adds one when needed. |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8882 */ |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8883 int |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8884 get_tgc_attr_idx(int attr, guicolor_T fg, guicolor_T bg) |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8885 { |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8886 attrentry_T at_en; |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8887 |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8888 vim_memset(&at_en, 0, sizeof(attrentry_T)); |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8889 at_en.ae_attr = attr; |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8890 at_en.ae_u.cterm.fg_rgb = fg; |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8891 at_en.ae_u.cterm.bg_rgb = bg; |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8892 return get_attr_entry(&cterm_attr_table, &at_en); |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8893 } |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8894 #endif |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8895 |
|
11745
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8896 #if defined(FEAT_GUI) || defined(PROTO) |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8897 /* |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8898 * Get an attribute index for a cterm entry. |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8899 * Uses an existing entry when possible or adds one when needed. |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8900 */ |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8901 int |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8902 get_gui_attr_idx(int attr, guicolor_T fg, guicolor_T bg) |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8903 { |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8904 attrentry_T at_en; |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8905 |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8906 vim_memset(&at_en, 0, sizeof(attrentry_T)); |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8907 at_en.ae_attr = attr; |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8908 at_en.ae_u.gui.fg_color = fg; |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8909 at_en.ae_u.gui.bg_color = bg; |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8910 return get_attr_entry(&gui_attr_table, &at_en); |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8911 } |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8912 #endif |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8913 |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8914 /* |
| 359 | 8915 * Clear all highlight tables. |
| 8916 */ | |
| 8917 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8918 clear_hl_tables(void) |
| 359 | 8919 { |
| 8920 int i; | |
| 8921 attrentry_T *taep; | |
| 8922 | |
| 8923 #ifdef FEAT_GUI | |
| 8924 ga_clear(&gui_attr_table); | |
| 8925 #endif | |
| 8926 for (i = 0; i < term_attr_table.ga_len; ++i) | |
| 8927 { | |
| 8928 taep = &(((attrentry_T *)term_attr_table.ga_data)[i]); | |
| 8929 vim_free(taep->ae_u.term.start); | |
| 8930 vim_free(taep->ae_u.term.stop); | |
| 8931 } | |
| 8932 ga_clear(&term_attr_table); | |
| 8933 ga_clear(&cterm_attr_table); | |
| 8934 } | |
| 8935 | |
| 745 | 8936 #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO) |
| 221 | 8937 /* |
| 348 | 8938 * Combine special attributes (e.g., for spelling) with other attributes |
| 8939 * (e.g., for syntax highlighting). | |
| 8940 * "prim_attr" overrules "char_attr". | |
| 221 | 8941 * This creates a new group when required. |
| 8942 * Since we expect there to be few spelling mistakes we don't cache the | |
| 8943 * result. | |
| 8944 * Return the resulting attributes. | |
| 8945 */ | |
| 8946 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8947 hl_combine_attr(int char_attr, int prim_attr) |
| 221 | 8948 { |
| 8949 attrentry_T *char_aep = NULL; | |
| 8950 attrentry_T *spell_aep; | |
| 8951 attrentry_T new_en; | |
| 8952 | |
| 8953 if (char_attr == 0) | |
| 348 | 8954 return prim_attr; |
| 8955 if (char_attr <= HL_ALL && prim_attr <= HL_ALL) | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
8956 return ATTR_COMBINE(char_attr, prim_attr); |
| 221 | 8957 #ifdef FEAT_GUI |
| 8958 if (gui.in_use) | |
| 8959 { | |
| 8960 if (char_attr > HL_ALL) | |
| 8961 char_aep = syn_gui_attr2entry(char_attr); | |
| 8962 if (char_aep != NULL) | |
| 8963 new_en = *char_aep; | |
| 8964 else | |
| 8965 { | |
| 8966 vim_memset(&new_en, 0, sizeof(new_en)); | |
| 548 | 8967 new_en.ae_u.gui.fg_color = INVALCOLOR; |
| 8968 new_en.ae_u.gui.bg_color = INVALCOLOR; | |
| 8969 new_en.ae_u.gui.sp_color = INVALCOLOR; | |
| 221 | 8970 if (char_attr <= HL_ALL) |
| 8971 new_en.ae_attr = char_attr; | |
| 8972 } | |
| 8973 | |
| 348 | 8974 if (prim_attr <= HL_ALL) |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
8975 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 8976 else |
| 8977 { | |
| 348 | 8978 spell_aep = syn_gui_attr2entry(prim_attr); |
| 221 | 8979 if (spell_aep != NULL) |
| 8980 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
8981 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, |
|
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
8982 spell_aep->ae_attr); |
| 221 | 8983 if (spell_aep->ae_u.gui.fg_color != INVALCOLOR) |
| 8984 new_en.ae_u.gui.fg_color = spell_aep->ae_u.gui.fg_color; | |
| 8985 if (spell_aep->ae_u.gui.bg_color != INVALCOLOR) | |
| 8986 new_en.ae_u.gui.bg_color = spell_aep->ae_u.gui.bg_color; | |
| 8987 if (spell_aep->ae_u.gui.sp_color != INVALCOLOR) | |
| 8988 new_en.ae_u.gui.sp_color = spell_aep->ae_u.gui.sp_color; | |
| 8989 if (spell_aep->ae_u.gui.font != NOFONT) | |
| 8990 new_en.ae_u.gui.font = spell_aep->ae_u.gui.font; | |
| 8991 # ifdef FEAT_XFONTSET | |
| 8992 if (spell_aep->ae_u.gui.fontset != NOFONTSET) | |
| 8993 new_en.ae_u.gui.fontset = spell_aep->ae_u.gui.fontset; | |
| 8994 # endif | |
| 8995 } | |
| 8996 } | |
| 8997 return get_attr_entry(&gui_attr_table, &new_en); | |
| 8998 } | |
| 8999 #endif | |
| 9000 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9001 if (IS_CTERM) |
| 221 | 9002 { |
| 9003 if (char_attr > HL_ALL) | |
| 9004 char_aep = syn_cterm_attr2entry(char_attr); | |
| 9005 if (char_aep != NULL) | |
| 9006 new_en = *char_aep; | |
| 9007 else | |
| 9008 { | |
| 9009 vim_memset(&new_en, 0, sizeof(new_en)); | |
|
10499
e88ffb09ff38
commit https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
9010 #ifdef FEAT_TERMGUICOLORS |
|
e88ffb09ff38
commit https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
9011 new_en.ae_u.cterm.bg_rgb = INVALCOLOR; |
|
e88ffb09ff38
commit https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
9012 new_en.ae_u.cterm.fg_rgb = INVALCOLOR; |
|
e88ffb09ff38
commit https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
9013 #endif |
| 221 | 9014 if (char_attr <= HL_ALL) |
| 9015 new_en.ae_attr = char_attr; | |
| 9016 } | |
| 9017 | |
| 348 | 9018 if (prim_attr <= HL_ALL) |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9019 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 9020 else |
| 9021 { | |
| 348 | 9022 spell_aep = syn_cterm_attr2entry(prim_attr); |
| 221 | 9023 if (spell_aep != NULL) |
| 9024 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9025 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, |
|
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9026 spell_aep->ae_attr); |
| 221 | 9027 if (spell_aep->ae_u.cterm.fg_color > 0) |
| 9028 new_en.ae_u.cterm.fg_color = spell_aep->ae_u.cterm.fg_color; | |
| 9029 if (spell_aep->ae_u.cterm.bg_color > 0) | |
| 9030 new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color; | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9031 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
9032 if (spell_aep->ae_u.cterm.fg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9033 new_en.ae_u.cterm.fg_rgb = spell_aep->ae_u.cterm.fg_rgb; |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
9034 if (spell_aep->ae_u.cterm.bg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9035 new_en.ae_u.cterm.bg_rgb = spell_aep->ae_u.cterm.bg_rgb; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9036 #endif |
| 221 | 9037 } |
| 9038 } | |
| 9039 return get_attr_entry(&cterm_attr_table, &new_en); | |
| 9040 } | |
| 9041 | |
| 9042 if (char_attr > HL_ALL) | |
| 9043 char_aep = syn_term_attr2entry(char_attr); | |
| 9044 if (char_aep != NULL) | |
| 9045 new_en = *char_aep; | |
| 9046 else | |
| 9047 { | |
| 9048 vim_memset(&new_en, 0, sizeof(new_en)); | |
| 9049 if (char_attr <= HL_ALL) | |
| 9050 new_en.ae_attr = char_attr; | |
| 9051 } | |
| 9052 | |
| 348 | 9053 if (prim_attr <= HL_ALL) |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9054 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 9055 else |
| 9056 { | |
| 607 | 9057 spell_aep = syn_term_attr2entry(prim_attr); |
| 221 | 9058 if (spell_aep != NULL) |
| 9059 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9060 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, spell_aep->ae_attr); |
| 221 | 9061 if (spell_aep->ae_u.term.start != NULL) |
| 9062 { | |
| 9063 new_en.ae_u.term.start = spell_aep->ae_u.term.start; | |
| 9064 new_en.ae_u.term.stop = spell_aep->ae_u.term.stop; | |
| 9065 } | |
| 9066 } | |
| 9067 } | |
| 9068 return get_attr_entry(&term_attr_table, &new_en); | |
| 9069 } | |
| 9070 #endif | |
| 9071 | |
| 7 | 9072 #ifdef FEAT_GUI |
| 9073 | |
| 9074 attrentry_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9075 syn_gui_attr2entry(int attr) |
| 7 | 9076 { |
| 9077 attr -= ATTR_OFF; | |
| 9078 if (attr >= gui_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9079 return NULL; | |
| 9080 return &(GUI_ATTR_ENTRY(attr)); | |
| 9081 } | |
| 9082 #endif /* FEAT_GUI */ | |
| 9083 | |
| 745 | 9084 /* |
| 9085 * Get the highlight attributes (HL_BOLD etc.) from an attribute nr. | |
| 9086 * Only to be used when "attr" > HL_ALL. | |
| 9087 */ | |
| 9088 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9089 syn_attr2attr(int attr) |
| 745 | 9090 { |
| 9091 attrentry_T *aep; | |
| 9092 | |
| 9093 #ifdef FEAT_GUI | |
| 9094 if (gui.in_use) | |
| 9095 aep = syn_gui_attr2entry(attr); | |
| 9096 else | |
| 9097 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9098 if (IS_CTERM) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9099 aep = syn_cterm_attr2entry(attr); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9100 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9101 aep = syn_term_attr2entry(attr); |
| 745 | 9102 |
| 9103 if (aep == NULL) /* highlighting not set */ | |
| 9104 return 0; | |
| 9105 return aep->ae_attr; | |
| 9106 } | |
| 9107 | |
| 9108 | |
| 7 | 9109 attrentry_T * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9110 syn_term_attr2entry(int attr) |
| 7 | 9111 { |
| 9112 attr -= ATTR_OFF; | |
| 9113 if (attr >= term_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9114 return NULL; | |
| 9115 return &(TERM_ATTR_ENTRY(attr)); | |
| 9116 } | |
| 9117 | |
| 9118 attrentry_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9119 syn_cterm_attr2entry(int attr) |
| 7 | 9120 { |
| 9121 attr -= ATTR_OFF; | |
| 9122 if (attr >= cterm_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9123 return NULL; | |
| 9124 return &(CTERM_ATTR_ENTRY(attr)); | |
| 9125 } | |
| 9126 | |
| 9127 #define LIST_ATTR 1 | |
| 9128 #define LIST_STRING 2 | |
| 9129 #define LIST_INT 3 | |
| 9130 | |
| 9131 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9132 highlight_list_one(int id) |
| 7 | 9133 { |
| 9134 struct hl_group *sgp; | |
| 9135 int didh = FALSE; | |
| 9136 | |
| 9137 sgp = &HL_TABLE()[id - 1]; /* index is ID minus one */ | |
| 9138 | |
| 9139 didh = highlight_list_arg(id, didh, LIST_ATTR, | |
| 9140 sgp->sg_term, NULL, "term"); | |
| 9141 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9142 0, sgp->sg_start, "start"); | |
| 9143 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9144 0, sgp->sg_stop, "stop"); | |
| 9145 | |
| 9146 didh = highlight_list_arg(id, didh, LIST_ATTR, | |
| 9147 sgp->sg_cterm, NULL, "cterm"); | |
| 9148 didh = highlight_list_arg(id, didh, LIST_INT, | |
| 9149 sgp->sg_cterm_fg, NULL, "ctermfg"); | |
| 9150 didh = highlight_list_arg(id, didh, LIST_INT, | |
| 9151 sgp->sg_cterm_bg, NULL, "ctermbg"); | |
| 9152 | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9153 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 9154 didh = highlight_list_arg(id, didh, LIST_ATTR, |
| 9155 sgp->sg_gui, NULL, "gui"); | |
| 9156 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9157 0, sgp->sg_gui_fg_name, "guifg"); | |
| 9158 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9159 0, sgp->sg_gui_bg_name, "guibg"); | |
| 9160 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 301 | 9161 0, sgp->sg_gui_sp_name, "guisp"); |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9162 #endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9163 #ifdef FEAT_GUI |
| 301 | 9164 didh = highlight_list_arg(id, didh, LIST_STRING, |
| 7 | 9165 0, sgp->sg_font_name, "font"); |
| 9166 #endif | |
| 9167 | |
| 448 | 9168 if (sgp->sg_link && !got_int) |
| 7 | 9169 { |
| 9170 (void)syn_list_header(didh, 9999, id); | |
| 448 | 9171 didh = TRUE; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9172 msg_puts_attr((char_u *)"links to", HL_ATTR(HLF_D)); |
| 7 | 9173 msg_putchar(' '); |
| 9174 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name); | |
| 9175 } | |
| 448 | 9176 |
| 694 | 9177 if (!didh) |
| 9178 highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", ""); | |
| 448 | 9179 #ifdef FEAT_EVAL |
| 694 | 9180 if (p_verbose > 0) |
| 448 | 9181 last_set_msg(sgp->sg_scriptID); |
| 9182 #endif | |
| 7 | 9183 } |
| 9184 | |
| 9185 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9186 highlight_list_arg( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9187 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9188 int didh, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9189 int type, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9190 int iarg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9191 char_u *sarg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9192 char *name) |
| 7 | 9193 { |
| 9194 char_u buf[100]; | |
| 9195 char_u *ts; | |
| 9196 int i; | |
| 9197 | |
| 448 | 9198 if (got_int) |
| 9199 return FALSE; | |
| 7 | 9200 if (type == LIST_STRING ? (sarg != NULL) : (iarg != 0)) |
| 9201 { | |
| 9202 ts = buf; | |
| 9203 if (type == LIST_INT) | |
| 9204 sprintf((char *)buf, "%d", iarg - 1); | |
| 9205 else if (type == LIST_STRING) | |
| 9206 ts = sarg; | |
| 9207 else /* type == LIST_ATTR */ | |
| 9208 { | |
| 9209 buf[0] = NUL; | |
| 9210 for (i = 0; hl_attr_table[i] != 0; ++i) | |
| 9211 { | |
| 9212 if (iarg & hl_attr_table[i]) | |
| 9213 { | |
| 9214 if (buf[0] != NUL) | |
| 2768 | 9215 vim_strcat(buf, (char_u *)",", 100); |
| 9216 vim_strcat(buf, (char_u *)hl_name_table[i], 100); | |
| 7 | 9217 iarg &= ~hl_attr_table[i]; /* don't want "inverse" */ |
| 9218 } | |
| 9219 } | |
| 9220 } | |
| 9221 | |
| 9222 (void)syn_list_header(didh, | |
| 9223 (int)(vim_strsize(ts) + STRLEN(name) + 1), id); | |
| 9224 didh = TRUE; | |
| 448 | 9225 if (!got_int) |
| 9226 { | |
| 694 | 9227 if (*name != NUL) |
| 9228 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9229 MSG_PUTS_ATTR(name, HL_ATTR(HLF_D)); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9230 MSG_PUTS_ATTR("=", HL_ATTR(HLF_D)); |
| 694 | 9231 } |
| 448 | 9232 msg_outtrans(ts); |
| 9233 } | |
| 7 | 9234 } |
| 9235 return didh; | |
| 9236 } | |
| 9237 | |
| 9238 #if (((defined(FEAT_EVAL) || defined(FEAT_PRINTER))) && defined(FEAT_SYN_HL)) || defined(PROTO) | |
| 9239 /* | |
| 9240 * Return "1" if highlight group "id" has attribute "flag". | |
| 9241 * Return NULL otherwise. | |
| 9242 */ | |
| 9243 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9244 highlight_has_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9245 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9246 int flag, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9247 int modec) /* 'g' for GUI, 'c' for cterm, 't' for term */ |
| 7 | 9248 { |
| 9249 int attr; | |
| 9250 | |
| 9251 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9252 return NULL; | |
| 9253 | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9254 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 9255 if (modec == 'g') |
| 9256 attr = HL_TABLE()[id - 1].sg_gui; | |
| 9257 else | |
| 9258 #endif | |
| 9259 if (modec == 'c') | |
| 9260 attr = HL_TABLE()[id - 1].sg_cterm; | |
| 9261 else | |
| 9262 attr = HL_TABLE()[id - 1].sg_term; | |
| 9263 | |
| 9264 if (attr & flag) | |
| 9265 return (char_u *)"1"; | |
| 9266 return NULL; | |
| 9267 } | |
| 9268 #endif | |
| 9269 | |
| 9270 #if (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) || defined(PROTO) | |
| 9271 /* | |
| 9272 * Return color name of highlight group "id". | |
| 9273 */ | |
| 9274 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9275 highlight_color( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9276 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9277 char_u *what, /* "font", "fg", "bg", "sp", "fg#", "bg#" or "sp#" */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9278 int modec) /* 'g' for GUI, 'c' for cterm, 't' for term */ |
| 7 | 9279 { |
| 9280 static char_u name[20]; | |
| 9281 int n; | |
| 205 | 9282 int fg = FALSE; |
| 9283 int sp = FALSE; | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9284 int font = FALSE; |
| 7 | 9285 |
| 9286 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9287 return NULL; | |
| 9288 | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9289 if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'g') |
| 7 | 9290 fg = TRUE; |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9291 else if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'o' |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
9292 && TOLOWER_ASC(what[2]) == 'n' && TOLOWER_ASC(what[3]) == 't') |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9293 font = TRUE; |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9294 else if (TOLOWER_ASC(what[0]) == 's' && TOLOWER_ASC(what[1]) == 'p') |
| 205 | 9295 sp = TRUE; |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9296 else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g')) |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9297 return NULL; |
| 7 | 9298 if (modec == 'g') |
| 9299 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9300 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9301 # ifdef FEAT_GUI |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9302 /* return font name */ |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9303 if (font) |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9304 return HL_TABLE()[id - 1].sg_font_name; |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9305 # endif |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9306 |
| 7 | 9307 /* return #RRGGBB form (only possible when GUI is running) */ |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9308 if ((USE_24BIT) && what[2] == '#') |
| 7 | 9309 { |
| 9310 guicolor_T color; | |
| 9311 long_u rgb; | |
| 9312 static char_u buf[10]; | |
| 9313 | |
| 9314 if (fg) | |
| 9315 color = HL_TABLE()[id - 1].sg_gui_fg; | |
| 205 | 9316 else if (sp) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9317 # ifdef FEAT_GUI |
| 205 | 9318 color = HL_TABLE()[id - 1].sg_gui_sp; |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9319 # else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9320 color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9321 # endif |
| 7 | 9322 else |
| 9323 color = HL_TABLE()[id - 1].sg_gui_bg; | |
| 9324 if (color == INVALCOLOR) | |
| 9325 return NULL; | |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
9326 rgb = (long_u)GUI_MCH_GET_RGB(color); |
| 7 | 9327 sprintf((char *)buf, "#%02x%02x%02x", |
| 9328 (unsigned)(rgb >> 16), | |
| 9329 (unsigned)(rgb >> 8) & 255, | |
| 9330 (unsigned)rgb & 255); | |
| 9331 return buf; | |
| 9332 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9333 # endif |
| 7 | 9334 if (fg) |
| 9335 return (HL_TABLE()[id - 1].sg_gui_fg_name); | |
| 205 | 9336 if (sp) |
| 9337 return (HL_TABLE()[id - 1].sg_gui_sp_name); | |
| 7 | 9338 return (HL_TABLE()[id - 1].sg_gui_bg_name); |
| 9339 } | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9340 if (font || sp) |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9341 return NULL; |
| 7 | 9342 if (modec == 'c') |
| 9343 { | |
| 9344 if (fg) | |
| 9345 n = HL_TABLE()[id - 1].sg_cterm_fg - 1; | |
| 9346 else | |
| 9347 n = HL_TABLE()[id - 1].sg_cterm_bg - 1; | |
|
8514
260d01c1cd17
commit https://github.com/vim/vim/commit/385111bd86e0b38667879c3e89506ca1ae98e1df
Christian Brabandt <cb@256bit.org>
parents:
8362
diff
changeset
|
9348 if (n < 0) |
|
260d01c1cd17
commit https://github.com/vim/vim/commit/385111bd86e0b38667879c3e89506ca1ae98e1df
Christian Brabandt <cb@256bit.org>
parents:
8362
diff
changeset
|
9349 return NULL; |
| 7 | 9350 sprintf((char *)name, "%d", n); |
| 9351 return name; | |
| 9352 } | |
| 9353 /* term doesn't have color */ | |
| 9354 return NULL; | |
| 9355 } | |
| 9356 #endif | |
| 9357 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9358 #if (defined(FEAT_SYN_HL) \ |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9359 && (defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)) \ |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9360 && defined(FEAT_PRINTER)) || defined(PROTO) |
| 7 | 9361 /* |
| 9362 * Return color name of highlight group "id" as RGB value. | |
| 9363 */ | |
| 9364 long_u | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9365 highlight_gui_color_rgb( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9366 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9367 int fg) /* TRUE = fg, FALSE = bg */ |
| 7 | 9368 { |
| 9369 guicolor_T color; | |
| 9370 | |
| 9371 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9372 return 0L; | |
| 9373 | |
| 9374 if (fg) | |
| 9375 color = HL_TABLE()[id - 1].sg_gui_fg; | |
| 9376 else | |
| 9377 color = HL_TABLE()[id - 1].sg_gui_bg; | |
| 9378 | |
| 9379 if (color == INVALCOLOR) | |
| 9380 return 0L; | |
| 9381 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9382 return GUI_MCH_GET_RGB(color); |
| 7 | 9383 } |
| 9384 #endif | |
| 9385 | |
| 9386 /* | |
| 9387 * Output the syntax list header. | |
| 9388 * Return TRUE when started a new line. | |
| 9389 */ | |
| 9390 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9391 syn_list_header( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9392 int did_header, /* did header already */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9393 int outlen, /* length of string that comes */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9394 int id) /* highlight group id */ |
| 7 | 9395 { |
| 9396 int endcol = 19; | |
| 9397 int newline = TRUE; | |
| 9398 | |
| 9399 if (!did_header) | |
| 9400 { | |
| 9401 msg_putchar('\n'); | |
| 448 | 9402 if (got_int) |
| 9403 return TRUE; | |
| 7 | 9404 msg_outtrans(HL_TABLE()[id - 1].sg_name); |
| 9405 endcol = 15; | |
| 9406 } | |
| 9407 else if (msg_col + outlen + 1 >= Columns) | |
| 448 | 9408 { |
| 7 | 9409 msg_putchar('\n'); |
| 448 | 9410 if (got_int) |
| 9411 return TRUE; | |
| 9412 } | |
| 7 | 9413 else |
| 9414 { | |
| 9415 if (msg_col >= endcol) /* wrap around is like starting a new line */ | |
| 9416 newline = FALSE; | |
| 9417 } | |
| 9418 | |
| 9419 if (msg_col >= endcol) /* output at least one space */ | |
| 9420 endcol = msg_col + 1; | |
| 9421 if (Columns <= endcol) /* avoid hang for tiny window */ | |
| 9422 endcol = Columns - 1; | |
| 9423 | |
| 9424 msg_advance(endcol); | |
| 9425 | |
| 9426 /* Show "xxx" with the attributes. */ | |
| 9427 if (!did_header) | |
| 9428 { | |
| 9429 msg_puts_attr((char_u *)"xxx", syn_id2attr(id)); | |
| 9430 msg_putchar(' '); | |
| 9431 } | |
| 9432 | |
| 9433 return newline; | |
| 9434 } | |
| 9435 | |
| 9436 /* | |
| 9437 * Set the attribute numbers for a highlight group. | |
| 9438 * Called after one of the attributes has changed. | |
| 9439 */ | |
| 9440 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9441 set_hl_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9442 int idx) /* index in array */ |
| 7 | 9443 { |
| 9444 attrentry_T at_en; | |
| 9445 struct hl_group *sgp = HL_TABLE() + idx; | |
| 9446 | |
| 9447 /* The "Normal" group doesn't need an attribute number */ | |
| 9448 if (sgp->sg_name_u != NULL && STRCMP(sgp->sg_name_u, "NORMAL") == 0) | |
| 9449 return; | |
| 9450 | |
| 9451 #ifdef FEAT_GUI | |
| 9452 /* | |
| 9453 * For the GUI mode: If there are other than "normal" highlighting | |
| 9454 * attributes, need to allocate an attr number. | |
| 9455 */ | |
| 9456 if (sgp->sg_gui_fg == INVALCOLOR | |
| 9457 && sgp->sg_gui_bg == INVALCOLOR | |
| 205 | 9458 && sgp->sg_gui_sp == INVALCOLOR |
| 7 | 9459 && sgp->sg_font == NOFONT |
| 9460 # ifdef FEAT_XFONTSET | |
| 9461 && sgp->sg_fontset == NOFONTSET | |
| 9462 # endif | |
| 9463 ) | |
| 9464 { | |
| 9465 sgp->sg_gui_attr = sgp->sg_gui; | |
| 9466 } | |
| 9467 else | |
| 9468 { | |
| 9469 at_en.ae_attr = sgp->sg_gui; | |
| 9470 at_en.ae_u.gui.fg_color = sgp->sg_gui_fg; | |
| 9471 at_en.ae_u.gui.bg_color = sgp->sg_gui_bg; | |
| 205 | 9472 at_en.ae_u.gui.sp_color = sgp->sg_gui_sp; |
| 7 | 9473 at_en.ae_u.gui.font = sgp->sg_font; |
| 9474 # ifdef FEAT_XFONTSET | |
| 9475 at_en.ae_u.gui.fontset = sgp->sg_fontset; | |
| 9476 # endif | |
| 9477 sgp->sg_gui_attr = get_attr_entry(&gui_attr_table, &at_en); | |
| 9478 } | |
| 9479 #endif | |
| 9480 /* | |
| 9481 * For the term mode: If there are other than "normal" highlighting | |
| 9482 * attributes, need to allocate an attr number. | |
| 9483 */ | |
| 9484 if (sgp->sg_start == NULL && sgp->sg_stop == NULL) | |
| 9485 sgp->sg_term_attr = sgp->sg_term; | |
| 9486 else | |
| 9487 { | |
| 9488 at_en.ae_attr = sgp->sg_term; | |
| 9489 at_en.ae_u.term.start = sgp->sg_start; | |
| 9490 at_en.ae_u.term.stop = sgp->sg_stop; | |
| 9491 sgp->sg_term_attr = get_attr_entry(&term_attr_table, &at_en); | |
| 9492 } | |
| 9493 | |
| 9494 /* | |
| 9495 * For the color term mode: If there are other than "normal" | |
| 9496 * highlighting attributes, need to allocate an attr number. | |
| 9497 */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9498 if (sgp->sg_cterm_fg == 0 && sgp->sg_cterm_bg == 0 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9499 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9500 && sgp->sg_gui_fg == INVALCOLOR |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9501 && sgp->sg_gui_bg == INVALCOLOR |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9502 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9503 ) |
| 7 | 9504 sgp->sg_cterm_attr = sgp->sg_cterm; |
| 9505 else | |
| 9506 { | |
| 9507 at_en.ae_attr = sgp->sg_cterm; | |
| 9508 at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg; | |
| 9509 at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg; | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9510 # ifdef FEAT_TERMGUICOLORS |
|
9054
f129fd3ebd98
commit https://github.com/vim/vim/commit/187147aedd588070d0676664d5076d046644094e
Christian Brabandt <cb@256bit.org>
parents:
9029
diff
changeset
|
9511 at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg); |
|
f129fd3ebd98
commit https://github.com/vim/vim/commit/187147aedd588070d0676664d5076d046644094e
Christian Brabandt <cb@256bit.org>
parents:
9029
diff
changeset
|
9512 at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9513 # endif |
| 7 | 9514 sgp->sg_cterm_attr = get_attr_entry(&cterm_attr_table, &at_en); |
| 9515 } | |
| 9516 } | |
| 9517 | |
| 9518 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9519 * Lookup a highlight group name and return its ID. |
| 7 | 9520 * If it is not found, 0 is returned. |
| 9521 */ | |
| 9522 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9523 syn_name2id(char_u *name) |
| 7 | 9524 { |
| 9525 int i; | |
| 9526 char_u name_u[200]; | |
| 9527 | |
| 9528 /* Avoid using stricmp() too much, it's slow on some systems */ | |
| 9529 /* Avoid alloc()/free(), these are slow too. ID names over 200 chars | |
| 9530 * don't deserve to be found! */ | |
| 419 | 9531 vim_strncpy(name_u, name, 199); |
| 7 | 9532 vim_strup(name_u); |
| 9533 for (i = highlight_ga.ga_len; --i >= 0; ) | |
| 9534 if (HL_TABLE()[i].sg_name_u != NULL | |
| 9535 && STRCMP(name_u, HL_TABLE()[i].sg_name_u) == 0) | |
| 9536 break; | |
| 9537 return i + 1; | |
| 9538 } | |
| 9539 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9540 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9541 * Lookup a highlight group name and return its attributes. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9542 * Return zero if not found. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9543 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9544 int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9545 syn_name2attr(char_u *name) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9546 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9547 int id = syn_name2id(name); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9548 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9549 if (id != 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9550 return syn_id2attr(syn_get_final_id(id)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9551 return 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9552 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9553 |
| 7 | 9554 #if defined(FEAT_EVAL) || defined(PROTO) |
| 9555 /* | |
| 9556 * Return TRUE if highlight group "name" exists. | |
| 9557 */ | |
| 9558 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9559 highlight_exists(char_u *name) |
| 7 | 9560 { |
| 9561 return (syn_name2id(name) > 0); | |
| 9562 } | |
| 819 | 9563 |
| 9564 # if defined(FEAT_SEARCH_EXTRA) || defined(PROTO) | |
| 9565 /* | |
| 9566 * Return the name of highlight group "id". | |
| 9567 * When not a valid ID return an empty string. | |
| 9568 */ | |
| 9569 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9570 syn_id2name(int id) |
| 819 | 9571 { |
| 1326 | 9572 if (id <= 0 || id > highlight_ga.ga_len) |
| 819 | 9573 return (char_u *)""; |
| 9574 return HL_TABLE()[id - 1].sg_name; | |
| 9575 } | |
| 9576 # endif | |
| 7 | 9577 #endif |
| 9578 | |
| 9579 /* | |
| 9580 * Like syn_name2id(), but take a pointer + length argument. | |
| 9581 */ | |
| 9582 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9583 syn_namen2id(char_u *linep, int len) |
| 7 | 9584 { |
| 9585 char_u *name; | |
| 9586 int id = 0; | |
| 9587 | |
| 9588 name = vim_strnsave(linep, len); | |
| 9589 if (name != NULL) | |
| 9590 { | |
| 9591 id = syn_name2id(name); | |
| 9592 vim_free(name); | |
| 9593 } | |
| 9594 return id; | |
| 9595 } | |
| 9596 | |
| 9597 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9598 * Find highlight group name in the table and return its ID. |
| 7 | 9599 * The argument is a pointer to the name and the length of the name. |
| 9600 * If it doesn't exist yet, a new entry is created. | |
| 9601 * Return 0 for failure. | |
| 9602 */ | |
| 9603 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9604 syn_check_group(char_u *pp, int len) |
| 7 | 9605 { |
| 9606 int id; | |
| 9607 char_u *name; | |
| 9608 | |
| 9609 name = vim_strnsave(pp, len); | |
| 9610 if (name == NULL) | |
| 9611 return 0; | |
| 9612 | |
| 9613 id = syn_name2id(name); | |
| 9614 if (id == 0) /* doesn't exist yet */ | |
| 9615 id = syn_add_group(name); | |
| 9616 else | |
| 9617 vim_free(name); | |
| 9618 return id; | |
| 9619 } | |
| 9620 | |
| 9621 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9622 * Add new highlight group and return its ID. |
| 7 | 9623 * "name" must be an allocated string, it will be consumed. |
| 9624 * Return 0 for failure. | |
| 9625 */ | |
| 9626 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9627 syn_add_group(char_u *name) |
| 7 | 9628 { |
| 9629 char_u *p; | |
| 9630 | |
| 9631 /* Check that the name is ASCII letters, digits and underscore. */ | |
| 9632 for (p = name; *p != NUL; ++p) | |
| 9633 { | |
| 9634 if (!vim_isprintc(*p)) | |
| 9635 { | |
| 9636 EMSG(_("E669: Unprintable character in group name")); | |
| 2020 | 9637 vim_free(name); |
| 7 | 9638 return 0; |
| 9639 } | |
| 9640 else if (!ASCII_ISALNUM(*p) && *p != '_') | |
| 9641 { | |
| 9642 /* This is an error, but since there previously was no check only | |
| 9643 * give a warning. */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9644 msg_source(HL_ATTR(HLF_W)); |
| 7 | 9645 MSG(_("W18: Invalid character in group name")); |
| 9646 break; | |
| 9647 } | |
| 9648 } | |
| 9649 | |
| 9650 /* | |
| 9651 * First call for this growarray: init growing array. | |
| 9652 */ | |
| 9653 if (highlight_ga.ga_data == NULL) | |
| 9654 { | |
| 9655 highlight_ga.ga_itemsize = sizeof(struct hl_group); | |
| 9656 highlight_ga.ga_growsize = 10; | |
| 9657 } | |
| 9658 | |
| 2756 | 9659 if (highlight_ga.ga_len >= MAX_HL_ID) |
| 9660 { | |
| 9661 EMSG(_("E849: Too many highlight and syntax groups")); | |
| 2743 | 9662 vim_free(name); |
| 9663 return 0; | |
| 9664 } | |
| 9665 | |
| 7 | 9666 /* |
| 9667 * Make room for at least one other syntax_highlight entry. | |
| 9668 */ | |
| 9669 if (ga_grow(&highlight_ga, 1) == FAIL) | |
| 9670 { | |
| 9671 vim_free(name); | |
| 9672 return 0; | |
| 9673 } | |
| 9674 | |
| 9675 vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(struct hl_group)); | |
| 9676 HL_TABLE()[highlight_ga.ga_len].sg_name = name; | |
| 9677 HL_TABLE()[highlight_ga.ga_len].sg_name_u = vim_strsave_up(name); | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9678 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 7 | 9679 HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR; |
| 9680 HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR; | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9681 # ifdef FEAT_GUI |
| 205 | 9682 HL_TABLE()[highlight_ga.ga_len].sg_gui_sp = INVALCOLOR; |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9683 # endif |
| 7 | 9684 #endif |
| 9685 ++highlight_ga.ga_len; | |
| 9686 | |
| 9687 return highlight_ga.ga_len; /* ID is index plus one */ | |
| 9688 } | |
| 9689 | |
| 9690 /* | |
| 9691 * When, just after calling syn_add_group(), an error is discovered, this | |
| 9692 * function deletes the new name. | |
| 9693 */ | |
| 9694 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9695 syn_unadd_group(void) |
| 7 | 9696 { |
| 9697 --highlight_ga.ga_len; | |
| 9698 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name); | |
| 9699 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name_u); | |
| 9700 } | |
| 9701 | |
| 9702 /* | |
| 9703 * Translate a group ID to highlight attributes. | |
| 9704 */ | |
| 9705 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9706 syn_id2attr(int hl_id) |
| 7 | 9707 { |
| 9708 int attr; | |
| 9709 struct hl_group *sgp; | |
| 9710 | |
| 9711 hl_id = syn_get_final_id(hl_id); | |
| 9712 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9713 | |
| 9714 #ifdef FEAT_GUI | |
| 9715 /* | |
| 9716 * Only use GUI attr when the GUI is being used. | |
| 9717 */ | |
| 9718 if (gui.in_use) | |
| 9719 attr = sgp->sg_gui_attr; | |
| 9720 else | |
| 9721 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9722 if (IS_CTERM) |
| 7 | 9723 attr = sgp->sg_cterm_attr; |
| 9724 else | |
| 9725 attr = sgp->sg_term_attr; | |
| 9726 | |
| 9727 return attr; | |
| 9728 } | |
| 9729 | |
|
12445
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9730 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
| 7 | 9731 /* |
| 9732 * Get the GUI colors and attributes for a group ID. | |
| 9733 * NOTE: the colors will be INVALCOLOR when not set, the color otherwise. | |
| 9734 */ | |
| 9735 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9736 syn_id2colors(int hl_id, guicolor_T *fgp, guicolor_T *bgp) |
| 7 | 9737 { |
| 9738 struct hl_group *sgp; | |
| 9739 | |
| 9740 hl_id = syn_get_final_id(hl_id); | |
| 9741 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9742 | |
| 9743 *fgp = sgp->sg_gui_fg; | |
| 9744 *bgp = sgp->sg_gui_bg; | |
| 9745 return sgp->sg_gui; | |
| 9746 } | |
| 9747 #endif | |
| 9748 | |
|
12445
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9749 #if defined(FEAT_TERMINAL) || defined(PROT) |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9750 void |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9751 syn_id2cterm_bg(int hl_id, int *fgp, int *bgp) |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9752 { |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9753 struct hl_group *sgp; |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9754 |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9755 hl_id = syn_get_final_id(hl_id); |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9756 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9757 *fgp = sgp->sg_cterm_fg - 1; |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9758 *bgp = sgp->sg_cterm_bg - 1; |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9759 } |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9760 #endif |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9761 |
| 7 | 9762 /* |
| 9763 * Translate a group ID to the final group ID (following links). | |
| 9764 */ | |
| 9765 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9766 syn_get_final_id(int hl_id) |
| 7 | 9767 { |
| 9768 int count; | |
| 9769 struct hl_group *sgp; | |
| 9770 | |
| 9771 if (hl_id > highlight_ga.ga_len || hl_id < 1) | |
| 9772 return 0; /* Can be called from eval!! */ | |
| 9773 | |
| 9774 /* | |
| 9775 * Follow links until there is no more. | |
| 9776 * Look out for loops! Break after 100 links. | |
| 9777 */ | |
| 9778 for (count = 100; --count >= 0; ) | |
| 9779 { | |
| 9780 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9781 if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len) | |
| 9782 break; | |
| 9783 hl_id = sgp->sg_link; | |
| 9784 } | |
| 9785 | |
| 9786 return hl_id; | |
| 9787 } | |
| 9788 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9789 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 7 | 9790 /* |
| 9791 * Call this function just after the GUI has started. | |
| 9792 * It finds the font and color handles for the highlighting groups. | |
| 9793 */ | |
| 9794 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9795 highlight_gui_started(void) |
| 7 | 9796 { |
| 9797 int idx; | |
| 9798 | |
| 9799 /* First get the colors from the "Normal" and "Menu" group, if set */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9800 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9801 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9802 if (USE_24BIT) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9803 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9804 set_normal_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9805 # endif |
| 7 | 9806 |
| 9807 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 9808 gui_do_one_color(idx, FALSE, FALSE); | |
| 9809 | |
| 9810 highlight_changed(); | |
| 9811 } | |
| 9812 | |
| 9813 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9814 gui_do_one_color( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9815 int idx, |
|
8975
9c097bfad637
commit https://github.com/vim/vim/commit/380130f1e18da92a44372728fe044f56db58585b
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
9816 int do_menu UNUSED, /* TRUE: might set the menu font */ |
|
9c097bfad637
commit https://github.com/vim/vim/commit/380130f1e18da92a44372728fe044f56db58585b
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
9817 int do_tooltip UNUSED) /* TRUE: might set the tooltip font */ |
| 7 | 9818 { |
| 9819 int didit = FALSE; | |
| 9820 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9821 # ifdef FEAT_GUI |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9822 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9823 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9824 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9825 if (HL_TABLE()[idx].sg_font_name != NULL) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9826 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9827 hl_do_font(idx, HL_TABLE()[idx].sg_font_name, FALSE, do_menu, |
| 3881 | 9828 do_tooltip, TRUE); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9829 didit = TRUE; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9830 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9831 # endif |
| 7 | 9832 if (HL_TABLE()[idx].sg_gui_fg_name != NULL) |
| 9833 { | |
| 9834 HL_TABLE()[idx].sg_gui_fg = | |
| 9835 color_name2handle(HL_TABLE()[idx].sg_gui_fg_name); | |
| 9836 didit = TRUE; | |
| 9837 } | |
| 9838 if (HL_TABLE()[idx].sg_gui_bg_name != NULL) | |
| 9839 { | |
| 9840 HL_TABLE()[idx].sg_gui_bg = | |
| 9841 color_name2handle(HL_TABLE()[idx].sg_gui_bg_name); | |
| 9842 didit = TRUE; | |
| 9843 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9844 # ifdef FEAT_GUI |
| 205 | 9845 if (HL_TABLE()[idx].sg_gui_sp_name != NULL) |
| 9846 { | |
| 9847 HL_TABLE()[idx].sg_gui_sp = | |
| 9848 color_name2handle(HL_TABLE()[idx].sg_gui_sp_name); | |
| 9849 didit = TRUE; | |
| 9850 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9851 # endif |
| 7 | 9852 if (didit) /* need to get a new attr number */ |
| 9853 set_hl_attr(idx); | |
| 9854 } | |
| 9855 #endif | |
| 9856 | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9857 #if defined(USER_HIGHLIGHT) && defined(FEAT_STL_OPT) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9858 /* |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
9859 * Apply difference between User[1-9] and HLF_S to HLF_SNC, HLF_ST or HLF_STNC. |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9860 */ |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9861 static void |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9862 combine_stl_hlt( |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9863 int id, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9864 int id_S, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9865 int id_alt, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9866 int hlcnt, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9867 int i, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9868 int hlf, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9869 int *table) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9870 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9871 struct hl_group *hlt = HL_TABLE(); |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9872 |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9873 if (id_alt == 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9874 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9875 vim_memset(&hlt[hlcnt + i], 0, sizeof(struct hl_group)); |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9876 hlt[hlcnt + i].sg_term = highlight_attr[hlf]; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9877 hlt[hlcnt + i].sg_cterm = highlight_attr[hlf]; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9878 # if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9879 hlt[hlcnt + i].sg_gui = highlight_attr[hlf]; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9880 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9881 } |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9882 else |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9883 mch_memmove(&hlt[hlcnt + i], |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9884 &hlt[id_alt - 1], |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9885 sizeof(struct hl_group)); |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9886 hlt[hlcnt + i].sg_link = 0; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9887 |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9888 hlt[hlcnt + i].sg_term ^= |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9889 hlt[id - 1].sg_term ^ hlt[id_S - 1].sg_term; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9890 if (hlt[id - 1].sg_start != hlt[id_S - 1].sg_start) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9891 hlt[hlcnt + i].sg_start = hlt[id - 1].sg_start; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9892 if (hlt[id - 1].sg_stop != hlt[id_S - 1].sg_stop) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9893 hlt[hlcnt + i].sg_stop = hlt[id - 1].sg_stop; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9894 hlt[hlcnt + i].sg_cterm ^= |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9895 hlt[id - 1].sg_cterm ^ hlt[id_S - 1].sg_cterm; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9896 if (hlt[id - 1].sg_cterm_fg != hlt[id_S - 1].sg_cterm_fg) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9897 hlt[hlcnt + i].sg_cterm_fg = hlt[id - 1].sg_cterm_fg; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9898 if (hlt[id - 1].sg_cterm_bg != hlt[id_S - 1].sg_cterm_bg) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9899 hlt[hlcnt + i].sg_cterm_bg = hlt[id - 1].sg_cterm_bg; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9900 # if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9901 hlt[hlcnt + i].sg_gui ^= |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9902 hlt[id - 1].sg_gui ^ hlt[id_S - 1].sg_gui; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9903 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9904 # ifdef FEAT_GUI |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9905 if (hlt[id - 1].sg_gui_fg != hlt[id_S - 1].sg_gui_fg) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9906 hlt[hlcnt + i].sg_gui_fg = hlt[id - 1].sg_gui_fg; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9907 if (hlt[id - 1].sg_gui_bg != hlt[id_S - 1].sg_gui_bg) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9908 hlt[hlcnt + i].sg_gui_bg = hlt[id - 1].sg_gui_bg; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9909 if (hlt[id - 1].sg_gui_sp != hlt[id_S - 1].sg_gui_sp) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9910 hlt[hlcnt + i].sg_gui_sp = hlt[id - 1].sg_gui_sp; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9911 if (hlt[id - 1].sg_font != hlt[id_S - 1].sg_font) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9912 hlt[hlcnt + i].sg_font = hlt[id - 1].sg_font; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9913 # ifdef FEAT_XFONTSET |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9914 if (hlt[id - 1].sg_fontset != hlt[id_S - 1].sg_fontset) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9915 hlt[hlcnt + i].sg_fontset = hlt[id - 1].sg_fontset; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9916 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9917 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9918 highlight_ga.ga_len = hlcnt + i + 1; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9919 set_hl_attr(hlcnt + i); /* At long last we can apply */ |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9920 table[i] = syn_id2attr(hlcnt + i + 1); |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9921 } |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9922 #endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9923 |
| 7 | 9924 /* |
| 9925 * Translate the 'highlight' option into attributes in highlight_attr[] and | |
| 9926 * set up the user highlights User1..9. If FEAT_STL_OPT is in use, a set of | |
| 9927 * corresponding highlights to use on top of HLF_SNC is computed. | |
| 9928 * Called only when the 'highlight' option has been changed and upon first | |
| 9929 * screen redraw after any :highlight command. | |
| 9930 * Return FAIL when an invalid flag is found in 'highlight'. OK otherwise. | |
| 9931 */ | |
| 9932 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9933 highlight_changed(void) |
| 7 | 9934 { |
| 9935 int hlf; | |
| 9936 int i; | |
| 9937 char_u *p; | |
| 9938 int attr; | |
| 9939 char_u *end; | |
| 9940 int id; | |
| 9941 #ifdef USER_HIGHLIGHT | |
| 9942 char_u userhl[10]; | |
| 9943 # ifdef FEAT_STL_OPT | |
| 9944 int id_SNC = -1; | |
| 9945 int id_S = -1; | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9946 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9947 int id_ST = -1; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
9948 int id_STNC = -1; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9949 # endif |
| 7 | 9950 int hlcnt; |
| 9951 # endif | |
| 9952 #endif | |
| 9953 static int hl_flags[HLF_COUNT] = HL_FLAGS; | |
| 9954 | |
| 9955 need_highlight_changed = FALSE; | |
| 9956 | |
| 9957 /* | |
| 9958 * Clear all attributes. | |
| 9959 */ | |
| 9960 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf) | |
| 9961 highlight_attr[hlf] = 0; | |
| 9962 | |
| 9963 /* | |
| 9964 * First set all attributes to their default value. | |
| 9965 * Then use the attributes from the 'highlight' option. | |
| 9966 */ | |
| 9967 for (i = 0; i < 2; ++i) | |
| 9968 { | |
| 9969 if (i) | |
| 9970 p = p_hl; | |
| 9971 else | |
| 9972 p = get_highlight_default(); | |
| 9973 if (p == NULL) /* just in case */ | |
| 9974 continue; | |
| 9975 | |
| 9976 while (*p) | |
| 9977 { | |
| 9978 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf) | |
| 9979 if (hl_flags[hlf] == *p) | |
| 9980 break; | |
| 9981 ++p; | |
| 9982 if (hlf == (int)HLF_COUNT || *p == NUL) | |
| 9983 return FAIL; | |
| 9984 | |
| 9985 /* | |
| 9986 * Allow several hl_flags to be combined, like "bu" for | |
| 9987 * bold-underlined. | |
| 9988 */ | |
| 9989 attr = 0; | |
| 9990 for ( ; *p && *p != ','; ++p) /* parse upto comma */ | |
| 9991 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
9992 if (VIM_ISWHITE(*p)) /* ignore white space */ |
| 7 | 9993 continue; |
| 9994 | |
| 9995 if (attr > HL_ALL) /* Combination with ':' is not allowed. */ | |
| 9996 return FAIL; | |
| 9997 | |
| 9998 switch (*p) | |
| 9999 { | |
| 10000 case 'b': attr |= HL_BOLD; | |
| 10001 break; | |
| 10002 case 'i': attr |= HL_ITALIC; | |
| 10003 break; | |
| 10004 case '-': | |
| 10005 case 'n': /* no highlighting */ | |
| 10006 break; | |
| 10007 case 'r': attr |= HL_INVERSE; | |
| 10008 break; | |
| 10009 case 's': attr |= HL_STANDOUT; | |
| 10010 break; | |
| 10011 case 'u': attr |= HL_UNDERLINE; | |
| 10012 break; | |
| 205 | 10013 case 'c': attr |= HL_UNDERCURL; |
| 10014 break; | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
10015 case 't': attr |= HL_STRIKETHROUGH; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
10016 break; |
| 7 | 10017 case ':': ++p; /* highlight group name */ |
| 10018 if (attr || *p == NUL) /* no combinations */ | |
| 10019 return FAIL; | |
| 10020 end = vim_strchr(p, ','); | |
| 10021 if (end == NULL) | |
| 10022 end = p + STRLEN(p); | |
| 10023 id = syn_check_group(p, (int)(end - p)); | |
| 10024 if (id == 0) | |
| 10025 return FAIL; | |
| 10026 attr = syn_id2attr(id); | |
| 10027 p = end - 1; | |
| 10028 #if defined(FEAT_STL_OPT) && defined(USER_HIGHLIGHT) | |
| 10029 if (hlf == (int)HLF_SNC) | |
| 10030 id_SNC = syn_get_final_id(id); | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10031 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10032 else if (hlf == (int)HLF_ST) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10033 id_ST = syn_get_final_id(id); |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10034 else if (hlf == (int)HLF_STNC) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10035 id_STNC = syn_get_final_id(id); |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10036 # endif |
| 7 | 10037 else if (hlf == (int)HLF_S) |
| 10038 id_S = syn_get_final_id(id); | |
| 10039 #endif | |
| 10040 break; | |
| 10041 default: return FAIL; | |
| 10042 } | |
| 10043 } | |
| 10044 highlight_attr[hlf] = attr; | |
| 10045 | |
| 10046 p = skip_to_option_part(p); /* skip comma and spaces */ | |
| 10047 } | |
| 10048 } | |
| 10049 | |
| 10050 #ifdef USER_HIGHLIGHT | |
| 10051 /* Setup the user highlights | |
| 10052 * | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10053 * Temporarily utilize 28 more hl entries: |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10054 * 9 for User1-User9 combined with StatusLineNC |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10055 * 9 for User1-User9 combined with StatusLineTerm |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10056 * 9 for User1-User9 combined with StatusLineTermNC |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10057 * 1 for StatusLine default |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10058 * Have to be in there simultaneously in case of table overflows in |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10059 * get_attr_entry() |
| 7 | 10060 */ |
| 10061 # ifdef FEAT_STL_OPT | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10062 if (ga_grow(&highlight_ga, 28) == FAIL) |
| 7 | 10063 return FAIL; |
| 10064 hlcnt = highlight_ga.ga_len; | |
|
12180
88ca0110abd5
patch 8.0.0970: passing invalid highlight id
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10065 if (id_S == -1) |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10066 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10067 /* Make sure id_S is always valid to simplify code below. Use the last |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10068 * entry. */ |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10069 vim_memset(&HL_TABLE()[hlcnt + 27], 0, sizeof(struct hl_group)); |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10070 HL_TABLE()[hlcnt + 18].sg_term = highlight_attr[HLF_S]; |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10071 id_S = hlcnt + 19; |
| 7 | 10072 } |
| 10073 # endif | |
| 10074 for (i = 0; i < 9; i++) | |
| 10075 { | |
| 10076 sprintf((char *)userhl, "User%d", i + 1); | |
| 10077 id = syn_name2id(userhl); | |
| 10078 if (id == 0) | |
| 10079 { | |
| 10080 highlight_user[i] = 0; | |
| 10081 # ifdef FEAT_STL_OPT | |
| 10082 highlight_stlnc[i] = 0; | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10083 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10084 highlight_stlterm[i] = 0; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10085 highlight_stltermnc[i] = 0; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10086 # endif |
| 7 | 10087 # endif |
| 10088 } | |
| 10089 else | |
| 10090 { | |
| 10091 highlight_user[i] = syn_id2attr(id); | |
| 10092 # ifdef FEAT_STL_OPT | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10093 combine_stl_hlt(id, id_S, id_SNC, hlcnt, i, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10094 HLF_SNC, highlight_stlnc); |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10095 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10096 combine_stl_hlt(id, id_S, id_ST, hlcnt + 9, i, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10097 HLF_ST, highlight_stlterm); |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10098 combine_stl_hlt(id, id_S, id_STNC, hlcnt + 18, i, |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10099 HLF_STNC, highlight_stltermnc); |
| 7 | 10100 # endif |
| 10101 # endif | |
| 10102 } | |
| 10103 } | |
| 10104 # ifdef FEAT_STL_OPT | |
| 10105 highlight_ga.ga_len = hlcnt; | |
| 10106 # endif | |
| 10107 | |
| 10108 #endif /* USER_HIGHLIGHT */ | |
| 10109 | |
| 10110 return OK; | |
| 10111 } | |
| 10112 | |
| 1322 | 10113 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) |
| 7 | 10114 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
10115 static void highlight_list(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
10116 static void highlight_list_two(int cnt, int attr); |
| 7 | 10117 |
| 10118 /* | |
| 10119 * Handle command line completion for :highlight command. | |
| 10120 */ | |
| 10121 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10122 set_context_in_highlight_cmd(expand_T *xp, char_u *arg) |
| 7 | 10123 { |
| 10124 char_u *p; | |
| 10125 | |
| 10126 /* Default: expand group names */ | |
| 10127 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 10128 xp->xp_pattern = arg; | |
| 1322 | 10129 include_link = 2; |
| 10130 include_default = 1; | |
| 7 | 10131 |
| 10132 /* (part of) subcommand already typed */ | |
| 10133 if (*arg != NUL) | |
| 10134 { | |
| 10135 p = skiptowhite(arg); | |
| 10136 if (*p != NUL) /* past "default" or group name */ | |
| 10137 { | |
| 1322 | 10138 include_default = 0; |
| 7 | 10139 if (STRNCMP("default", arg, p - arg) == 0) |
| 10140 { | |
| 10141 arg = skipwhite(p); | |
| 10142 xp->xp_pattern = arg; | |
| 10143 p = skiptowhite(arg); | |
| 10144 } | |
| 10145 if (*p != NUL) /* past group name */ | |
| 10146 { | |
| 1322 | 10147 include_link = 0; |
| 7 | 10148 if (arg[1] == 'i' && arg[0] == 'N') |
| 10149 highlight_list(); | |
| 10150 if (STRNCMP("link", arg, p - arg) == 0 | |
| 10151 || STRNCMP("clear", arg, p - arg) == 0) | |
| 10152 { | |
| 10153 xp->xp_pattern = skipwhite(p); | |
| 10154 p = skiptowhite(xp->xp_pattern); | |
| 10155 if (*p != NUL) /* past first group name */ | |
| 10156 { | |
| 10157 xp->xp_pattern = skipwhite(p); | |
| 10158 p = skiptowhite(xp->xp_pattern); | |
| 10159 } | |
| 10160 } | |
| 10161 if (*p != NUL) /* past group name(s) */ | |
| 10162 xp->xp_context = EXPAND_NOTHING; | |
| 10163 } | |
| 10164 } | |
| 10165 } | |
| 10166 } | |
| 10167 | |
| 10168 /* | |
| 10169 * List highlighting matches in a nice way. | |
| 10170 */ | |
| 10171 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10172 highlight_list(void) |
| 7 | 10173 { |
| 10174 int i; | |
| 10175 | |
| 10176 for (i = 10; --i >= 0; ) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
10177 highlight_list_two(i, HL_ATTR(HLF_D)); |
| 7 | 10178 for (i = 40; --i >= 0; ) |
| 10179 highlight_list_two(99, 0); | |
| 10180 } | |
| 10181 | |
| 10182 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10183 highlight_list_two(int cnt, int attr) |
| 7 | 10184 { |
| 3543 | 10185 msg_puts_attr((char_u *)&("N \bI \b! \b"[cnt / 11]), attr); |
| 7 | 10186 msg_clr_eos(); |
| 10187 out_flush(); | |
| 10188 ui_delay(cnt == 99 ? 40L : (long)cnt * 50L, FALSE); | |
| 10189 } | |
| 10190 | |
| 10191 #endif /* FEAT_CMDL_COMPL */ | |
| 10192 | |
| 10193 #if defined(FEAT_CMDL_COMPL) || (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) \ | |
| 10194 || defined(FEAT_SIGNS) || defined(PROTO) | |
| 10195 /* | |
| 10196 * Function given to ExpandGeneric() to obtain the list of group names. | |
| 10197 */ | |
| 10198 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10199 get_highlight_name(expand_T *xp UNUSED, int idx) |
| 7 | 10200 { |
|
11254
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10201 return get_highlight_name_ext(xp, idx, TRUE); |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10202 } |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10203 |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10204 /* |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10205 * Obtain a highlight group name. |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10206 * When "skip_cleared" is TRUE don't return a cleared entry. |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10207 */ |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10208 char_u * |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10209 get_highlight_name_ext(expand_T *xp UNUSED, int idx, int skip_cleared) |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10210 { |
|
10660
715836a72361
patch 8.0.0220: completion of highlight names misses a few values
Christian Brabandt <cb@256bit.org>
parents:
10648
diff
changeset
|
10211 if (idx < 0) |
|
715836a72361
patch 8.0.0220: completion of highlight names misses a few values
Christian Brabandt <cb@256bit.org>
parents:
10648
diff
changeset
|
10212 return NULL; |
|
11254
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10213 |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10214 /* Items are never removed from the table, skip the ones that were |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10215 * cleared. */ |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10216 if (skip_cleared && idx < highlight_ga.ga_len && HL_TABLE()[idx].sg_cleared) |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10217 return (char_u *)""; |
|
10660
715836a72361
patch 8.0.0220: completion of highlight names misses a few values
Christian Brabandt <cb@256bit.org>
parents:
10648
diff
changeset
|
10218 |
| 7 | 10219 #ifdef FEAT_CMDL_COMPL |
| 1322 | 10220 if (idx == highlight_ga.ga_len && include_none != 0) |
| 10221 return (char_u *)"none"; | |
| 10222 if (idx == highlight_ga.ga_len + include_none && include_default != 0) | |
| 10223 return (char_u *)"default"; | |
| 10224 if (idx == highlight_ga.ga_len + include_none + include_default | |
| 10225 && include_link != 0) | |
| 7 | 10226 return (char_u *)"link"; |
| 1322 | 10227 if (idx == highlight_ga.ga_len + include_none + include_default + 1 |
| 10228 && include_link != 0) | |
| 7 | 10229 return (char_u *)"clear"; |
| 10230 #endif | |
|
10624
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
10231 if (idx >= highlight_ga.ga_len) |
| 7 | 10232 return NULL; |
| 10233 return HL_TABLE()[idx].sg_name; | |
| 10234 } | |
| 10235 #endif | |
| 10236 | |
| 1322 | 10237 #if defined(FEAT_GUI) || defined(PROTO) |
| 7 | 10238 /* |
| 10239 * Free all the highlight group fonts. | |
| 10240 * Used when quitting for systems which need it. | |
| 10241 */ | |
| 10242 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10243 free_highlight_fonts(void) |
| 7 | 10244 { |
| 10245 int idx; | |
| 10246 | |
| 10247 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 10248 { | |
| 10249 gui_mch_free_font(HL_TABLE()[idx].sg_font); | |
| 10250 HL_TABLE()[idx].sg_font = NOFONT; | |
| 10251 # ifdef FEAT_XFONTSET | |
| 10252 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); | |
| 10253 HL_TABLE()[idx].sg_fontset = NOFONTSET; | |
| 10254 # endif | |
| 10255 } | |
| 10256 | |
| 10257 gui_mch_free_font(gui.norm_font); | |
| 10258 # ifdef FEAT_XFONTSET | |
| 10259 gui_mch_free_fontset(gui.fontset); | |
| 10260 # endif | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2256
diff
changeset
|
10261 # ifndef FEAT_GUI_GTK |
| 7 | 10262 gui_mch_free_font(gui.bold_font); |
| 10263 gui_mch_free_font(gui.ital_font); | |
| 10264 gui_mch_free_font(gui.boldital_font); | |
| 10265 # endif | |
| 10266 } | |
| 10267 #endif | |
| 10268 | |
| 10269 /************************************** | |
| 10270 * End of Highlighting stuff * | |
| 10271 **************************************/ |