Mercurial > vim
annotate src/syntax.c @ 13976:115aed6c544c v8.1.0006
patch 8.1.0006: syn_id2cterm_bg() may be undefined
commit https://github.com/vim/vim/commit/a772baf85afac44bb8eb20ff808637ee6eedec54
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 20 13:35:44 2018 +0200
patch 8.1.0006: syn_id2cterm_bg() may be undefined
Problem: syn_id2cterm_bg() may be undefined. (Axel Bender)
Solution: Adjust #ifdef.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 20 May 2018 13:45:05 +0200 |
| parents | cad480bac9e1 |
| children | 7cac4646c552 |
| 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). | |
|
13333
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
148 * |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
149 * Note that ordering of members is optimized to reduce padding. |
| 7 | 150 */ |
| 151 typedef struct syn_pattern | |
| 152 { | |
| 153 char sp_type; /* see SPTYPE_ defines below */ | |
| 154 char sp_syncing; /* this item used for syncing */ | |
|
13333
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
155 short sp_syn_match_id; /* highlight group ID of pattern */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
156 short sp_off_flags; /* see below */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
157 int sp_offsets[SPO_COUNT]; /* offsets */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
158 int sp_flags; /* see HL_ defines below */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
159 #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
|
160 int sp_cchar; /* conceal substitute character */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
161 #endif |
|
13333
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
162 int sp_ic; /* ignore-case flag for sp_prog */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
163 int sp_sync_idx; /* sync item index (syncing only) */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
164 int sp_line_id; /* ID of last line where tried */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
165 int sp_startcol; /* next match in sp_line_id line */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
166 short *sp_cont_list; /* cont. group IDs, if non-zero */ |
|
b4e7082de11d
patch 8.0.1541: synpat_T is taking too much memory
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
167 short *sp_next_list; /* next group IDs, if non-zero */ |
| 7 | 168 struct sp_syn sp_syn; /* struct passed to in_id_list() */ |
| 169 char_u *sp_pattern; /* regexp to match, pattern */ | |
| 170 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
|
171 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
172 syn_time_T sp_time; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
173 #endif |
| 7 | 174 } synpat_T; |
| 175 | |
| 176 /* The sp_off_flags are computed like this: | |
| 177 * offset from the start of the matched text: (1 << SPO_XX_OFF) | |
| 178 * offset from the end of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT)) | |
| 179 * When both are present, only one is used. | |
| 180 */ | |
| 181 | |
| 182 #define SPTYPE_MATCH 1 /* match keyword with this group ID */ | |
| 183 #define SPTYPE_START 2 /* match a regexp, start of item */ | |
| 184 #define SPTYPE_END 3 /* match a regexp, end of item */ | |
| 185 #define SPTYPE_SKIP 4 /* match a regexp, skip within item */ | |
| 186 | |
| 187 | |
| 188 #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data)) | |
| 189 | |
| 190 #define NONE_IDX -2 /* value of sp_sync_idx for "NONE" */ | |
| 191 | |
| 192 /* | |
| 193 * Flags for b_syn_sync_flags: | |
| 194 */ | |
| 195 #define SF_CCOMMENT 0x01 /* sync on a C-style comment */ | |
| 196 #define SF_MATCH 0x02 /* sync by matching a pattern */ | |
| 197 | |
| 198 #define SYN_STATE_P(ssp) ((bufstate_T *)((ssp)->ga_data)) | |
| 199 | |
| 200 #define MAXKEYWLEN 80 /* maximum length of a keyword */ | |
| 201 | |
| 202 /* | |
| 203 * The attributes of the syntax item that has been recognized. | |
| 204 */ | |
| 205 static int current_attr = 0; /* attr of current syntax word */ | |
| 206 #ifdef FEAT_EVAL | |
| 207 static int current_id = 0; /* ID of current char for syn_get_id() */ | |
| 2020 | 208 static int current_trans_id = 0; /* idem, transparency removed */ |
| 7 | 209 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
210 #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
|
211 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
|
212 static int current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
213 static int current_sub_char = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
214 #endif |
| 7 | 215 |
| 221 | 216 typedef struct syn_cluster_S |
| 7 | 217 { |
| 218 char_u *scl_name; /* syntax cluster name */ | |
| 219 char_u *scl_name_u; /* uppercase of scl_name */ | |
| 220 short *scl_list; /* IDs in this syntax cluster */ | |
| 221 | 221 } syn_cluster_T; |
| 7 | 222 |
| 223 /* | |
| 224 * Methods of combining two clusters | |
| 225 */ | |
| 226 #define CLUSTER_REPLACE 1 /* replace first list with second */ | |
| 227 #define CLUSTER_ADD 2 /* add second list to first */ | |
| 228 #define CLUSTER_SUBTRACT 3 /* subtract second list from first */ | |
| 229 | |
| 221 | 230 #define SYN_CLSTR(buf) ((syn_cluster_T *)((buf)->b_syn_clusters.ga_data)) |
| 7 | 231 |
| 232 /* | |
| 233 * Syntax group IDs have different types: | |
| 2743 | 234 * 0 - 19999 normal syntax groups |
| 235 * 20000 - 20999 ALLBUT indicator (current_syn_inc_tag added) | |
| 236 * 21000 - 21999 TOP indicator (current_syn_inc_tag added) | |
| 237 * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added) | |
| 238 * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID) | |
| 239 */ | |
| 2756 | 240 #define SYNID_ALLBUT MAX_HL_ID /* syntax group ID for contains=ALLBUT */ |
| 2743 | 241 #define SYNID_TOP 21000 /* syntax group ID for contains=TOP */ |
| 242 #define SYNID_CONTAINED 22000 /* syntax group ID for contains=CONTAINED */ | |
| 243 #define SYNID_CLUSTER 23000 /* first syntax group ID for clusters */ | |
| 244 | |
| 245 #define MAX_SYN_INC_TAG 999 /* maximum before the above overflow */ | |
| 246 #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER) | |
| 7 | 247 |
| 248 /* | |
| 249 * Annoying Hack(TM): ":syn include" needs this pointer to pass to | |
| 250 * expand_filename(). Most of the other syntax commands don't need it, so | |
| 251 * instead of passing it to them, we stow it here. | |
| 252 */ | |
| 253 static char_u **syn_cmdlinep; | |
| 254 | |
| 255 /* | |
| 256 * 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
|
257 * files from leaking into ALLBUT lists, we assign a unique ID to the |
| 7 | 258 * rules in each ":syn include"'d file. |
| 259 */ | |
| 260 static int current_syn_inc_tag = 0; | |
| 261 static int running_syn_inc_tag = 0; | |
| 262 | |
| 263 /* | |
| 134 | 264 * In a hashtable item "hi_key" points to "keyword" in a keyentry. |
| 265 * This avoids adding a pointer to the hashtable item. | |
| 266 * KE2HIKEY() converts a var pointer to a hashitem key pointer. | |
| 267 * HIKEY2KE() converts a hashitem key pointer to a var pointer. | |
| 268 * HI2KE() converts a hashitem pointer to a var pointer. | |
| 269 */ | |
| 270 static keyentry_T dumkey; | |
| 271 #define KE2HIKEY(kp) ((kp)->keyword) | |
| 272 #define HIKEY2KE(p) ((keyentry_T *)((p) - (dumkey.keyword - (char_u *)&dumkey))) | |
| 273 #define HI2KE(hi) HIKEY2KE((hi)->hi_key) | |
| 274 | |
| 275 /* | |
| 7 | 276 * To reduce the time spent in keepend(), remember at which level in the state |
| 277 * stack the first item with "keepend" is present. When "-1", there is no | |
| 278 * "keepend" on the stack. | |
| 279 */ | |
| 280 static int keepend_level = -1; | |
| 281 | |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
282 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
|
283 |
| 7 | 284 /* |
| 285 * For the current state we need to remember more than just the idx. | |
| 286 * When si_m_endpos.lnum is 0, the items other than si_idx are unknown. | |
| 287 * (The end positions have the column number of the next char) | |
| 288 */ | |
| 289 typedef struct state_item | |
| 290 { | |
| 1371 | 291 int si_idx; /* index of syntax pattern or |
| 292 KEYWORD_IDX */ | |
| 7 | 293 int si_id; /* highlight group ID for keywords */ |
| 2020 | 294 int si_trans_id; /* idem, transparency removed */ |
| 7 | 295 int si_m_lnum; /* lnum of the match */ |
| 296 int si_m_startcol; /* starting column of the match */ | |
| 297 lpos_T si_m_endpos; /* just after end posn of the match */ | |
| 298 lpos_T si_h_startpos; /* start position of the highlighting */ | |
| 299 lpos_T si_h_endpos; /* end position of the highlighting */ | |
| 300 lpos_T si_eoe_pos; /* end position of end pattern */ | |
| 301 int si_end_idx; /* group ID for end pattern or zero */ | |
| 302 int si_ends; /* if match ends before si_m_endpos */ | |
| 303 int si_attr; /* attributes in this state */ | |
| 304 long si_flags; /* HL_HAS_EOL flag in this state, and | |
| 305 * HL_SKIP* for si_next_list */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
306 #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
|
307 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
|
308 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
|
309 #endif |
| 7 | 310 short *si_cont_list; /* list of contained groups */ |
| 311 short *si_next_list; /* nextgroup IDs after this item ends */ | |
| 312 reg_extmatch_T *si_extmatch; /* \z(...\) matches from start | |
| 313 * pattern */ | |
| 314 } stateitem_T; | |
| 315 | |
| 316 #define KEYWORD_IDX -1 /* value of si_idx for keywords */ | |
| 317 #define ID_LIST_ALL (short *)-1 /* valid of si_cont_list for containing all | |
| 318 but contained groups */ | |
| 319 | |
|
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 #ifdef FEAT_CONCEAL |
| 6698 | 321 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
|
322 #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
|
323 |
| 7 | 324 /* |
| 154 | 325 * Struct to reduce the number of arguments to get_syn_options(), it's used |
| 326 * very often. | |
| 327 */ | |
| 328 typedef struct | |
| 329 { | |
| 1222 | 330 int flags; /* flags for contained and transparent */ |
| 154 | 331 int keyword; /* TRUE for ":syn keyword" */ |
| 332 int *sync_idx; /* syntax item for "grouphere" argument, NULL | |
| 333 if not allowed */ | |
| 334 char has_cont_list; /* TRUE if "cont_list" can be used */ | |
| 335 short *cont_list; /* group IDs for "contains" argument */ | |
| 336 short *cont_in_list; /* group IDs for "containedin" argument */ | |
| 337 short *next_list; /* group IDs for "nextgroup" argument */ | |
| 338 } syn_opt_arg_T; | |
| 339 | |
| 340 /* | |
| 7 | 341 * The next possible match in the current line for any pattern is remembered, |
| 342 * to avoid having to try for a match in each column. | |
| 343 * If next_match_idx == -1, not tried (in this line) yet. | |
| 344 * If next_match_col == MAXCOL, no match found in this line. | |
| 345 * (All end positions have the column of the char after the end) | |
| 346 */ | |
| 347 static int next_match_col; /* column for start of next match */ | |
| 348 static lpos_T next_match_m_endpos; /* position for end of next match */ | |
| 349 static lpos_T next_match_h_startpos; /* pos. for highl. start of next match */ | |
| 350 static lpos_T next_match_h_endpos; /* pos. for highl. end of next match */ | |
| 351 static int next_match_idx; /* index of matched item */ | |
| 352 static long next_match_flags; /* flags for next match */ | |
| 353 static lpos_T next_match_eos_pos; /* end of start pattn (start region) */ | |
| 354 static lpos_T next_match_eoe_pos; /* pos. for end of end pattern */ | |
| 355 static int next_match_end_idx; /* ID of group for end pattn or zero */ | |
| 356 static reg_extmatch_T *next_match_extmatch = NULL; | |
| 357 | |
| 358 /* | |
| 359 * A state stack is an array of integers or stateitem_T, stored in a | |
| 360 * garray_T. A state stack is invalid if it's itemsize entry is zero. | |
| 361 */ | |
| 362 #define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0) | |
| 363 #define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0) | |
| 364 | |
| 365 /* | |
| 366 * The current state (within the line) of the recognition engine. | |
| 367 * When current_state.ga_itemsize is 0 the current state is invalid. | |
| 368 */ | |
| 369 static win_T *syn_win; /* current window for highlighting */ | |
| 370 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
|
371 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
|
372 #ifdef FEAT_RELTIME |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
373 static proftime_T *syn_tm; /* timeout limit */ |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
374 #endif |
| 7 | 375 static linenr_T current_lnum = 0; /* lnum of current state */ |
| 376 static colnr_T current_col = 0; /* column of current state */ | |
| 377 static int current_state_stored = 0; /* TRUE if stored current state | |
| 378 * after setting current_finished */ | |
| 379 static int current_finished = 0; /* current line has been finished */ | |
| 380 static garray_T current_state /* current stack of state_items */ | |
| 381 = {0, 0, 0, 0, NULL}; | |
| 382 static short *current_next_list = NULL; /* when non-zero, nextgroup list */ | |
| 383 static int current_next_flags = 0; /* flags for current_next_list */ | |
| 384 static int current_line_id = 0; /* unique number for current line */ | |
| 385 | |
| 386 #define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx] | |
| 387 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
388 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
|
389 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
|
390 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
|
391 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
|
392 static void syn_start_line(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
393 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
|
394 static void syn_stack_alloc(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
395 static int syn_stack_cleanup(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
396 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
|
397 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
|
398 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
|
399 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
|
400 static void invalidate_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_stack_equal(synstate_T *sp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
402 static void validate_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
403 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
|
404 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
|
405 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
|
406 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
|
407 static void check_state_ends(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
408 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
|
409 static void check_keepend(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
410 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
|
411 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
|
412 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
|
413 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
|
414 static void pop_current_state(void); |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
415 #ifdef FEAT_PROFILE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
416 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
|
417 static void syntime_clear(void); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
418 #ifdef __BORLANDC__ |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
419 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
|
420 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
421 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
|
422 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
423 static void syntime_report(void); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
424 static int syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
425 # define IF_SYN_TIME(p) (p) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
426 #else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
427 # define IF_SYN_TIME(p) NULL |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
428 typedef int syn_time_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
429 #endif |
| 7 | 430 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
431 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
|
432 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
|
433 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
|
434 static void clear_current_state(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
435 |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
436 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
|
437 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
|
438 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
|
439 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
|
440 static char_u *syn_getcurline(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
441 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
|
442 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
|
443 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
|
444 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
|
445 static void syntax_sync_clear(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
446 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
|
447 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
|
448 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
|
449 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
|
450 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
|
451 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
|
452 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
|
453 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
|
454 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
|
455 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
|
456 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
|
457 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
|
458 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
|
459 static void syn_lines_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
460 static void syn_match_msg(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
461 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
|
462 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
|
463 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
|
464 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
|
465 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
|
466 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
|
467 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
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 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
|
476 static void syn_cmd_region(exarg_T *eap, int syncing); |
| 7 | 477 #ifdef __BORLANDC__ |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
478 static int _RTLENTRYF syn_compare_stub(const void *v1, const void *v2); |
| 7 | 479 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
480 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
|
481 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
482 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
|
483 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
|
484 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
|
485 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
|
486 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
|
487 static void init_syn_patterns(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 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
|
492 static void syn_incl_toplevel(int id, int *flagsp); |
| 7 | 493 |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
494 #if defined(FEAT_RELTIME) || defined(PROTO) |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
495 /* |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
496 * Set the timeout used for syntax highlighting. |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
497 * Use NULL to reset, no timeout. |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
498 */ |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
499 void |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
500 syn_set_timeout(proftime_T *tm) |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
501 { |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
502 syn_tm = tm; |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
503 } |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
504 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
505 |
| 7 | 506 /* |
| 507 * Start the syntax recognition for a line. This function is normally called | |
| 508 * from the screen updating, once for each displayed line. | |
| 509 * The buffer is remembered in syn_buf, because get_syntax_attr() doesn't get | |
| 510 * it. Careful: curbuf and curwin are likely to point to another buffer and | |
| 511 * window. | |
| 512 */ | |
| 513 void | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
514 syntax_start(win_T *wp, linenr_T lnum) |
| 7 | 515 { |
| 516 synstate_T *p; | |
| 517 synstate_T *last_valid = NULL; | |
| 518 synstate_T *last_min_valid = NULL; | |
| 1512 | 519 synstate_T *sp, *prev = NULL; |
| 7 | 520 linenr_T parsed_lnum; |
| 521 linenr_T first_stored; | |
| 522 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
|
523 static varnumber_T changedtick = 0; /* remember the last change ID */ |
| 7 | 524 |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
525 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
526 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
|
527 #endif |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
528 |
| 7 | 529 /* |
| 530 * After switching buffers, invalidate current_state. | |
| 26 | 531 * Also do this when a change was made, the current state may be invalid |
| 532 * then. | |
| 7 | 533 */ |
|
8806
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
534 if (syn_block != wp->w_s |
|
8fff73f17ff1
commit https://github.com/vim/vim/commit/b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
535 || 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
|
536 || changedtick != CHANGEDTICK(syn_buf)) |
| 7 | 537 { |
| 538 invalidate_current_state(); | |
| 539 syn_buf = wp->w_buffer; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
540 syn_block = wp->w_s; |
| 7 | 541 } |
|
10952
835604f3c37a
patch 8.0.0365: might free a dict item that wasn't allocated
Christian Brabandt <cb@256bit.org>
parents:
10889
diff
changeset
|
542 changedtick = CHANGEDTICK(syn_buf); |
| 7 | 543 syn_win = wp; |
| 544 | |
| 545 /* | |
| 546 * Allocate syntax stack when needed. | |
| 547 */ | |
| 548 syn_stack_alloc(); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
549 if (syn_block->b_sst_array == NULL) |
| 410 | 550 return; /* out of memory */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
551 syn_block->b_sst_lasttick = display_tick; |
| 7 | 552 |
| 553 /* | |
| 554 * If the state of the end of the previous line is useful, store it. | |
| 555 */ | |
| 556 if (VALID_STATE(¤t_state) | |
| 557 && current_lnum < lnum | |
| 558 && current_lnum < syn_buf->b_ml.ml_line_count) | |
| 559 { | |
| 560 (void)syn_finish_line(FALSE); | |
| 561 if (!current_state_stored) | |
| 562 { | |
| 563 ++current_lnum; | |
| 1512 | 564 (void)store_current_state(); |
| 7 | 565 } |
| 566 | |
| 567 /* | |
| 568 * If the current_lnum is now the same as "lnum", keep the current | |
| 569 * state (this happens very often!). Otherwise invalidate | |
| 570 * current_state and figure it out below. | |
| 571 */ | |
| 572 if (current_lnum != lnum) | |
| 573 invalidate_current_state(); | |
| 574 } | |
| 575 else | |
| 576 invalidate_current_state(); | |
| 577 | |
| 578 /* | |
| 579 * Try to synchronize from a saved state in b_sst_array[]. | |
| 580 * Only do this if lnum is not before and not to far beyond a saved state. | |
| 581 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
582 if (INVALID_STATE(¤t_state) && syn_block->b_sst_array != NULL) |
| 7 | 583 { |
| 584 /* 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
|
585 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next) |
| 7 | 586 { |
| 587 if (p->sst_lnum > lnum) | |
| 588 break; | |
| 589 if (p->sst_lnum <= lnum && p->sst_change_lnum == 0) | |
| 590 { | |
| 591 last_valid = p; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
592 if (p->sst_lnum >= lnum - syn_block->b_syn_sync_minlines) |
| 7 | 593 last_min_valid = p; |
| 594 } | |
| 595 } | |
| 596 if (last_min_valid != NULL) | |
| 597 load_current_state(last_min_valid); | |
| 598 } | |
| 599 | |
| 600 /* | |
| 601 * If "lnum" is before or far beyond a line with a saved state, need to | |
| 602 * re-synchronize. | |
| 603 */ | |
| 604 if (INVALID_STATE(¤t_state)) | |
| 605 { | |
| 606 syn_sync(wp, lnum, last_valid); | |
| 2906 | 607 if (current_lnum == 1) |
| 608 /* First line is always valid, no matter "minlines". */ | |
| 609 first_stored = 1; | |
| 610 else | |
| 611 /* Need to parse "minlines" lines before state can be considered | |
| 612 * valid to store. */ | |
| 613 first_stored = current_lnum + syn_block->b_syn_sync_minlines; | |
| 7 | 614 } |
| 615 else | |
| 616 first_stored = current_lnum; | |
| 617 | |
| 618 /* | |
| 619 * Advance from the sync point or saved state until the current line. | |
| 620 * Save some entries for syncing with later on. | |
| 621 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
622 if (syn_block->b_sst_len <= Rows) |
| 819 | 623 dist = 999999; |
| 624 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
625 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 626 while (current_lnum < lnum) |
| 627 { | |
| 628 syn_start_line(); | |
| 629 (void)syn_finish_line(FALSE); | |
| 630 ++current_lnum; | |
| 631 | |
| 632 /* If we parsed at least "minlines" lines or started at a valid | |
| 633 * state, the current state is considered valid. */ | |
| 634 if (current_lnum >= first_stored) | |
| 635 { | |
| 636 /* Check if the saved state entry is for the current line and is | |
| 637 * equal to the current state. If so, then validate all saved | |
| 638 * states that depended on a change before the parsed line. */ | |
| 639 if (prev == NULL) | |
| 1512 | 640 prev = syn_stack_find_entry(current_lnum - 1); |
| 641 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
642 sp = syn_block->b_sst_first; |
| 7 | 643 else |
| 1512 | 644 sp = prev; |
| 645 while (sp != NULL && sp->sst_lnum < current_lnum) | |
| 646 sp = sp->sst_next; | |
| 7 | 647 if (sp != NULL |
| 648 && sp->sst_lnum == current_lnum | |
| 649 && syn_stack_equal(sp)) | |
| 650 { | |
| 651 parsed_lnum = current_lnum; | |
| 652 prev = sp; | |
| 653 while (sp != NULL && sp->sst_change_lnum <= parsed_lnum) | |
| 654 { | |
| 655 if (sp->sst_lnum <= lnum) | |
| 656 /* valid state before desired line, use this one */ | |
| 657 prev = sp; | |
| 658 else if (sp->sst_change_lnum == 0) | |
| 659 /* past saved states depending on change, break here. */ | |
| 660 break; | |
| 661 sp->sst_change_lnum = 0; | |
| 662 sp = sp->sst_next; | |
| 663 } | |
| 664 load_current_state(prev); | |
| 665 } | |
| 666 /* Store the state at this line when it's the first one, the line | |
| 667 * where we start parsing, or some distance from the previously | |
| 668 * saved state. But only when parsed at least 'minlines'. */ | |
| 669 else if (prev == NULL | |
| 670 || current_lnum == lnum | |
| 671 || current_lnum >= prev->sst_lnum + dist) | |
| 1512 | 672 prev = store_current_state(); |
| 7 | 673 } |
| 674 | |
| 675 /* This can take a long time: break when CTRL-C pressed. The current | |
| 676 * state will be wrong then. */ | |
| 677 line_breakcheck(); | |
| 678 if (got_int) | |
| 679 { | |
| 680 current_lnum = lnum; | |
| 681 break; | |
| 682 } | |
| 683 } | |
| 684 | |
| 685 syn_start_line(); | |
| 686 } | |
| 687 | |
| 688 /* | |
| 689 * We cannot simply discard growarrays full of state_items or buf_states; we | |
| 690 * have to manually release their extmatch pointers first. | |
| 691 */ | |
| 692 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
693 clear_syn_state(synstate_T *p) |
| 7 | 694 { |
| 695 int i; | |
| 696 garray_T *gap; | |
| 697 | |
| 698 if (p->sst_stacksize > SST_FIX_STATES) | |
| 699 { | |
| 700 gap = &(p->sst_union.sst_ga); | |
| 701 for (i = 0; i < gap->ga_len; i++) | |
| 702 unref_extmatch(SYN_STATE_P(gap)[i].bs_extmatch); | |
| 703 ga_clear(gap); | |
| 704 } | |
| 705 else | |
| 706 { | |
| 707 for (i = 0; i < p->sst_stacksize; i++) | |
| 708 unref_extmatch(p->sst_union.sst_stack[i].bs_extmatch); | |
| 709 } | |
| 710 } | |
| 711 | |
| 712 /* | |
| 713 * Cleanup the current_state stack. | |
| 714 */ | |
| 715 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
716 clear_current_state(void) |
| 7 | 717 { |
| 718 int i; | |
| 719 stateitem_T *sip; | |
| 720 | |
| 721 sip = (stateitem_T *)(current_state.ga_data); | |
| 722 for (i = 0; i < current_state.ga_len; i++) | |
| 723 unref_extmatch(sip[i].si_extmatch); | |
| 724 ga_clear(¤t_state); | |
| 725 } | |
| 726 | |
| 727 /* | |
| 728 * Try to find a synchronisation point for line "lnum". | |
| 729 * | |
| 730 * This sets current_lnum and the current state. One of three methods is | |
| 731 * used: | |
| 732 * 1. Search backwards for the end of a C-comment. | |
| 733 * 2. Search backwards for given sync patterns. | |
| 734 * 3. Simply start on a given number of lines above "lnum". | |
| 735 */ | |
| 736 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
737 syn_sync( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
738 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
739 linenr_T start_lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
740 synstate_T *last_valid) |
| 7 | 741 { |
| 742 buf_T *curbuf_save; | |
| 743 win_T *curwin_save; | |
| 744 pos_T cursor_save; | |
| 745 int idx; | |
| 746 linenr_T lnum; | |
| 747 linenr_T end_lnum; | |
| 748 linenr_T break_lnum; | |
| 749 int had_sync_point; | |
| 750 stateitem_T *cur_si; | |
| 751 synpat_T *spp; | |
| 752 char_u *line; | |
| 753 int found_flags = 0; | |
| 754 int found_match_idx = 0; | |
| 755 linenr_T found_current_lnum = 0; | |
| 756 int found_current_col= 0; | |
| 757 lpos_T found_m_endpos; | |
| 442 | 758 colnr_T prev_current_col; |
| 7 | 759 |
| 760 /* | |
| 761 * Clear any current state that might be hanging around. | |
| 762 */ | |
| 763 invalidate_current_state(); | |
| 764 | |
| 765 /* | |
| 766 * Start at least "minlines" back. Default starting point for parsing is | |
| 767 * there. | |
| 768 * Start further back, to avoid that scrolling backwards will result in | |
| 769 * resyncing for every line. Now it resyncs only one out of N lines, | |
| 770 * where N is minlines * 1.5, or minlines * 2 if minlines is small. | |
| 771 * Watch out for overflow when minlines is MAXLNUM. | |
| 772 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
773 if (syn_block->b_syn_sync_minlines > start_lnum) |
| 7 | 774 start_lnum = 1; |
| 775 else | |
| 776 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
777 if (syn_block->b_syn_sync_minlines == 1) |
| 7 | 778 lnum = 1; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
779 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
|
780 lnum = syn_block->b_syn_sync_minlines * 2; |
| 7 | 781 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
782 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
|
783 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
|
784 && lnum > syn_block->b_syn_sync_maxlines) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
785 lnum = syn_block->b_syn_sync_maxlines; |
| 7 | 786 if (lnum >= start_lnum) |
| 787 start_lnum = 1; | |
| 788 else | |
| 789 start_lnum -= lnum; | |
| 790 } | |
| 791 current_lnum = start_lnum; | |
| 792 | |
| 793 /* | |
| 794 * 1. Search backwards for the end of a C-style comment. | |
| 795 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
796 if (syn_block->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 797 { |
| 798 /* Need to make syn_buf the current buffer for a moment, to be able to | |
| 799 * use find_start_comment(). */ | |
| 800 curwin_save = curwin; | |
| 801 curwin = wp; | |
| 802 curbuf_save = curbuf; | |
| 803 curbuf = syn_buf; | |
| 804 | |
| 805 /* | |
| 806 * Skip lines that end in a backslash. | |
| 807 */ | |
| 808 for ( ; start_lnum > 1; --start_lnum) | |
| 809 { | |
| 810 line = ml_get(start_lnum - 1); | |
| 811 if (*line == NUL || *(line + STRLEN(line) - 1) != '\\') | |
| 812 break; | |
| 813 } | |
| 814 current_lnum = start_lnum; | |
| 815 | |
| 816 /* set cursor to start of search */ | |
| 817 cursor_save = wp->w_cursor; | |
| 818 wp->w_cursor.lnum = start_lnum; | |
| 819 wp->w_cursor.col = 0; | |
| 820 | |
| 821 /* | |
| 822 * If the line is inside a comment, need to find the syntax item that | |
| 823 * defines the comment. | |
| 824 * Restrict the search for the end of a comment to b_syn_sync_maxlines. | |
| 825 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
826 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
|
827 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
828 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
|
829 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
|
830 == syn_block->b_syn_sync_id |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
831 && SYN_ITEMS(syn_block)[idx].sp_type == SPTYPE_START) |
| 7 | 832 { |
| 833 validate_current_state(); | |
| 834 if (push_current_state(idx) == OK) | |
| 835 update_si_attr(current_state.ga_len - 1); | |
| 836 break; | |
| 837 } | |
| 838 } | |
| 839 | |
| 840 /* restore cursor and buffer */ | |
| 841 wp->w_cursor = cursor_save; | |
| 842 curwin = curwin_save; | |
| 843 curbuf = curbuf_save; | |
| 844 } | |
| 845 | |
| 846 /* | |
| 847 * 2. Search backwards for given sync patterns. | |
| 848 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
849 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
|
850 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
851 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
|
852 && 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
|
853 break_lnum = start_lnum - syn_block->b_syn_sync_maxlines; |
| 7 | 854 else |
| 855 break_lnum = 0; | |
| 856 | |
| 699 | 857 found_m_endpos.lnum = 0; |
| 858 found_m_endpos.col = 0; | |
| 7 | 859 end_lnum = start_lnum; |
| 860 lnum = start_lnum; | |
| 861 while (--lnum > break_lnum) | |
| 862 { | |
| 863 /* This can take a long time: break when CTRL-C pressed. */ | |
| 864 line_breakcheck(); | |
| 865 if (got_int) | |
| 866 { | |
| 867 invalidate_current_state(); | |
| 868 current_lnum = start_lnum; | |
| 869 break; | |
| 870 } | |
| 871 | |
| 872 /* Check if we have run into a valid saved state stack now. */ | |
| 873 if (last_valid != NULL && lnum == last_valid->sst_lnum) | |
| 874 { | |
| 875 load_current_state(last_valid); | |
| 876 break; | |
| 877 } | |
| 878 | |
| 879 /* | |
| 880 * Check if the previous line has the line-continuation pattern. | |
| 881 */ | |
| 882 if (lnum > 1 && syn_match_linecont(lnum - 1)) | |
| 883 continue; | |
| 884 | |
| 885 /* | |
| 886 * Start with nothing on the state stack | |
| 887 */ | |
| 888 validate_current_state(); | |
| 889 | |
| 890 for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum) | |
| 891 { | |
| 892 syn_start_line(); | |
| 893 for (;;) | |
| 894 { | |
| 895 had_sync_point = syn_finish_line(TRUE); | |
| 896 /* | |
| 897 * When a sync point has been found, remember where, and | |
| 898 * continue to look for another one, further on in the line. | |
| 899 */ | |
| 900 if (had_sync_point && current_state.ga_len) | |
| 901 { | |
| 902 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 903 if (cur_si->si_m_endpos.lnum > start_lnum) | |
| 904 { | |
| 905 /* ignore match that goes to after where started */ | |
| 906 current_lnum = end_lnum; | |
| 907 break; | |
| 908 } | |
| 1371 | 909 if (cur_si->si_idx < 0) |
| 910 { | |
| 911 /* Cannot happen? */ | |
| 912 found_flags = 0; | |
| 913 found_match_idx = KEYWORD_IDX; | |
| 914 } | |
| 915 else | |
| 916 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
917 spp = &(SYN_ITEMS(syn_block)[cur_si->si_idx]); |
| 1371 | 918 found_flags = spp->sp_flags; |
| 919 found_match_idx = spp->sp_sync_idx; | |
| 920 } | |
| 7 | 921 found_current_lnum = current_lnum; |
| 922 found_current_col = current_col; | |
| 923 found_m_endpos = cur_si->si_m_endpos; | |
| 924 /* | |
| 925 * Continue after the match (be aware of a zero-length | |
| 926 * match). | |
| 927 */ | |
| 928 if (found_m_endpos.lnum > current_lnum) | |
| 929 { | |
| 930 current_lnum = found_m_endpos.lnum; | |
| 931 current_col = found_m_endpos.col; | |
| 932 if (current_lnum >= end_lnum) | |
| 933 break; | |
| 934 } | |
| 935 else if (found_m_endpos.col > current_col) | |
| 936 current_col = found_m_endpos.col; | |
| 937 else | |
| 938 ++current_col; | |
| 939 | |
| 940 /* syn_current_attr() will have skipped the check for | |
| 442 | 941 * an item that ends here, need to do that now. Be |
| 942 * careful not to go past the NUL. */ | |
| 943 prev_current_col = current_col; | |
| 944 if (syn_getcurline()[current_col] != NUL) | |
| 945 ++current_col; | |
| 7 | 946 check_state_ends(); |
| 442 | 947 current_col = prev_current_col; |
| 7 | 948 } |
| 949 else | |
| 950 break; | |
| 951 } | |
| 952 } | |
| 953 | |
| 954 /* | |
| 955 * If a sync point was encountered, break here. | |
| 956 */ | |
| 957 if (found_flags) | |
| 958 { | |
| 959 /* | |
| 960 * Put the item that was specified by the sync point on the | |
| 961 * state stack. If there was no item specified, make the | |
| 962 * state stack empty. | |
| 963 */ | |
| 964 clear_current_state(); | |
| 965 if (found_match_idx >= 0 | |
| 966 && push_current_state(found_match_idx) == OK) | |
| 967 update_si_attr(current_state.ga_len - 1); | |
| 968 | |
| 969 /* | |
| 970 * When using "grouphere", continue from the sync point | |
| 971 * match, until the end of the line. Parsing starts at | |
| 972 * the next line. | |
| 973 * For "groupthere" the parsing starts at start_lnum. | |
| 974 */ | |
| 975 if (found_flags & HL_SYNC_HERE) | |
| 976 { | |
| 977 if (current_state.ga_len) | |
| 978 { | |
| 979 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 980 cur_si->si_h_startpos.lnum = found_current_lnum; | |
| 981 cur_si->si_h_startpos.col = found_current_col; | |
| 982 update_si_end(cur_si, (int)current_col, TRUE); | |
| 983 check_keepend(); | |
| 984 } | |
| 985 current_col = found_m_endpos.col; | |
| 986 current_lnum = found_m_endpos.lnum; | |
| 987 (void)syn_finish_line(FALSE); | |
| 988 ++current_lnum; | |
| 989 } | |
| 990 else | |
| 991 current_lnum = start_lnum; | |
| 992 | |
| 993 break; | |
| 994 } | |
| 995 | |
| 996 end_lnum = lnum; | |
| 997 invalidate_current_state(); | |
| 998 } | |
| 999 | |
| 1000 /* Ran into start of the file or exceeded maximum number of lines */ | |
| 1001 if (lnum <= break_lnum) | |
| 1002 { | |
| 1003 invalidate_current_state(); | |
| 1004 current_lnum = break_lnum + 1; | |
| 1005 } | |
| 1006 } | |
| 1007 | |
| 1008 validate_current_state(); | |
| 1009 } | |
| 1010 | |
|
7687
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 save_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_block->b_syn_isk != empty_option) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1015 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1016 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
|
1017 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
|
1018 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1019 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1020 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1021 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1022 static void |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1023 restore_chartab(char_u *chartab) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1024 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1025 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
|
1026 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
|
1027 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1028 |
| 7 | 1029 /* |
| 1030 * Return TRUE if the line-continuation pattern matches in line "lnum". | |
| 1031 */ | |
| 1032 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1033 syn_match_linecont(linenr_T lnum) |
| 7 | 1034 { |
| 1035 regmmatch_T regmatch; | |
| 6375 | 1036 int r; |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1037 char_u buf_chartab[32]; /* chartab array for syn iskyeyword */ |
| 7 | 1038 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1039 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
|
1040 { |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1041 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1042 save_chartab(buf_chartab); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1043 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
|
1044 regmatch.regprog = syn_block->b_syn_linecont_prog; |
| 6375 | 1045 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
|
1046 IF_SYN_TIME(&syn_block->b_syn_linecont_time)); |
| 6375 | 1047 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
|
1048 restore_chartab(buf_chartab); |
| 6375 | 1049 return r; |
| 7 | 1050 } |
| 1051 return FALSE; | |
| 1052 } | |
| 1053 | |
| 1054 /* | |
| 1055 * Prepare the current state for the start of a line. | |
| 1056 */ | |
| 1057 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1058 syn_start_line(void) |
| 7 | 1059 { |
| 1060 current_finished = FALSE; | |
| 1061 current_col = 0; | |
| 1062 | |
| 1063 /* | |
| 1064 * Need to update the end of a start/skip/end that continues from the | |
| 1065 * previous line and regions that have "keepend". | |
| 1066 */ | |
| 1067 if (current_state.ga_len > 0) | |
| 2863 | 1068 { |
| 7 | 1069 syn_update_ends(TRUE); |
| 2863 | 1070 check_state_ends(); |
| 1071 } | |
| 7 | 1072 |
| 1073 next_match_idx = -1; | |
| 1074 ++current_line_id; | |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
1075 #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
|
1076 next_seqnr = 1; |
|
11581
2298fda621d3
patch 8.0.0673: build failure without conceal feature
Christian Brabandt <cb@256bit.org>
parents:
11579
diff
changeset
|
1077 #endif |
| 7 | 1078 } |
| 1079 | |
| 1080 /* | |
| 1081 * Check for items in the stack that need their end updated. | |
| 1082 * When "startofline" is TRUE the last item is always updated. | |
| 1083 * When "startofline" is FALSE the item with "keepend" is forcefully updated. | |
| 1084 */ | |
| 1085 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1086 syn_update_ends(int startofline) |
| 7 | 1087 { |
| 1088 stateitem_T *cur_si; | |
| 1089 int i; | |
| 991 | 1090 int seen_keepend; |
| 7 | 1091 |
| 1092 if (startofline) | |
| 1093 { | |
| 1094 /* Check for a match carried over from a previous line with a | |
| 1095 * contained region. The match ends as soon as the region ends. */ | |
| 1096 for (i = 0; i < current_state.ga_len; ++i) | |
| 1097 { | |
| 1098 cur_si = &CUR_STATE(i); | |
| 1099 if (cur_si->si_idx >= 0 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1100 && (SYN_ITEMS(syn_block)[cur_si->si_idx]).sp_type |
| 7 | 1101 == SPTYPE_MATCH |
| 1102 && cur_si->si_m_endpos.lnum < current_lnum) | |
| 1103 { | |
| 1104 cur_si->si_flags |= HL_MATCHCONT; | |
| 1105 cur_si->si_m_endpos.lnum = 0; | |
| 1106 cur_si->si_m_endpos.col = 0; | |
| 1107 cur_si->si_h_endpos = cur_si->si_m_endpos; | |
| 1108 cur_si->si_ends = TRUE; | |
| 1109 } | |
| 1110 } | |
| 1111 } | |
| 1112 | |
| 1113 /* | |
| 1114 * Need to update the end of a start/skip/end that continues from the | |
| 1115 * previous line. And regions that have "keepend", because they may | |
| 991 | 1116 * influence contained items. If we've just removed "extend" |
| 1117 * (startofline == 0) then we should update ends of normal regions | |
| 1118 * contained inside "keepend" because "extend" could have extended | |
| 1119 * these "keepend" regions as well as contained normal regions. | |
| 7 | 1120 * Then check for items ending in column 0. |
| 1121 */ | |
| 1122 i = current_state.ga_len - 1; | |
| 1123 if (keepend_level >= 0) | |
| 1124 for ( ; i > keepend_level; --i) | |
| 1125 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 1126 break; | |
| 991 | 1127 |
| 1128 seen_keepend = FALSE; | |
| 7 | 1129 for ( ; i < current_state.ga_len; ++i) |
| 1130 { | |
| 1131 cur_si = &CUR_STATE(i); | |
| 1132 if ((cur_si->si_flags & HL_KEEPEND) | |
| 991 | 1133 || (seen_keepend && !startofline) |
| 7 | 1134 || (i == current_state.ga_len - 1 && startofline)) |
| 1135 { | |
| 1136 cur_si->si_h_startpos.col = 0; /* start highl. in col 0 */ | |
| 1137 cur_si->si_h_startpos.lnum = current_lnum; | |
| 1138 | |
| 1139 if (!(cur_si->si_flags & HL_MATCHCONT)) | |
| 1140 update_si_end(cur_si, (int)current_col, !startofline); | |
| 991 | 1141 |
| 1142 if (!startofline && (cur_si->si_flags & HL_KEEPEND)) | |
| 1143 seen_keepend = TRUE; | |
| 7 | 1144 } |
| 1145 } | |
| 1146 check_keepend(); | |
| 1147 } | |
| 1148 | |
| 1149 /**************************************** | |
| 1150 * Handling of the state stack cache. | |
| 1151 */ | |
| 1152 | |
| 1153 /* | |
| 1154 * EXPLANATION OF THE SYNTAX STATE STACK CACHE | |
| 1155 * | |
| 1156 * To speed up syntax highlighting, the state stack for the start of some | |
| 1157 * lines is cached. These entries can be used to start parsing at that point. | |
| 1158 * | |
| 1159 * The stack is kept in b_sst_array[] for each buffer. There is a list of | |
| 1160 * valid entries. b_sst_first points to the first one, then follow sst_next. | |
| 1161 * The entries are sorted on line number. The first entry is often for line 2 | |
| 1162 * (line 1 always starts with an empty stack). | |
| 1163 * There is also a list for free entries. This construction is used to avoid | |
| 1164 * having to allocate and free memory blocks too often. | |
| 1165 * | |
| 1166 * When making changes to the buffer, this is logged in b_mod_*. When calling | |
| 1167 * update_screen() to update the display, it will call | |
| 1168 * syn_stack_apply_changes() for each displayed buffer to adjust the cached | |
| 1169 * entries. The entries which are inside the changed area are removed, | |
| 1170 * because they must be recomputed. Entries below the changed have their line | |
| 1171 * number adjusted for deleted/inserted lines, and have their sst_change_lnum | |
| 1172 * set to indicate that a check must be made if the changed lines would change | |
| 1173 * the cached entry. | |
| 1174 * | |
| 1175 * When later displaying lines, an entry is stored for each line. Displayed | |
| 1176 * lines are likely to be displayed again, in which case the state at the | |
| 1177 * start of the line is needed. | |
| 1178 * For not displayed lines, an entry is stored for every so many lines. These | |
| 1179 * entries will be used e.g., when scrolling backwards. The distance between | |
| 1180 * entries depends on the number of lines in the buffer. For small buffers | |
| 1181 * the distance is fixed at SST_DIST, for large buffers there is a fixed | |
| 1182 * number of entries SST_MAX_ENTRIES, and the distance is computed. | |
| 1183 */ | |
| 1184 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1185 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1186 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
|
1187 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1188 synstate_T *p; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1189 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1190 if (block->b_sst_array != NULL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1191 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1192 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
|
1193 clear_syn_state(p); |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
1194 VIM_CLEAR(block->b_sst_array); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1195 block->b_sst_len = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1196 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1197 } |
| 7 | 1198 /* |
| 1199 * Free b_sst_array[] for buffer "buf". | |
| 1200 * Used when syntax items changed to force resyncing everywhere. | |
| 1201 */ | |
| 1202 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1203 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
|
1204 { |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1205 #ifdef FEAT_FOLDING |
| 7 | 1206 win_T *wp; |
|
11073
d2178a6cc9f3
patch 8.0.0425: build errors when building without folding
Christian Brabandt <cb@256bit.org>
parents:
10952
diff
changeset
|
1207 #endif |
| 7 | 1208 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1209 syn_stack_free_block(block); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1210 |
| 7 | 1211 #ifdef FEAT_FOLDING |
| 1212 /* When using "syntax" fold method, must update all folds. */ | |
| 1213 FOR_ALL_WINDOWS(wp) | |
| 1214 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1215 if (wp->w_s == block && foldmethodIsSyntax(wp)) |
| 7 | 1216 foldUpdateAll(wp); |
| 1217 } | |
| 1218 #endif | |
| 1219 } | |
| 1220 | |
| 1221 /* | |
| 1222 * Allocate the syntax state stack for syn_buf when needed. | |
| 1223 * If the number of entries in b_sst_array[] is much too big or a bit too | |
| 1224 * small, reallocate it. | |
| 1225 * Also used to allocate b_sst_array[] for the first time. | |
| 1226 */ | |
| 1227 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1228 syn_stack_alloc(void) |
| 7 | 1229 { |
| 1230 long len; | |
| 1231 synstate_T *to, *from; | |
| 1232 synstate_T *sstp; | |
| 1233 | |
| 1234 len = syn_buf->b_ml.ml_line_count / SST_DIST + Rows * 2; | |
| 1235 if (len < SST_MIN_ENTRIES) | |
| 1236 len = SST_MIN_ENTRIES; | |
| 1237 else if (len > SST_MAX_ENTRIES) | |
| 1238 len = SST_MAX_ENTRIES; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1239 if (syn_block->b_sst_len > len * 2 || syn_block->b_sst_len < len) |
| 7 | 1240 { |
| 1241 /* Allocate 50% too much, to avoid reallocating too often. */ | |
| 1242 len = syn_buf->b_ml.ml_line_count; | |
| 1243 len = (len + len / 2) / SST_DIST + Rows * 2; | |
| 1244 if (len < SST_MIN_ENTRIES) | |
| 1245 len = SST_MIN_ENTRIES; | |
| 1246 else if (len > SST_MAX_ENTRIES) | |
| 1247 len = SST_MAX_ENTRIES; | |
| 1248 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1249 if (syn_block->b_sst_array != NULL) |
| 7 | 1250 { |
| 1251 /* When shrinking the array, cleanup the existing stack. | |
| 1252 * 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
|
1253 while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len |
| 7 | 1254 && syn_stack_cleanup()) |
| 1255 ; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1256 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
|
1257 len = syn_block->b_sst_len - syn_block->b_sst_freecount + 2; |
| 7 | 1258 } |
| 1259 | |
| 1260 sstp = (synstate_T *)alloc_clear((unsigned)(len * sizeof(synstate_T))); | |
| 1261 if (sstp == NULL) /* out of memory! */ | |
| 1262 return; | |
| 1263 | |
| 1264 to = sstp - 1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1265 if (syn_block->b_sst_array != NULL) |
| 7 | 1266 { |
| 1267 /* 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
|
1268 for (from = syn_block->b_sst_first; from != NULL; |
| 7 | 1269 from = from->sst_next) |
| 1270 { | |
| 1271 ++to; | |
| 1272 *to = *from; | |
| 1273 to->sst_next = to + 1; | |
| 1274 } | |
| 1275 } | |
| 1276 if (to != sstp - 1) | |
| 1277 { | |
| 1278 to->sst_next = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1279 syn_block->b_sst_first = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1280 syn_block->b_sst_freecount = len - (int)(to - sstp) - 1; |
| 7 | 1281 } |
| 1282 else | |
| 1283 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1284 syn_block->b_sst_first = NULL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1285 syn_block->b_sst_freecount = len; |
| 7 | 1286 } |
| 1287 | |
| 1288 /* Create the list of free entries. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1289 syn_block->b_sst_firstfree = to + 1; |
| 7 | 1290 while (++to < sstp + len) |
| 1291 to->sst_next = to + 1; | |
| 1292 (sstp + len - 1)->sst_next = NULL; | |
| 1293 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1294 vim_free(syn_block->b_sst_array); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1295 syn_block->b_sst_array = sstp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1296 syn_block->b_sst_len = len; |
| 7 | 1297 } |
| 1298 } | |
| 1299 | |
| 1300 /* | |
| 1301 * Check for changes in a buffer to affect stored syntax states. Uses the | |
| 1302 * b_mod_* fields. | |
| 1303 * Called from update_screen(), before screen is being updated, once for each | |
| 1304 * displayed buffer. | |
| 1305 */ | |
| 1306 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1307 syn_stack_apply_changes(buf_T *buf) |
| 7 | 1308 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1309 win_T *wp; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1310 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1311 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
|
1312 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1313 FOR_ALL_WINDOWS(wp) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1314 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1315 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
|
1316 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
|
1317 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1318 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1319 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1320 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1321 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
|
1322 { |
| 7 | 1323 synstate_T *p, *prev, *np; |
| 1324 linenr_T n; | |
| 1325 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1326 if (block->b_sst_array == NULL) /* nothing to do */ |
| 7 | 1327 return; |
| 1328 | |
| 1329 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1330 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
|
1331 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1332 if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top) |
| 7 | 1333 { |
| 1334 n = p->sst_lnum + buf->b_mod_xlines; | |
| 1335 if (n <= buf->b_mod_bot) | |
| 1336 { | |
| 1337 /* this state is inside the changed area, remove it */ | |
| 1338 np = p->sst_next; | |
| 1339 if (prev == NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1340 block->b_sst_first = np; |
| 7 | 1341 else |
| 1342 prev->sst_next = np; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1343 syn_stack_free_entry(block, p); |
| 7 | 1344 p = np; |
| 1345 continue; | |
| 1346 } | |
| 1347 /* This state is below the changed area. Remember the line | |
| 1348 * that needs to be parsed before this entry can be made valid | |
| 1349 * again. */ | |
| 1350 if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top) | |
| 1351 { | |
| 1352 if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top) | |
| 1353 p->sst_change_lnum += buf->b_mod_xlines; | |
| 1354 else | |
| 1355 p->sst_change_lnum = buf->b_mod_top; | |
| 1356 } | |
| 1357 if (p->sst_change_lnum == 0 | |
| 1358 || p->sst_change_lnum < buf->b_mod_bot) | |
| 1359 p->sst_change_lnum = buf->b_mod_bot; | |
| 1360 | |
| 1361 p->sst_lnum = n; | |
| 1362 } | |
| 1363 prev = p; | |
| 1364 p = p->sst_next; | |
| 1365 } | |
| 1366 } | |
| 1367 | |
| 1368 /* | |
| 1369 * Reduce the number of entries in the state stack for syn_buf. | |
| 1370 * Returns TRUE if at least one entry was freed. | |
| 1371 */ | |
| 1372 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1373 syn_stack_cleanup(void) |
| 7 | 1374 { |
| 1375 synstate_T *p, *prev; | |
| 1376 disptick_T tick; | |
| 1377 int above; | |
| 1378 int dist; | |
| 1379 int retval = FALSE; | |
| 1380 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1381 if (syn_block->b_sst_array == NULL || syn_block->b_sst_first == NULL) |
| 7 | 1382 return retval; |
| 1383 | |
| 1384 /* 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
|
1385 if (syn_block->b_sst_len <= Rows) |
| 819 | 1386 dist = 999999; |
| 1387 else | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1388 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1; |
| 7 | 1389 |
| 1390 /* | |
| 2020 | 1391 * Go through the list to find the "tick" for the oldest entry that can |
| 7 | 1392 * be removed. Set "above" when the "tick" for the oldest entry is above |
| 1393 * "b_sst_lasttick" (the display tick wraps around). | |
| 1394 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1395 tick = syn_block->b_sst_lasttick; |
| 7 | 1396 above = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1397 prev = syn_block->b_sst_first; |
| 7 | 1398 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1399 { | |
| 1400 if (prev->sst_lnum + dist > p->sst_lnum) | |
| 1401 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1402 if (p->sst_tick > syn_block->b_sst_lasttick) |
| 7 | 1403 { |
| 1404 if (!above || p->sst_tick < tick) | |
| 1405 tick = p->sst_tick; | |
| 1406 above = TRUE; | |
| 1407 } | |
| 1408 else if (!above && p->sst_tick < tick) | |
| 1409 tick = p->sst_tick; | |
| 1410 } | |
| 1411 } | |
| 1412 | |
| 1413 /* | |
| 1414 * Go through the list to make the entries for the oldest tick at an | |
| 1415 * interval of several lines. | |
| 1416 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1417 prev = syn_block->b_sst_first; |
| 7 | 1418 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next) |
| 1419 { | |
| 1420 if (p->sst_tick == tick && prev->sst_lnum + dist > p->sst_lnum) | |
| 1421 { | |
| 1422 /* Move this entry from used list to free list */ | |
| 1423 prev->sst_next = p->sst_next; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1424 syn_stack_free_entry(syn_block, p); |
| 7 | 1425 p = prev; |
| 1426 retval = TRUE; | |
| 1427 } | |
| 1428 } | |
| 1429 return retval; | |
| 1430 } | |
| 1431 | |
| 1432 /* | |
| 1433 * Free the allocated memory for a syn_state item. | |
| 1434 * Move the entry into the free list. | |
| 1435 */ | |
| 1436 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1437 syn_stack_free_entry(synblock_T *block, synstate_T *p) |
| 7 | 1438 { |
| 1439 clear_syn_state(p); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1440 p->sst_next = block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1441 block->b_sst_firstfree = p; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1442 ++block->b_sst_freecount; |
| 7 | 1443 } |
| 1444 | |
| 1445 /* | |
| 1446 * Find an entry in the list of state stacks at or before "lnum". | |
| 1447 * Returns NULL when there is no entry or the first entry is after "lnum". | |
| 1448 */ | |
| 1449 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1450 syn_stack_find_entry(linenr_T lnum) |
| 7 | 1451 { |
| 1452 synstate_T *p, *prev; | |
| 1453 | |
| 1454 prev = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1455 for (p = syn_block->b_sst_first; p != NULL; prev = p, p = p->sst_next) |
| 7 | 1456 { |
| 1457 if (p->sst_lnum == lnum) | |
| 1458 return p; | |
| 1459 if (p->sst_lnum > lnum) | |
| 1460 break; | |
| 1461 } | |
| 1462 return prev; | |
| 1463 } | |
| 1464 | |
| 1465 /* | |
| 1466 * Try saving the current state in b_sst_array[]. | |
| 1467 * The current state must be valid for the start of the current_lnum line! | |
| 1468 */ | |
| 1469 static synstate_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1470 store_current_state(void) |
| 7 | 1471 { |
| 1472 int i; | |
| 1473 synstate_T *p; | |
| 1474 bufstate_T *bp; | |
| 1475 stateitem_T *cur_si; | |
| 1512 | 1476 synstate_T *sp = syn_stack_find_entry(current_lnum); |
| 7 | 1477 |
| 1478 /* | |
| 1479 * If the current state contains a start or end pattern that continues | |
| 1480 * from the previous line, we can't use it. Don't store it then. | |
| 1481 */ | |
| 1482 for (i = current_state.ga_len - 1; i >= 0; --i) | |
| 1483 { | |
| 1484 cur_si = &CUR_STATE(i); | |
| 1485 if (cur_si->si_h_startpos.lnum >= current_lnum | |
| 1486 || cur_si->si_m_endpos.lnum >= current_lnum | |
| 1487 || cur_si->si_h_endpos.lnum >= current_lnum | |
| 1488 || (cur_si->si_end_idx | |
| 1489 && cur_si->si_eoe_pos.lnum >= current_lnum)) | |
| 1490 break; | |
| 1491 } | |
| 1492 if (i >= 0) | |
| 1493 { | |
| 1494 if (sp != NULL) | |
| 1495 { | |
| 1496 /* 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
|
1497 if (syn_block->b_sst_first == sp) |
| 7 | 1498 /* it's the first entry */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1499 syn_block->b_sst_first = sp->sst_next; |
| 7 | 1500 else |
| 1501 { | |
| 1502 /* 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
|
1503 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next) |
| 7 | 1504 if (p->sst_next == sp) |
| 1505 break; | |
| 840 | 1506 if (p != NULL) /* just in case */ |
| 1507 p->sst_next = sp->sst_next; | |
| 7 | 1508 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1509 syn_stack_free_entry(syn_block, sp); |
| 7 | 1510 sp = NULL; |
| 1511 } | |
| 1512 } | |
| 1513 else if (sp == NULL || sp->sst_lnum != current_lnum) | |
| 1514 { | |
| 1515 /* | |
| 1516 * Add a new entry | |
| 1517 */ | |
| 1518 /* 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
|
1519 if (syn_block->b_sst_freecount == 0) |
| 7 | 1520 { |
| 1521 (void)syn_stack_cleanup(); | |
| 1522 /* "sp" may have been moved to the freelist now */ | |
| 1523 sp = syn_stack_find_entry(current_lnum); | |
| 1524 } | |
| 1525 /* 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
|
1526 if (syn_block->b_sst_freecount == 0) |
| 7 | 1527 sp = NULL; |
| 1528 else | |
| 1529 { | |
| 1530 /* Take the first item from the free list and put it in the used | |
| 1531 * list, after *sp */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1532 p = syn_block->b_sst_firstfree; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1533 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
|
1534 --syn_block->b_sst_freecount; |
| 7 | 1535 if (sp == NULL) |
| 1536 { | |
| 1537 /* Insert in front of the list */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1538 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
|
1539 syn_block->b_sst_first = p; |
| 7 | 1540 } |
| 1541 else | |
| 1542 { | |
| 1543 /* insert in list after *sp */ | |
| 1544 p->sst_next = sp->sst_next; | |
| 1545 sp->sst_next = p; | |
| 1546 } | |
| 1547 sp = p; | |
| 1548 sp->sst_stacksize = 0; | |
| 1549 sp->sst_lnum = current_lnum; | |
| 1550 } | |
| 1551 } | |
| 1552 if (sp != NULL) | |
| 1553 { | |
| 1554 /* When overwriting an existing state stack, clear it first */ | |
| 1555 clear_syn_state(sp); | |
| 1556 sp->sst_stacksize = current_state.ga_len; | |
| 1557 if (current_state.ga_len > SST_FIX_STATES) | |
| 1558 { | |
| 1559 /* Need to clear it, might be something remaining from when the | |
| 1560 * length was less than SST_FIX_STATES. */ | |
| 1561 ga_init2(&sp->sst_union.sst_ga, (int)sizeof(bufstate_T), 1); | |
| 1562 if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL) | |
| 1563 sp->sst_stacksize = 0; | |
| 1564 else | |
| 1565 sp->sst_union.sst_ga.ga_len = current_state.ga_len; | |
| 1566 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
| 1567 } | |
| 1568 else | |
| 1569 bp = sp->sst_union.sst_stack; | |
| 1570 for (i = 0; i < sp->sst_stacksize; ++i) | |
| 1571 { | |
| 1572 bp[i].bs_idx = CUR_STATE(i).si_idx; | |
| 1573 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
|
1574 #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
|
1575 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
|
1576 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
|
1577 #endif |
| 7 | 1578 bp[i].bs_extmatch = ref_extmatch(CUR_STATE(i).si_extmatch); |
| 1579 } | |
| 1580 sp->sst_next_flags = current_next_flags; | |
| 1581 sp->sst_next_list = current_next_list; | |
| 1582 sp->sst_tick = display_tick; | |
| 1583 sp->sst_change_lnum = 0; | |
| 1584 } | |
| 1585 current_state_stored = TRUE; | |
| 1586 return sp; | |
| 1587 } | |
| 1588 | |
| 1589 /* | |
| 1590 * Copy a state stack from "from" in b_sst_array[] to current_state; | |
| 1591 */ | |
| 1592 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1593 load_current_state(synstate_T *from) |
| 7 | 1594 { |
| 1595 int i; | |
| 1596 bufstate_T *bp; | |
| 1597 | |
| 1598 clear_current_state(); | |
| 1599 validate_current_state(); | |
| 1600 keepend_level = -1; | |
| 1601 if (from->sst_stacksize | |
| 1602 && ga_grow(¤t_state, from->sst_stacksize) != FAIL) | |
| 1603 { | |
| 1604 if (from->sst_stacksize > SST_FIX_STATES) | |
| 1605 bp = SYN_STATE_P(&(from->sst_union.sst_ga)); | |
| 1606 else | |
| 1607 bp = from->sst_union.sst_stack; | |
| 1608 for (i = 0; i < from->sst_stacksize; ++i) | |
| 1609 { | |
| 1610 CUR_STATE(i).si_idx = bp[i].bs_idx; | |
| 1611 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
|
1612 #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
|
1613 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
|
1614 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
|
1615 #endif |
| 7 | 1616 CUR_STATE(i).si_extmatch = ref_extmatch(bp[i].bs_extmatch); |
| 1617 if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND)) | |
| 1618 keepend_level = i; | |
| 1619 CUR_STATE(i).si_ends = FALSE; | |
| 1620 CUR_STATE(i).si_m_lnum = 0; | |
| 1621 if (CUR_STATE(i).si_idx >= 0) | |
| 1622 CUR_STATE(i).si_next_list = | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1623 (SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_next_list; |
| 7 | 1624 else |
| 1625 CUR_STATE(i).si_next_list = NULL; | |
| 1626 update_si_attr(i); | |
| 1627 } | |
| 1628 current_state.ga_len = from->sst_stacksize; | |
| 1629 } | |
| 1630 current_next_list = from->sst_next_list; | |
| 1631 current_next_flags = from->sst_next_flags; | |
| 1632 current_lnum = from->sst_lnum; | |
| 1633 } | |
| 1634 | |
| 1635 /* | |
| 1636 * Compare saved state stack "*sp" with the current state. | |
| 1637 * Return TRUE when they are equal. | |
| 1638 */ | |
| 1639 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1640 syn_stack_equal(synstate_T *sp) |
| 7 | 1641 { |
| 1642 int i, j; | |
| 1643 bufstate_T *bp; | |
| 1644 reg_extmatch_T *six, *bsx; | |
| 1645 | |
| 1646 /* First a quick check if the stacks have the same size end nextlist. */ | |
| 1647 if (sp->sst_stacksize == current_state.ga_len | |
| 1648 && sp->sst_next_list == current_next_list) | |
| 1649 { | |
| 1650 /* Need to compare all states on both stacks. */ | |
| 1651 if (sp->sst_stacksize > SST_FIX_STATES) | |
| 1652 bp = SYN_STATE_P(&(sp->sst_union.sst_ga)); | |
| 1653 else | |
| 1654 bp = sp->sst_union.sst_stack; | |
| 1655 | |
| 1656 for (i = current_state.ga_len; --i >= 0; ) | |
| 1657 { | |
| 1658 /* If the item has another index the state is different. */ | |
| 1659 if (bp[i].bs_idx != CUR_STATE(i).si_idx) | |
| 1660 break; | |
| 1661 if (bp[i].bs_extmatch != CUR_STATE(i).si_extmatch) | |
| 1662 { | |
| 1663 /* When the extmatch pointers are different, the strings in | |
| 1664 * them can still be the same. Check if the extmatch | |
| 1665 * references are equal. */ | |
| 1666 bsx = bp[i].bs_extmatch; | |
| 1667 six = CUR_STATE(i).si_extmatch; | |
| 1668 /* If one of the extmatch pointers is NULL the states are | |
| 1669 * different. */ | |
| 1670 if (bsx == NULL || six == NULL) | |
| 1671 break; | |
| 1672 for (j = 0; j < NSUBEXP; ++j) | |
| 1673 { | |
| 1674 /* Check each referenced match string. They must all be | |
| 1675 * equal. */ | |
| 1676 if (bsx->matches[j] != six->matches[j]) | |
| 1677 { | |
| 1678 /* If the pointer is different it can still be the | |
| 1679 * same text. Compare the strings, ignore case when | |
| 1680 * the start item has the sp_ic flag set. */ | |
| 1681 if (bsx->matches[j] == NULL | |
| 1682 || six->matches[j] == NULL) | |
| 1683 break; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1684 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic |
| 7 | 1685 ? MB_STRICMP(bsx->matches[j], |
| 1686 six->matches[j]) != 0 | |
| 1687 : STRCMP(bsx->matches[j], six->matches[j]) != 0) | |
| 1688 break; | |
| 1689 } | |
| 1690 } | |
| 1691 if (j != NSUBEXP) | |
| 1692 break; | |
| 1693 } | |
| 1694 } | |
| 1695 if (i < 0) | |
| 1696 return TRUE; | |
| 1697 } | |
| 1698 return FALSE; | |
| 1699 } | |
| 1700 | |
| 1701 /* | |
| 1702 * We stop parsing syntax above line "lnum". If the stored state at or below | |
| 1703 * this line depended on a change before it, it now depends on the line below | |
| 1704 * the last parsed line. | |
| 1705 * The window looks like this: | |
| 1706 * line which changed | |
| 1707 * displayed line | |
| 1708 * displayed line | |
| 1709 * lnum -> line below window | |
| 1710 */ | |
| 1711 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1712 syntax_end_parsing(linenr_T lnum) |
| 7 | 1713 { |
| 1714 synstate_T *sp; | |
| 1715 | |
| 1716 sp = syn_stack_find_entry(lnum); | |
| 1717 if (sp != NULL && sp->sst_lnum < lnum) | |
| 1718 sp = sp->sst_next; | |
| 1719 | |
| 1720 if (sp != NULL && sp->sst_change_lnum != 0) | |
| 1721 sp->sst_change_lnum = lnum; | |
| 1722 } | |
| 1723 | |
| 1724 /* | |
| 1725 * End of handling of the state stack. | |
| 1726 ****************************************/ | |
| 1727 | |
| 1728 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1729 invalidate_current_state(void) |
| 7 | 1730 { |
| 1731 clear_current_state(); | |
| 1732 current_state.ga_itemsize = 0; /* mark current_state invalid */ | |
| 1733 current_next_list = NULL; | |
| 1734 keepend_level = -1; | |
| 1735 } | |
| 1736 | |
| 1737 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1738 validate_current_state(void) |
| 7 | 1739 { |
| 1740 current_state.ga_itemsize = sizeof(stateitem_T); | |
| 1741 current_state.ga_growsize = 3; | |
| 1742 } | |
| 1743 | |
| 1744 /* | |
| 1745 * Return TRUE if the syntax at start of lnum changed since last time. | |
| 1746 * This will only be called just after get_syntax_attr() for the previous | |
| 1747 * line, to check if the next line needs to be redrawn too. | |
| 1748 */ | |
| 1749 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1750 syntax_check_changed(linenr_T lnum) |
| 7 | 1751 { |
| 1752 int retval = TRUE; | |
| 1753 synstate_T *sp; | |
| 1754 | |
| 1755 /* | |
| 1756 * Check the state stack when: | |
| 1757 * - lnum is just below the previously syntaxed line. | |
| 1758 * - lnum is not before the lines with saved states. | |
| 1759 * - lnum is not past the lines with saved states. | |
| 1760 * - lnum is at or before the last changed line. | |
| 1761 */ | |
| 1762 if (VALID_STATE(¤t_state) && lnum == current_lnum + 1) | |
| 1763 { | |
| 1764 sp = syn_stack_find_entry(lnum); | |
| 1765 if (sp != NULL && sp->sst_lnum == lnum) | |
| 1766 { | |
| 1767 /* | |
| 1768 * finish the previous line (needed when not all of the line was | |
| 1769 * drawn) | |
| 1770 */ | |
| 1771 (void)syn_finish_line(FALSE); | |
| 1772 | |
| 1773 /* | |
| 1774 * Compare the current state with the previously saved state of | |
| 1775 * the line. | |
| 1776 */ | |
| 1777 if (syn_stack_equal(sp)) | |
| 1778 retval = FALSE; | |
| 1779 | |
| 1780 /* | |
| 1781 * Store the current state in b_sst_array[] for later use. | |
| 1782 */ | |
| 1783 ++current_lnum; | |
| 1512 | 1784 (void)store_current_state(); |
| 7 | 1785 } |
| 1786 } | |
| 1787 | |
| 1788 return retval; | |
| 1789 } | |
| 1790 | |
| 1791 /* | |
| 1792 * Finish the current line. | |
| 1793 * This doesn't return any attributes, it only gets the state at the end of | |
| 1794 * the line. It can start anywhere in the line, as long as the current state | |
| 1795 * is valid. | |
| 1796 */ | |
| 1797 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1798 syn_finish_line( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1799 int syncing) /* called for syncing */ |
| 7 | 1800 { |
| 1801 stateitem_T *cur_si; | |
| 442 | 1802 colnr_T prev_current_col; |
| 7 | 1803 |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1804 while (!current_finished) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1805 { |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1806 (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
|
1807 /* |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1808 * 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
|
1809 */ |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1810 if (syncing && current_state.ga_len) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1811 { |
| 7 | 1812 /* |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1813 * Check for match with sync item. |
| 7 | 1814 */ |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1815 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
|
1816 if (cur_si->si_idx >= 0 |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1817 && (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
|
1818 & (HL_SYNC_HERE|HL_SYNC_THERE))) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1819 return TRUE; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1820 |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1821 /* 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
|
1822 * 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
|
1823 * past the NUL. */ |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1824 prev_current_col = current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1825 if (syn_getcurline()[current_col] != NUL) |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1826 ++current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1827 check_state_ends(); |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1828 current_col = prev_current_col; |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1829 } |
|
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
1830 ++current_col; |
| 7 | 1831 } |
| 1832 return FALSE; | |
| 1833 } | |
| 1834 | |
| 1835 /* | |
| 1836 * Return highlight attributes for next character. | |
| 1837 * Must first call syntax_start() once for the line. | |
| 1838 * "col" is normally 0 for the first use in a line, and increments by one each | |
| 1839 * time. It's allowed to skip characters and to stop before the end of the | |
| 1840 * line. But only a "col" after a previously used column is allowed. | |
| 221 | 1841 * When "can_spell" is not NULL set it to TRUE when spell-checking should be |
| 1842 * done. | |
| 7 | 1843 */ |
| 1844 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1845 get_syntax_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1846 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1847 int *can_spell, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1848 int keep_state) /* keep state of char at "col" */ |
| 7 | 1849 { |
| 1850 int attr = 0; | |
| 1851 | |
| 1363 | 1852 if (can_spell != NULL) |
| 1853 /* Default: Only do spelling when there is no @Spell cluster or when | |
| 1854 * ":syn spell toplevel" was used. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1855 *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
|
1856 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1857 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 1363 | 1858 |
| 7 | 1859 /* check for out of memory situation */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1860 if (syn_block->b_sst_array == NULL) |
| 7 | 1861 return 0; |
| 1862 | |
| 419 | 1863 /* After 'synmaxcol' the attribute is always zero. */ |
| 431 | 1864 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc) |
| 419 | 1865 { |
| 1866 clear_current_state(); | |
| 1867 #ifdef FEAT_EVAL | |
| 1868 current_id = 0; | |
| 1869 current_trans_id = 0; | |
| 1870 #endif | |
|
2401
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1871 #ifdef FEAT_CONCEAL |
|
e7751177126b
Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents:
2392
diff
changeset
|
1872 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
|
1873 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
|
1874 #endif |
| 419 | 1875 return 0; |
| 1876 } | |
| 1877 | |
| 7 | 1878 /* Make sure current_state is valid */ |
| 1879 if (INVALID_STATE(¤t_state)) | |
| 1880 validate_current_state(); | |
| 1881 | |
| 1882 /* | |
| 1883 * Skip from the current column to "col", get the attributes for "col". | |
| 1884 */ | |
| 1885 while (current_col <= col) | |
| 1886 { | |
| 1504 | 1887 attr = syn_current_attr(FALSE, TRUE, can_spell, |
| 1888 current_col == col ? keep_state : FALSE); | |
| 7 | 1889 ++current_col; |
| 1890 } | |
| 1891 | |
| 1892 return attr; | |
| 1893 } | |
| 1894 | |
| 1895 /* | |
| 1896 * Get syntax attributes for current_lnum, current_col. | |
| 1897 */ | |
| 1898 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1899 syn_current_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1900 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
|
1901 int displaying, /* result will be displayed */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1902 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
|
1903 int keep_state) /* keep syntax stack afterwards */ |
| 7 | 1904 { |
| 1905 int syn_id; | |
| 1906 lpos_T endpos; /* was: char_u *endp; */ | |
| 1907 lpos_T hl_startpos; /* was: int hl_startcol; */ | |
| 1908 lpos_T hl_endpos; | |
| 1909 lpos_T eos_pos; /* end-of-start match (start region) */ | |
| 1910 lpos_T eoe_pos; /* end-of-end pattern */ | |
| 1911 int end_idx; /* group ID for end pattern */ | |
| 1912 int idx; | |
| 1913 synpat_T *spp; | |
| 221 | 1914 stateitem_T *cur_si, *sip = NULL; |
| 7 | 1915 int startcol; |
| 1916 int endcol; | |
| 1917 long flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1918 int cchar; |
| 7 | 1919 short *next_list; |
| 1920 int found_match; /* found usable match */ | |
| 1921 static int try_next_column = FALSE; /* must try in next col */ | |
| 1922 int do_keywords; | |
| 1923 regmmatch_T regmatch; | |
| 1924 lpos_T pos; | |
| 1925 int lc_col; | |
| 1926 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
|
1927 char_u buf_chartab[32]; /* chartab array for syn iskyeyword */ |
| 7 | 1928 char_u *line; /* current line. NOTE: becomes invalid after |
| 1929 looking for a pattern match! */ | |
| 1930 | |
| 1931 /* variables for zero-width matches that have a "nextgroup" argument */ | |
| 1932 int keep_next_list; | |
| 1933 int zero_width_next_list = FALSE; | |
| 1934 garray_T zero_width_next_ga; | |
| 1935 | |
| 1936 /* | |
| 1937 * No character, no attributes! Past end of line? | |
| 1938 * Do try matching with an empty line (could be the start of a region). | |
| 1939 */ | |
| 1940 line = syn_getcurline(); | |
| 1941 if (line[current_col] == NUL && current_col != 0) | |
| 1942 { | |
| 1943 /* | |
| 1944 * If we found a match after the last column, use it. | |
| 1945 */ | |
| 1946 if (next_match_idx >= 0 && next_match_col >= (int)current_col | |
| 1947 && next_match_col != MAXCOL) | |
| 1948 (void)push_next_match(NULL); | |
| 1949 | |
| 1950 current_finished = TRUE; | |
| 1951 current_state_stored = FALSE; | |
| 1952 return 0; | |
| 1953 } | |
| 1954 | |
| 1955 /* if the current or next character is NUL, we will finish the line now */ | |
| 1956 if (line[current_col] == NUL || line[current_col + 1] == NUL) | |
| 1957 { | |
| 1958 current_finished = TRUE; | |
| 1959 current_state_stored = FALSE; | |
| 1960 } | |
| 1961 | |
| 1962 /* | |
| 1963 * When in the previous column there was a match but it could not be used | |
| 1964 * (empty match or already matched in this column) need to try again in | |
| 1965 * the next column. | |
| 1966 */ | |
| 1967 if (try_next_column) | |
| 1968 { | |
| 1969 next_match_idx = -1; | |
| 1970 try_next_column = FALSE; | |
| 1971 } | |
| 1972 | |
| 1973 /* Only check for keywords when not syncing and there are some. */ | |
| 1974 do_keywords = !syncing | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1975 && (syn_block->b_keywtab.ht_used > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
1976 || syn_block->b_keywtab_ic.ht_used > 0); |
| 7 | 1977 |
| 1978 /* Init the list of zero-width matches with a nextlist. This is used to | |
| 1979 * avoid matching the same item in the same position twice. */ | |
| 1980 ga_init2(&zero_width_next_ga, (int)sizeof(int), 10); | |
| 1981 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1982 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1983 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1984 |
| 7 | 1985 /* |
| 1986 * Repeat matching keywords and patterns, to find contained items at the | |
| 1987 * same column. This stops when there are no extra matches at the current | |
| 1988 * column. | |
| 1989 */ | |
| 1990 do | |
| 1991 { | |
| 1992 found_match = FALSE; | |
| 1993 keep_next_list = FALSE; | |
| 1994 syn_id = 0; | |
| 1995 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
1996 |
| 7 | 1997 /* |
| 1998 * 1. Check for a current state. | |
| 1999 * Only when there is no current state, or if the current state may | |
| 2000 * contain other things, we need to check for keywords and patterns. | |
| 2001 * Always need to check for contained items if some item has the | |
| 2002 * "containedin" argument (takes extra time!). | |
| 2003 */ | |
| 2004 if (current_state.ga_len) | |
| 2005 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2006 else | |
| 2007 cur_si = NULL; | |
| 2008 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2009 if (syn_block->b_syn_containedin || cur_si == NULL |
| 7 | 2010 || cur_si->si_cont_list != NULL) |
| 2011 { | |
| 2012 /* | |
| 2013 * 2. Check for keywords, if on a keyword char after a non-keyword | |
| 2014 * char. Don't do this when syncing. | |
| 2015 */ | |
| 2016 if (do_keywords) | |
| 2017 { | |
| 2018 line = syn_getcurline(); | |
| 4043 | 2019 if (vim_iswordp_buf(line + current_col, syn_buf) |
| 7 | 2020 && (current_col == 0 |
| 4043 | 2021 || !vim_iswordp_buf(line + current_col - 1 |
| 7 | 2022 #ifdef FEAT_MBYTE |
| 2023 - (has_mbyte | |
| 2024 ? (*mb_head_off)(line, line + current_col - 1) | |
| 2025 : 0) | |
| 2026 #endif | |
| 2027 , syn_buf))) | |
| 2028 { | |
| 2029 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
|
2030 &endcol, &flags, &next_list, cur_si, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2031 &cchar); |
| 205 | 2032 if (syn_id != 0) |
| 7 | 2033 { |
| 2034 if (push_current_state(KEYWORD_IDX) == OK) | |
| 2035 { | |
| 2036 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2037 cur_si->si_m_startcol = current_col; | |
| 2038 cur_si->si_h_startpos.lnum = current_lnum; | |
| 2039 cur_si->si_h_startpos.col = 0; /* starts right away */ | |
| 2040 cur_si->si_m_endpos.lnum = current_lnum; | |
| 2041 cur_si->si_m_endpos.col = endcol; | |
| 2042 cur_si->si_h_endpos.lnum = current_lnum; | |
| 2043 cur_si->si_h_endpos.col = endcol; | |
| 2044 cur_si->si_ends = TRUE; | |
| 2045 cur_si->si_end_idx = 0; | |
| 2046 cur_si->si_flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2047 #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
|
2048 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
|
2049 cur_si->si_cchar = cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2050 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2051 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2052 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
|
2053 & HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2054 #endif |
| 7 | 2055 cur_si->si_id = syn_id; |
| 2056 cur_si->si_trans_id = syn_id; | |
| 2057 if (flags & HL_TRANSP) | |
| 2058 { | |
| 2059 if (current_state.ga_len < 2) | |
| 2060 { | |
| 2061 cur_si->si_attr = 0; | |
| 2062 cur_si->si_trans_id = 0; | |
| 2063 } | |
| 2064 else | |
| 2065 { | |
| 2066 cur_si->si_attr = CUR_STATE( | |
| 2067 current_state.ga_len - 2).si_attr; | |
| 2068 cur_si->si_trans_id = CUR_STATE( | |
| 2069 current_state.ga_len - 2).si_trans_id; | |
| 2070 } | |
| 2071 } | |
| 2072 else | |
| 2073 cur_si->si_attr = syn_id2attr(syn_id); | |
| 2074 cur_si->si_cont_list = NULL; | |
| 2075 cur_si->si_next_list = next_list; | |
| 2076 check_keepend(); | |
| 2077 } | |
| 2078 else | |
| 2079 vim_free(next_list); | |
| 2080 } | |
| 2081 } | |
| 2082 } | |
| 2083 | |
| 2084 /* | |
| 205 | 2085 * 3. Check for patterns (only if no keyword found). |
| 7 | 2086 */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2087 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len) |
| 7 | 2088 { |
| 2089 /* | |
| 2090 * If we didn't check for a match yet, or we are past it, check | |
| 2091 * for any match with a pattern. | |
| 2092 */ | |
| 2093 if (next_match_idx < 0 || next_match_col < (int)current_col) | |
| 2094 { | |
| 2095 /* | |
| 2096 * Check all relevant patterns for a match at this | |
| 2097 * position. This is complicated, because matching with a | |
| 2098 * pattern takes quite a bit of time, thus we want to | |
| 2099 * avoid doing it when it's not needed. | |
| 2100 */ | |
| 2101 next_match_idx = 0; /* no match in this line yet */ | |
| 2102 next_match_col = MAXCOL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2103 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; ) |
| 7 | 2104 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2105 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2106 if ( spp->sp_syncing == syncing |
| 2107 && (displaying || !(spp->sp_flags & HL_DISPLAY)) | |
| 2108 && (spp->sp_type == SPTYPE_MATCH | |
| 2109 || spp->sp_type == SPTYPE_START) | |
| 2110 && (current_next_list != NULL | |
| 2111 ? in_id_list(NULL, current_next_list, | |
| 2112 &spp->sp_syn, 0) | |
| 2113 : (cur_si == NULL | |
| 2114 ? !(spp->sp_flags & HL_CONTAINED) | |
| 2115 : in_id_list(cur_si, | |
| 2116 cur_si->si_cont_list, &spp->sp_syn, | |
| 2117 spp->sp_flags & HL_CONTAINED)))) | |
| 2118 { | |
| 6375 | 2119 int r; |
| 2120 | |
| 7 | 2121 /* If we already tried matching in this line, and |
| 2122 * there isn't a match before next_match_col, skip | |
| 2123 * this item. */ | |
| 2124 if (spp->sp_line_id == current_line_id | |
| 2125 && spp->sp_startcol >= next_match_col) | |
| 2126 continue; | |
| 2127 spp->sp_line_id = current_line_id; | |
| 2128 | |
| 2129 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF]; | |
| 2130 if (lc_col < 0) | |
| 2131 lc_col = 0; | |
| 2132 | |
| 2133 regmatch.rmm_ic = spp->sp_ic; | |
| 2134 regmatch.regprog = spp->sp_prog; | |
| 6375 | 2135 r = syn_regexec(®match, |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2136 current_lnum, |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2137 (colnr_T)lc_col, |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
2138 IF_SYN_TIME(&spp->sp_time)); |
| 6375 | 2139 spp->sp_prog = regmatch.regprog; |
| 2140 if (!r) | |
| 7 | 2141 { |
| 2142 /* no match in this line, try another one */ | |
| 2143 spp->sp_startcol = MAXCOL; | |
| 2144 continue; | |
| 2145 } | |
| 2146 | |
| 2147 /* | |
| 2148 * Compute the first column of the match. | |
| 2149 */ | |
| 2150 syn_add_start_off(&pos, ®match, | |
| 2151 spp, SPO_MS_OFF, -1); | |
| 2152 if (pos.lnum > current_lnum) | |
| 2153 { | |
| 2154 /* must have used end of match in a next line, | |
| 2155 * we can't handle that */ | |
| 2156 spp->sp_startcol = MAXCOL; | |
| 2157 continue; | |
| 2158 } | |
| 2159 startcol = pos.col; | |
| 2160 | |
| 2161 /* remember the next column where this pattern | |
| 2162 * matches in the current line */ | |
| 2163 spp->sp_startcol = startcol; | |
| 2164 | |
| 2165 /* | |
| 2166 * If a previously found match starts at a lower | |
| 2167 * column number, don't use this one. | |
| 2168 */ | |
| 2169 if (startcol >= next_match_col) | |
| 2170 continue; | |
| 2171 | |
| 2172 /* | |
| 2173 * If we matched this pattern at this position | |
| 2174 * before, skip it. Must retry in the next | |
| 2175 * column, because it may match from there. | |
| 2176 */ | |
| 2177 if (did_match_already(idx, &zero_width_next_ga)) | |
| 2178 { | |
| 2179 try_next_column = TRUE; | |
| 2180 continue; | |
| 2181 } | |
| 2182 | |
| 2183 endpos.lnum = regmatch.endpos[0].lnum; | |
| 2184 endpos.col = regmatch.endpos[0].col; | |
| 2185 | |
| 2186 /* Compute the highlight start. */ | |
| 2187 syn_add_start_off(&hl_startpos, ®match, | |
| 2188 spp, SPO_HS_OFF, -1); | |
| 2189 | |
| 2190 /* Compute the region start. */ | |
| 2191 /* Default is to use the end of the match. */ | |
| 2192 syn_add_end_off(&eos_pos, ®match, | |
| 2193 spp, SPO_RS_OFF, 0); | |
| 2194 | |
| 2195 /* | |
| 2196 * Grab the external submatches before they get | |
| 2197 * overwritten. Reference count doesn't change. | |
| 2198 */ | |
| 2199 unref_extmatch(cur_extmatch); | |
| 2200 cur_extmatch = re_extmatch_out; | |
| 2201 re_extmatch_out = NULL; | |
| 2202 | |
| 2203 flags = 0; | |
| 2204 eoe_pos.lnum = 0; /* avoid warning */ | |
| 2205 eoe_pos.col = 0; | |
| 2206 end_idx = 0; | |
| 2207 hl_endpos.lnum = 0; | |
| 2208 | |
| 2209 /* | |
| 2210 * For a "oneline" the end must be found in the | |
| 2211 * same line too. Search for it after the end of | |
| 2212 * the match with the start pattern. Set the | |
| 2213 * resulting end positions at the same time. | |
| 2214 */ | |
| 2215 if (spp->sp_type == SPTYPE_START | |
| 2216 && (spp->sp_flags & HL_ONELINE)) | |
| 2217 { | |
| 2218 lpos_T startpos; | |
| 2219 | |
| 2220 startpos = endpos; | |
| 2221 find_endpos(idx, &startpos, &endpos, &hl_endpos, | |
| 2222 &flags, &eoe_pos, &end_idx, cur_extmatch); | |
| 2223 if (endpos.lnum == 0) | |
| 2224 continue; /* not found */ | |
| 2225 } | |
| 2226 | |
| 2227 /* | |
| 2228 * For a "match" the size must be > 0 after the | |
| 2229 * end offset needs has been added. Except when | |
| 2230 * syncing. | |
| 2231 */ | |
| 2232 else if (spp->sp_type == SPTYPE_MATCH) | |
| 2233 { | |
| 2234 syn_add_end_off(&hl_endpos, ®match, spp, | |
| 2235 SPO_HE_OFF, 0); | |
| 2236 syn_add_end_off(&endpos, ®match, spp, | |
| 2237 SPO_ME_OFF, 0); | |
| 2238 if (endpos.lnum == current_lnum | |
| 2239 && (int)endpos.col + syncing < startcol) | |
| 2240 { | |
| 2241 /* | |
| 2242 * If an empty string is matched, may need | |
| 2243 * to try matching again at next column. | |
| 2244 */ | |
| 2245 if (regmatch.startpos[0].col | |
| 2246 == regmatch.endpos[0].col) | |
| 2247 try_next_column = TRUE; | |
| 2248 continue; | |
| 2249 } | |
| 2250 } | |
| 2251 | |
| 2252 /* | |
| 2253 * keep the best match so far in next_match_* | |
| 2254 */ | |
| 2255 /* Highlighting must start after startpos and end | |
| 2256 * before endpos. */ | |
| 2257 if (hl_startpos.lnum == current_lnum | |
| 2258 && (int)hl_startpos.col < startcol) | |
| 2259 hl_startpos.col = startcol; | |
| 2260 limit_pos_zero(&hl_endpos, &endpos); | |
| 2261 | |
| 2262 next_match_idx = idx; | |
| 2263 next_match_col = startcol; | |
| 2264 next_match_m_endpos = endpos; | |
| 2265 next_match_h_endpos = hl_endpos; | |
| 2266 next_match_h_startpos = hl_startpos; | |
| 2267 next_match_flags = flags; | |
| 2268 next_match_eos_pos = eos_pos; | |
| 2269 next_match_eoe_pos = eoe_pos; | |
| 2270 next_match_end_idx = end_idx; | |
| 2271 unref_extmatch(next_match_extmatch); | |
| 2272 next_match_extmatch = cur_extmatch; | |
| 2273 cur_extmatch = NULL; | |
| 2274 } | |
| 2275 } | |
| 2276 } | |
| 2277 | |
| 2278 /* | |
| 2279 * If we found a match at the current column, use it. | |
| 2280 */ | |
| 2281 if (next_match_idx >= 0 && next_match_col == (int)current_col) | |
| 2282 { | |
| 2283 synpat_T *lspp; | |
| 2284 | |
| 2285 /* When a zero-width item matched which has a nextgroup, | |
| 2286 * 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
|
2287 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2288 if (next_match_m_endpos.lnum == current_lnum |
| 2289 && next_match_m_endpos.col == current_col | |
| 2290 && lspp->sp_next_list != NULL) | |
| 2291 { | |
| 2292 current_next_list = lspp->sp_next_list; | |
| 2293 current_next_flags = lspp->sp_flags; | |
| 2294 keep_next_list = TRUE; | |
| 2295 zero_width_next_list = TRUE; | |
| 2296 | |
| 2297 /* Add the index to a list, so that we can check | |
| 2298 * later that we don't match it again (and cause an | |
| 2299 * endless loop). */ | |
| 2300 if (ga_grow(&zero_width_next_ga, 1) == OK) | |
| 2301 { | |
| 2302 ((int *)(zero_width_next_ga.ga_data)) | |
| 2303 [zero_width_next_ga.ga_len++] = next_match_idx; | |
| 2304 } | |
| 2305 next_match_idx = -1; | |
| 2306 } | |
| 2307 else | |
| 2308 cur_si = push_next_match(cur_si); | |
| 2309 found_match = TRUE; | |
| 2310 } | |
| 2311 } | |
| 2312 } | |
| 2313 | |
| 2314 /* | |
| 2315 * Handle searching for nextgroup match. | |
| 2316 */ | |
| 2317 if (current_next_list != NULL && !keep_next_list) | |
| 2318 { | |
| 2319 /* | |
| 2320 * If a nextgroup was not found, continue looking for one if: | |
| 2321 * - this is an empty line and the "skipempty" option was given | |
| 2322 * - we are on white space and the "skipwhite" option was given | |
| 2323 */ | |
| 2324 if (!found_match) | |
| 2325 { | |
| 2326 line = syn_getcurline(); | |
| 2327 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
|
2328 && VIM_ISWHITE(line[current_col])) |
| 7 | 2329 || ((current_next_flags & HL_SKIPEMPTY) |
| 2330 && *line == NUL)) | |
| 2331 break; | |
| 2332 } | |
| 2333 | |
| 2334 /* | |
| 2335 * If a nextgroup was found: Use it, and continue looking for | |
| 2336 * contained matches. | |
| 2337 * If a nextgroup was not found: Continue looking for a normal | |
| 2338 * match. | |
| 2339 * When did set current_next_list for a zero-width item and no | |
| 2340 * match was found don't loop (would get stuck). | |
| 2341 */ | |
| 2342 current_next_list = NULL; | |
| 2343 next_match_idx = -1; | |
| 2344 if (!zero_width_next_list) | |
| 2345 found_match = TRUE; | |
| 2346 } | |
| 2347 | |
| 2348 } while (found_match); | |
| 2349 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2350 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2351 |
| 7 | 2352 /* |
| 2353 * Use attributes from the current state, if within its highlighting. | |
| 2354 * If not, use attributes from the current-but-one state, etc. | |
| 2355 */ | |
| 2356 current_attr = 0; | |
| 2357 #ifdef FEAT_EVAL | |
| 2358 current_id = 0; | |
| 2359 current_trans_id = 0; | |
| 2360 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2361 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2362 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
|
2363 current_seqnr = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2364 #endif |
| 7 | 2365 if (cur_si != NULL) |
| 2366 { | |
| 221 | 2367 #ifndef FEAT_EVAL |
| 2368 int current_trans_id = 0; | |
| 2369 #endif | |
| 7 | 2370 for (idx = current_state.ga_len - 1; idx >= 0; --idx) |
| 2371 { | |
| 2372 sip = &CUR_STATE(idx); | |
| 2373 if ((current_lnum > sip->si_h_startpos.lnum | |
| 2374 || (current_lnum == sip->si_h_startpos.lnum | |
| 2375 && current_col >= sip->si_h_startpos.col)) | |
| 2376 && (sip->si_h_endpos.lnum == 0 | |
| 2377 || current_lnum < sip->si_h_endpos.lnum | |
| 2378 || (current_lnum == sip->si_h_endpos.lnum | |
| 2379 && current_col < sip->si_h_endpos.col))) | |
| 2380 { | |
| 2381 current_attr = sip->si_attr; | |
| 2382 #ifdef FEAT_EVAL | |
| 2383 current_id = sip->si_id; | |
| 221 | 2384 #endif |
| 7 | 2385 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
|
2386 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2387 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
|
2388 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
|
2389 current_sub_char = sip->si_cchar; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2390 #endif |
| 7 | 2391 break; |
| 2392 } | |
| 2393 } | |
| 2394 | |
| 221 | 2395 if (can_spell != NULL) |
| 2396 { | |
| 2397 struct sp_syn sps; | |
| 2398 | |
| 2399 /* | |
| 2400 * set "can_spell" to TRUE if spell checking is supposed to be | |
| 2401 * done in the current item. | |
| 2402 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2403 if (syn_block->b_spell_cluster_id == 0) |
| 227 | 2404 { |
| 320 | 2405 /* There is no @Spell cluster: Do spelling for items without |
| 2406 * @NoSpell cluster. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2407 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
|
2408 || current_trans_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2409 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP); |
| 227 | 2410 else |
| 2411 { | |
| 2412 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2413 sps.id = syn_block->b_nospell_cluster_id; |
| 227 | 2414 sps.cont_in_list = NULL; |
| 2415 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2416 } | |
| 2417 } | |
| 221 | 2418 else |
| 2419 { | |
| 320 | 2420 /* The @Spell cluster is defined: Do spelling in items with |
| 419 | 2421 * the @Spell cluster. But not when @NoSpell is also there. |
| 2422 * At the toplevel only spell check when ":syn spell toplevel" | |
| 2423 * was used. */ | |
| 320 | 2424 if (current_trans_id == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2425 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP); |
| 320 | 2426 else |
| 2427 { | |
| 2428 sps.inc_tag = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2429 sps.id = syn_block->b_spell_cluster_id; |
| 320 | 2430 sps.cont_in_list = NULL; |
| 2431 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0); | |
| 2432 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2433 if (syn_block->b_nospell_cluster_id != 0) |
| 320 | 2434 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2435 sps.id = syn_block->b_nospell_cluster_id; |
| 320 | 2436 if (in_id_list(sip, sip->si_cont_list, &sps, 0)) |
| 2437 *can_spell = FALSE; | |
| 2438 } | |
| 2439 } | |
| 221 | 2440 } |
| 2441 } | |
| 2442 | |
| 2443 | |
| 7 | 2444 /* |
| 2445 * Check for end of current state (and the states before it) at the | |
| 2446 * next column. Don't do this for syncing, because we would miss a | |
| 2447 * single character match. | |
| 2448 * First check if the current state ends at the current column. It | |
| 2449 * may be for an empty match and a containing item might end in the | |
| 2450 * current column. | |
| 2451 */ | |
| 1504 | 2452 if (!syncing && !keep_state) |
| 7 | 2453 { |
| 2454 check_state_ends(); | |
| 442 | 2455 if (current_state.ga_len > 0 |
| 2456 && syn_getcurline()[current_col] != NUL) | |
| 7 | 2457 { |
| 2458 ++current_col; | |
| 2459 check_state_ends(); | |
| 2460 --current_col; | |
| 2461 } | |
| 2462 } | |
| 2463 } | |
| 221 | 2464 else if (can_spell != NULL) |
| 419 | 2465 /* Default: Only do spelling when there is no @Spell cluster or when |
| 2466 * ":syn spell toplevel" was used. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2467 *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
|
2468 ? (syn_block->b_spell_cluster_id == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2469 : (syn_block->b_syn_spell == SYNSPL_TOP); |
| 7 | 2470 |
| 2020 | 2471 /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */ |
| 7 | 2472 if (current_next_list != NULL |
|
13375
33f514c94943
patch 8.0.1561: crash with rust syntax highligting
Christian Brabandt <cb@256bit.org>
parents:
13339
diff
changeset
|
2473 && (line = syn_getcurline())[current_col] != NUL |
|
33f514c94943
patch 8.0.1561: crash with rust syntax highligting
Christian Brabandt <cb@256bit.org>
parents:
13339
diff
changeset
|
2474 && line[current_col + 1] == NUL |
| 7 | 2475 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) |
| 2476 current_next_list = NULL; | |
| 2477 | |
| 2478 if (zero_width_next_ga.ga_len > 0) | |
| 2479 ga_clear(&zero_width_next_ga); | |
| 2480 | |
| 2481 /* No longer need external matches. But keep next_match_extmatch. */ | |
| 2482 unref_extmatch(re_extmatch_out); | |
| 2483 re_extmatch_out = NULL; | |
| 2484 unref_extmatch(cur_extmatch); | |
| 2485 | |
| 2486 return current_attr; | |
| 2487 } | |
| 2488 | |
| 2489 | |
| 2490 /* | |
| 2491 * Check if we already matched pattern "idx" at the current column. | |
| 2492 */ | |
| 2493 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2494 did_match_already(int idx, garray_T *gap) |
| 7 | 2495 { |
| 2496 int i; | |
| 2497 | |
| 2498 for (i = current_state.ga_len; --i >= 0; ) | |
| 2499 if (CUR_STATE(i).si_m_startcol == (int)current_col | |
| 2500 && CUR_STATE(i).si_m_lnum == (int)current_lnum | |
| 2501 && CUR_STATE(i).si_idx == idx) | |
| 2502 return TRUE; | |
| 2503 | |
| 2504 /* Zero-width matches with a nextgroup argument are not put on the syntax | |
| 2505 * stack, and can only be matched once anyway. */ | |
| 2506 for (i = gap->ga_len; --i >= 0; ) | |
| 2507 if (((int *)(gap->ga_data))[i] == idx) | |
| 2508 return TRUE; | |
| 2509 | |
| 2510 return FALSE; | |
| 2511 } | |
| 2512 | |
| 2513 /* | |
| 2514 * Push the next match onto the stack. | |
| 2515 */ | |
| 2516 static stateitem_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2517 push_next_match(stateitem_T *cur_si) |
| 7 | 2518 { |
| 2519 synpat_T *spp; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2520 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2521 int save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2522 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2523 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2524 spp = &(SYN_ITEMS(syn_block)[next_match_idx]); |
| 7 | 2525 |
| 2526 /* | |
| 2527 * Push the item in current_state stack; | |
| 2528 */ | |
| 2529 if (push_current_state(next_match_idx) == OK) | |
| 2530 { | |
| 2531 /* | |
| 2532 * If it's a start-skip-end type that crosses lines, figure out how | |
| 2533 * much it continues in this line. Otherwise just fill in the length. | |
| 2534 */ | |
| 2535 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2536 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2537 cur_si->si_m_startcol = current_col; | |
| 2538 cur_si->si_m_lnum = current_lnum; | |
| 2539 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
|
2540 #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
|
2541 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
|
2542 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
|
2543 if (current_state.ga_len > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2544 cur_si->si_flags |= |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2545 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
|
2546 #endif |
| 7 | 2547 cur_si->si_next_list = spp->sp_next_list; |
| 2548 cur_si->si_extmatch = ref_extmatch(next_match_extmatch); | |
| 2549 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE)) | |
| 2550 { | |
| 2551 /* Try to find the end pattern in the current line */ | |
| 2552 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE); | |
| 2553 check_keepend(); | |
| 2554 } | |
| 2555 else | |
| 2556 { | |
| 2557 cur_si->si_m_endpos = next_match_m_endpos; | |
| 2558 cur_si->si_h_endpos = next_match_h_endpos; | |
| 2559 cur_si->si_ends = TRUE; | |
| 2560 cur_si->si_flags |= next_match_flags; | |
| 2561 cur_si->si_eoe_pos = next_match_eoe_pos; | |
| 2562 cur_si->si_end_idx = next_match_end_idx; | |
| 2563 } | |
| 2564 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND)) | |
| 2565 keepend_level = current_state.ga_len - 1; | |
| 2566 check_keepend(); | |
| 2567 update_si_attr(current_state.ga_len - 1); | |
| 2568 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2569 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2570 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
|
2571 #endif |
| 7 | 2572 /* |
| 2573 * If the start pattern has another highlight group, push another item | |
| 2574 * on the stack for the start pattern. | |
| 2575 */ | |
| 2576 if ( spp->sp_type == SPTYPE_START | |
| 2577 && spp->sp_syn_match_id != 0 | |
| 2578 && push_current_state(next_match_idx) == OK) | |
| 2579 { | |
| 2580 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2581 cur_si->si_h_startpos = next_match_h_startpos; | |
| 2582 cur_si->si_m_startcol = current_col; | |
| 2583 cur_si->si_m_lnum = current_lnum; | |
| 2584 cur_si->si_m_endpos = next_match_eos_pos; | |
| 2585 cur_si->si_h_endpos = next_match_eos_pos; | |
| 2586 cur_si->si_ends = TRUE; | |
| 2587 cur_si->si_end_idx = 0; | |
| 2588 cur_si->si_flags = HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2589 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2590 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2591 cur_si->si_flags |= save_flags; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2592 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2593 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2594 #endif |
| 7 | 2595 cur_si->si_next_list = NULL; |
| 2596 check_keepend(); | |
| 2597 update_si_attr(current_state.ga_len - 1); | |
| 2598 } | |
| 2599 } | |
| 2600 | |
| 2601 next_match_idx = -1; /* try other match next time */ | |
| 2602 | |
| 2603 return cur_si; | |
| 2604 } | |
| 2605 | |
| 2606 /* | |
| 2607 * Check for end of current state (and the states before it). | |
| 2608 */ | |
| 2609 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2610 check_state_ends(void) |
| 7 | 2611 { |
| 2612 stateitem_T *cur_si; | |
| 2863 | 2613 int had_extend; |
| 7 | 2614 |
| 2615 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2616 for (;;) | |
| 2617 { | |
| 2618 if (cur_si->si_ends | |
| 2619 && (cur_si->si_m_endpos.lnum < current_lnum | |
| 2620 || (cur_si->si_m_endpos.lnum == current_lnum | |
| 2621 && cur_si->si_m_endpos.col <= current_col))) | |
| 2622 { | |
| 2623 /* | |
| 2624 * If there is an end pattern group ID, highlight the end pattern | |
| 2625 * now. No need to pop the current item from the stack. | |
| 2626 * Only do this if the end pattern continues beyond the current | |
| 2627 * position. | |
| 2628 */ | |
| 2629 if (cur_si->si_end_idx | |
| 2630 && (cur_si->si_eoe_pos.lnum > current_lnum | |
| 2631 || (cur_si->si_eoe_pos.lnum == current_lnum | |
| 2632 && cur_si->si_eoe_pos.col > current_col))) | |
| 2633 { | |
| 2634 cur_si->si_idx = cur_si->si_end_idx; | |
| 2635 cur_si->si_end_idx = 0; | |
| 2636 cur_si->si_m_endpos = cur_si->si_eoe_pos; | |
| 2637 cur_si->si_h_endpos = cur_si->si_eoe_pos; | |
| 2638 cur_si->si_flags |= HL_MATCH; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2639 #ifdef FEAT_CONCEAL |
|
2418
da067045878f
Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents:
2401
diff
changeset
|
2640 cur_si->si_seqnr = next_seqnr++; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2641 if (cur_si->si_flags & HL_CONCEALENDS) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2642 cur_si->si_flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2643 #endif |
| 7 | 2644 update_si_attr(current_state.ga_len - 1); |
| 36 | 2645 |
| 2831 | 2646 /* nextgroup= should not match in the end pattern */ |
| 2647 current_next_list = NULL; | |
| 2648 | |
| 36 | 2649 /* what matches next may be different now, clear it */ |
| 2650 next_match_idx = 0; | |
| 2651 next_match_col = MAXCOL; | |
| 7 | 2652 break; |
| 2653 } | |
| 2654 else | |
| 2655 { | |
| 2656 /* handle next_list, unless at end of line and no "skipnl" or | |
| 2657 * "skipempty" */ | |
| 2658 current_next_list = cur_si->si_next_list; | |
| 2659 current_next_flags = cur_si->si_flags; | |
| 2660 if (!(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)) | |
| 2661 && syn_getcurline()[current_col] == NUL) | |
| 2662 current_next_list = NULL; | |
| 2663 | |
| 2664 /* When the ended item has "extend", another item with | |
| 2665 * "keepend" now needs to check for its end. */ | |
| 2863 | 2666 had_extend = (cur_si->si_flags & HL_EXTEND); |
| 7 | 2667 |
| 2668 pop_current_state(); | |
| 2669 | |
| 2670 if (current_state.ga_len == 0) | |
| 2671 break; | |
| 2672 | |
| 1503 | 2673 if (had_extend && keepend_level >= 0) |
| 7 | 2674 { |
| 2675 syn_update_ends(FALSE); | |
| 2676 if (current_state.ga_len == 0) | |
| 2677 break; | |
| 2678 } | |
| 2679 | |
| 2680 cur_si = &CUR_STATE(current_state.ga_len - 1); | |
| 2681 | |
| 2682 /* | |
| 2683 * Only for a region the search for the end continues after | |
| 2684 * the end of the contained item. If the contained match | |
| 2685 * included the end-of-line, break here, the region continues. | |
| 2686 * Don't do this when: | |
| 2687 * - "keepend" is used for the contained item | |
| 2688 * - not at the end of the line (could be end="x$"me=e-1). | |
| 2689 * - "excludenl" is used (HL_HAS_EOL won't be set) | |
| 2690 */ | |
| 2691 if (cur_si->si_idx >= 0 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2692 && SYN_ITEMS(syn_block)[cur_si->si_idx].sp_type |
| 7 | 2693 == SPTYPE_START |
| 2694 && !(cur_si->si_flags & (HL_MATCH | HL_KEEPEND))) | |
| 2695 { | |
| 2696 update_si_end(cur_si, (int)current_col, TRUE); | |
| 2697 check_keepend(); | |
| 2698 if ((current_next_flags & HL_HAS_EOL) | |
| 2699 && keepend_level < 0 | |
| 2700 && syn_getcurline()[current_col] == NUL) | |
| 2701 break; | |
| 2702 } | |
| 2703 } | |
| 2704 } | |
| 2705 else | |
| 2706 break; | |
| 2707 } | |
| 2708 } | |
| 2709 | |
| 2710 /* | |
| 2711 * Update an entry in the current_state stack for a match or region. This | |
| 2712 * fills in si_attr, si_next_list and si_cont_list. | |
| 2713 */ | |
| 2714 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2715 update_si_attr(int idx) |
| 7 | 2716 { |
| 2717 stateitem_T *sip = &CUR_STATE(idx); | |
| 2718 synpat_T *spp; | |
| 2719 | |
| 1371 | 2720 /* This should not happen... */ |
| 2721 if (sip->si_idx < 0) | |
| 2722 return; | |
| 2723 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2724 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]); |
| 7 | 2725 if (sip->si_flags & HL_MATCH) |
| 2726 sip->si_id = spp->sp_syn_match_id; | |
| 2727 else | |
| 2728 sip->si_id = spp->sp_syn.id; | |
| 2729 sip->si_attr = syn_id2attr(sip->si_id); | |
| 2730 sip->si_trans_id = sip->si_id; | |
| 2731 if (sip->si_flags & HL_MATCH) | |
| 2732 sip->si_cont_list = NULL; | |
| 2733 else | |
| 2734 sip->si_cont_list = spp->sp_cont_list; | |
| 2735 | |
| 2736 /* | |
| 2737 * For transparent items, take attr from outer item. | |
| 2738 * Also take cont_list, if there is none. | |
| 2739 * Don't do this for the matchgroup of a start or end pattern. | |
| 2740 */ | |
| 2741 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH)) | |
| 2742 { | |
| 2743 if (idx == 0) | |
| 2744 { | |
| 2745 sip->si_attr = 0; | |
| 2746 sip->si_trans_id = 0; | |
| 2747 if (sip->si_cont_list == NULL) | |
| 2748 sip->si_cont_list = ID_LIST_ALL; | |
| 2749 } | |
| 2750 else | |
| 2751 { | |
| 2752 sip->si_attr = CUR_STATE(idx - 1).si_attr; | |
| 2753 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id; | |
| 36 | 2754 sip->si_h_startpos = CUR_STATE(idx - 1).si_h_startpos; |
| 2755 sip->si_h_endpos = CUR_STATE(idx - 1).si_h_endpos; | |
| 7 | 2756 if (sip->si_cont_list == NULL) |
| 2757 { | |
| 2758 sip->si_flags |= HL_TRANS_CONT; | |
| 2759 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list; | |
| 2760 } | |
| 2761 } | |
| 2762 } | |
| 2763 } | |
| 2764 | |
| 2765 /* | |
| 2766 * Check the current stack for patterns with "keepend" flag. | |
| 2767 * Propagate the match-end to contained items, until a "skipend" item is found. | |
| 2768 */ | |
| 2769 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2770 check_keepend(void) |
| 7 | 2771 { |
| 2772 int i; | |
| 2773 lpos_T maxpos; | |
| 991 | 2774 lpos_T maxpos_h; |
| 7 | 2775 stateitem_T *sip; |
| 2776 | |
| 2777 /* | |
| 2778 * This check can consume a lot of time; only do it from the level where | |
| 2779 * there really is a keepend. | |
| 2780 */ | |
| 2781 if (keepend_level < 0) | |
| 2782 return; | |
| 2783 | |
| 2784 /* | |
| 2785 * Find the last index of an "extend" item. "keepend" items before that | |
| 2786 * won't do anything. If there is no "extend" item "i" will be | |
| 2787 * "keepend_level" and all "keepend" items will work normally. | |
| 2788 */ | |
| 2789 for (i = current_state.ga_len - 1; i > keepend_level; --i) | |
| 2790 if (CUR_STATE(i).si_flags & HL_EXTEND) | |
| 2791 break; | |
| 2792 | |
| 2793 maxpos.lnum = 0; | |
| 1702 | 2794 maxpos.col = 0; |
| 991 | 2795 maxpos_h.lnum = 0; |
| 1702 | 2796 maxpos_h.col = 0; |
| 7 | 2797 for ( ; i < current_state.ga_len; ++i) |
| 2798 { | |
| 2799 sip = &CUR_STATE(i); | |
| 2800 if (maxpos.lnum != 0) | |
| 2801 { | |
| 2802 limit_pos_zero(&sip->si_m_endpos, &maxpos); | |
| 991 | 2803 limit_pos_zero(&sip->si_h_endpos, &maxpos_h); |
| 7 | 2804 limit_pos_zero(&sip->si_eoe_pos, &maxpos); |
| 2805 sip->si_ends = TRUE; | |
| 2806 } | |
| 991 | 2807 if (sip->si_ends && (sip->si_flags & HL_KEEPEND)) |
| 2808 { | |
| 2809 if (maxpos.lnum == 0 | |
| 7 | 2810 || maxpos.lnum > sip->si_m_endpos.lnum |
| 2811 || (maxpos.lnum == sip->si_m_endpos.lnum | |
| 991 | 2812 && maxpos.col > sip->si_m_endpos.col)) |
| 2813 maxpos = sip->si_m_endpos; | |
| 2814 if (maxpos_h.lnum == 0 | |
| 2815 || maxpos_h.lnum > sip->si_h_endpos.lnum | |
| 2816 || (maxpos_h.lnum == sip->si_h_endpos.lnum | |
| 2817 && maxpos_h.col > sip->si_h_endpos.col)) | |
| 2818 maxpos_h = sip->si_h_endpos; | |
| 2819 } | |
| 7 | 2820 } |
| 2821 } | |
| 2822 | |
| 2823 /* | |
| 2824 * Update an entry in the current_state stack for a start-skip-end pattern. | |
| 2825 * This finds the end of the current item, if it's in the current line. | |
| 2826 * | |
| 2827 * Return the flags for the matched END. | |
| 2828 */ | |
| 2829 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2830 update_si_end( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2831 stateitem_T *sip, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2832 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
|
2833 int force) /* when TRUE overrule a previous end */ |
| 7 | 2834 { |
| 2835 lpos_T startpos; | |
| 2836 lpos_T endpos; | |
| 2837 lpos_T hl_endpos; | |
| 2838 lpos_T end_endpos; | |
| 2839 int end_idx; | |
| 2840 | |
| 1371 | 2841 /* return quickly for a keyword */ |
| 2842 if (sip->si_idx < 0) | |
| 2843 return; | |
| 2844 | |
| 7 | 2845 /* Don't update when it's already done. Can be a match of an end pattern |
| 2846 * that started in a previous line. Watch out: can also be a "keepend" | |
| 2847 * from a containing item. */ | |
| 2848 if (!force && sip->si_m_endpos.lnum >= current_lnum) | |
| 2849 return; | |
| 2850 | |
| 2851 /* | |
| 2852 * We need to find the end of the region. It may continue in the next | |
| 2853 * line. | |
| 2854 */ | |
| 2855 end_idx = 0; | |
| 2856 startpos.lnum = current_lnum; | |
| 2857 startpos.col = startcol; | |
| 2858 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos, | |
| 2859 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch); | |
| 2860 | |
| 2861 if (endpos.lnum == 0) | |
| 2862 { | |
| 2863 /* No end pattern matched. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2864 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE) |
| 7 | 2865 { |
| 2866 /* a "oneline" never continues in the next line */ | |
| 2867 sip->si_ends = TRUE; | |
| 2868 sip->si_m_endpos.lnum = current_lnum; | |
| 2869 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline()); | |
| 2870 } | |
| 2871 else | |
| 2872 { | |
| 2873 /* continues in the next line */ | |
| 2874 sip->si_ends = FALSE; | |
| 2875 sip->si_m_endpos.lnum = 0; | |
| 2876 } | |
| 2877 sip->si_h_endpos = sip->si_m_endpos; | |
| 2878 } | |
| 2879 else | |
| 2880 { | |
| 2881 /* match within this line */ | |
| 2882 sip->si_m_endpos = endpos; | |
| 2883 sip->si_h_endpos = hl_endpos; | |
| 2884 sip->si_eoe_pos = end_endpos; | |
| 2885 sip->si_ends = TRUE; | |
| 2886 sip->si_end_idx = end_idx; | |
| 2887 } | |
| 2888 } | |
| 2889 | |
| 2890 /* | |
| 2891 * Add a new state to the current state stack. | |
| 2892 * It is cleared and the index set to "idx". | |
| 2893 * Return FAIL if it's not possible (out of memory). | |
| 2894 */ | |
| 2895 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2896 push_current_state(int idx) |
| 7 | 2897 { |
| 2898 if (ga_grow(¤t_state, 1) == FAIL) | |
| 2899 return FAIL; | |
| 2900 vim_memset(&CUR_STATE(current_state.ga_len), 0, sizeof(stateitem_T)); | |
| 2901 CUR_STATE(current_state.ga_len).si_idx = idx; | |
| 2902 ++current_state.ga_len; | |
| 2903 return OK; | |
| 2904 } | |
| 2905 | |
| 2906 /* | |
| 2907 * Remove a state from the current_state stack. | |
| 2908 */ | |
| 2909 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2910 pop_current_state(void) |
| 7 | 2911 { |
| 2912 if (current_state.ga_len) | |
| 2913 { | |
| 2914 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch); | |
| 2915 --current_state.ga_len; | |
| 2916 } | |
| 2917 /* after the end of a pattern, try matching a keyword or pattern */ | |
| 2918 next_match_idx = -1; | |
| 2919 | |
| 2920 /* if first state with "keepend" is popped, reset keepend_level */ | |
| 2921 if (keepend_level >= current_state.ga_len) | |
| 2922 keepend_level = -1; | |
| 2923 } | |
| 2924 | |
| 2925 /* | |
| 2926 * Find the end of a start/skip/end syntax region after "startpos". | |
| 2927 * Only checks one line. | |
| 2928 * Also handles a match item that continued from a previous line. | |
| 2929 * If not found, the syntax item continues in the next line. m_endpos->lnum | |
| 2930 * will be 0. | |
| 2931 * If found, the end of the region and the end of the highlighting is | |
| 2932 * computed. | |
| 2933 */ | |
| 2934 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2935 find_endpos( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2936 int idx, /* index of the pattern */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2937 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
|
2938 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
|
2939 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
|
2940 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
|
2941 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
|
2942 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
|
2943 reg_extmatch_T *start_ext) /* submatches from the start pattern */ |
| 7 | 2944 { |
| 2945 colnr_T matchcol; | |
| 2946 synpat_T *spp, *spp_skip; | |
| 2947 int start_idx; | |
| 2948 int best_idx; | |
| 2949 regmmatch_T regmatch; | |
| 2950 regmmatch_T best_regmatch; /* startpos/endpos of best match */ | |
| 2951 lpos_T pos; | |
| 2952 char_u *line; | |
| 2953 int had_match = FALSE; | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
2954 char_u buf_chartab[32]; /* chartab array for syn option iskyeyword */ |
| 7 | 2955 |
| 1371 | 2956 /* just in case we are invoked for a keyword */ |
| 2957 if (idx < 0) | |
| 2958 return; | |
| 2959 | |
| 7 | 2960 /* |
| 2961 * Check for being called with a START pattern. | |
| 2962 * Can happen with a match that continues to the next line, because it | |
| 2963 * contained a region. | |
| 2964 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2965 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2966 if (spp->sp_type != SPTYPE_START) |
| 2967 { | |
| 2968 *hl_endpos = *startpos; | |
| 2969 return; | |
| 2970 } | |
| 2971 | |
| 2972 /* | |
| 2973 * Find the SKIP or first END pattern after the last START pattern. | |
| 2974 */ | |
| 2975 for (;;) | |
| 2976 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
2977 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 2978 if (spp->sp_type != SPTYPE_START) |
| 2979 break; | |
| 2980 ++idx; | |
| 2981 } | |
| 2982 | |
| 2983 /* | |
| 2984 * Lookup the SKIP pattern (if present) | |
| 2985 */ | |
| 2986 if (spp->sp_type == SPTYPE_SKIP) | |
| 2987 { | |
| 2988 spp_skip = spp; | |
| 2989 ++idx; | |
| 2990 } | |
| 2991 else | |
| 2992 spp_skip = NULL; | |
| 2993 | |
| 2994 /* Setup external matches for syn_regexec(). */ | |
| 2995 unref_extmatch(re_extmatch_in); | |
| 2996 re_extmatch_in = ref_extmatch(start_ext); | |
| 2997 | |
| 2998 matchcol = startpos->col; /* start looking for a match at sstart */ | |
| 2999 start_idx = idx; /* remember the first END pattern. */ | |
| 3000 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
|
3001 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3002 /* use syntax iskeyword option */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3003 save_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3004 |
| 7 | 3005 for (;;) |
| 3006 { | |
| 3007 /* | |
| 3008 * Find end pattern that matches first after "matchcol". | |
| 3009 */ | |
| 3010 best_idx = -1; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3011 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx) |
| 7 | 3012 { |
| 3013 int lc_col = matchcol; | |
| 6375 | 3014 int r; |
| 7 | 3015 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3016 spp = &(SYN_ITEMS(syn_block)[idx]); |
| 7 | 3017 if (spp->sp_type != SPTYPE_END) /* past last END pattern */ |
| 3018 break; | |
| 3019 lc_col -= spp->sp_offsets[SPO_LC_OFF]; | |
| 3020 if (lc_col < 0) | |
| 3021 lc_col = 0; | |
| 3022 | |
| 3023 regmatch.rmm_ic = spp->sp_ic; | |
| 3024 regmatch.regprog = spp->sp_prog; | |
| 6375 | 3025 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 3026 IF_SYN_TIME(&spp->sp_time)); | |
| 3027 spp->sp_prog = regmatch.regprog; | |
| 3028 if (r) | |
| 7 | 3029 { |
| 3030 if (best_idx == -1 || regmatch.startpos[0].col | |
| 3031 < best_regmatch.startpos[0].col) | |
| 3032 { | |
| 3033 best_idx = idx; | |
| 3034 best_regmatch.startpos[0] = regmatch.startpos[0]; | |
| 3035 best_regmatch.endpos[0] = regmatch.endpos[0]; | |
| 3036 } | |
| 3037 } | |
| 3038 } | |
| 3039 | |
| 3040 /* | |
| 3041 * If all end patterns have been tried, and there is no match, the | |
| 3042 * item continues until end-of-line. | |
| 3043 */ | |
| 3044 if (best_idx == -1) | |
| 3045 break; | |
| 3046 | |
| 3047 /* | |
| 3048 * If the skip pattern matches before the end pattern, | |
| 3049 * continue searching after the skip pattern. | |
| 3050 */ | |
| 3051 if (spp_skip != NULL) | |
| 3052 { | |
| 3053 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF]; | |
| 6375 | 3054 int r; |
| 7 | 3055 |
| 3056 if (lc_col < 0) | |
| 3057 lc_col = 0; | |
| 3058 regmatch.rmm_ic = spp_skip->sp_ic; | |
| 3059 regmatch.regprog = spp_skip->sp_prog; | |
| 6375 | 3060 r = syn_regexec(®match, startpos->lnum, lc_col, |
| 3061 IF_SYN_TIME(&spp_skip->sp_time)); | |
| 3062 spp_skip->sp_prog = regmatch.regprog; | |
| 3063 if (r && regmatch.startpos[0].col | |
| 7 | 3064 <= best_regmatch.startpos[0].col) |
| 3065 { | |
|
7500
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
3066 int line_len; |
|
ef568437e49a
commit https://github.com/vim/vim/commit/04bff88df6211f64731bf8f5afa088e94496db16
Christian Brabandt <cb@256bit.org>
parents:
7467
diff
changeset
|
3067 |
| 7 | 3068 /* Add offset to skip pattern match */ |
| 3069 syn_add_end_off(&pos, ®match, spp_skip, SPO_ME_OFF, 1); | |
| 3070 | |
| 3071 /* If the skip pattern goes on to the next line, there is no | |
| 3072 * match with an end pattern in this line. */ | |
| 3073 if (pos.lnum > startpos->lnum) | |
| 3074 break; | |
| 3075 | |
| 3076 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
|
3077 line_len = (int)STRLEN(line); |
| 7 | 3078 |
| 3079 /* take care of an empty match or negative offset */ | |
| 3080 if (pos.col <= matchcol) | |
| 3081 ++matchcol; | |
| 3082 else if (pos.col <= regmatch.endpos[0].col) | |
| 3083 matchcol = pos.col; | |
| 3084 else | |
| 3085 /* Be careful not to jump over the NUL at the end-of-line */ | |
| 3086 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
|
3087 matchcol < line_len && matchcol < pos.col; |
| 7 | 3088 ++matchcol) |
| 3089 ; | |
| 3090 | |
| 3091 /* 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
|
3092 if (matchcol >= line_len) |
| 7 | 3093 break; |
| 3094 | |
| 3095 continue; /* start with first end pattern again */ | |
| 3096 } | |
| 3097 } | |
| 3098 | |
| 3099 /* | |
| 3100 * Match from start pattern to end pattern. | |
| 3101 * Correct for match and highlight offset of end pattern. | |
| 3102 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3103 spp = &(SYN_ITEMS(syn_block)[best_idx]); |
| 7 | 3104 syn_add_end_off(m_endpos, &best_regmatch, spp, SPO_ME_OFF, 1); |
| 3105 /* can't end before the start */ | |
| 3106 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col) | |
| 3107 m_endpos->col = startpos->col; | |
| 3108 | |
| 3109 syn_add_end_off(end_endpos, &best_regmatch, spp, SPO_HE_OFF, 1); | |
| 3110 /* can't end before the start */ | |
| 3111 if (end_endpos->lnum == startpos->lnum | |
| 3112 && end_endpos->col < startpos->col) | |
| 3113 end_endpos->col = startpos->col; | |
| 3114 /* can't end after the match */ | |
| 3115 limit_pos(end_endpos, m_endpos); | |
| 3116 | |
| 3117 /* | |
| 3118 * If the end group is highlighted differently, adjust the pointers. | |
| 3119 */ | |
| 3120 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0) | |
| 3121 { | |
| 3122 *end_idx = best_idx; | |
| 3123 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT))) | |
| 3124 { | |
| 3125 hl_endpos->lnum = best_regmatch.endpos[0].lnum; | |
| 3126 hl_endpos->col = best_regmatch.endpos[0].col; | |
| 3127 } | |
| 3128 else | |
| 3129 { | |
| 3130 hl_endpos->lnum = best_regmatch.startpos[0].lnum; | |
| 3131 hl_endpos->col = best_regmatch.startpos[0].col; | |
| 3132 } | |
| 3133 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF]; | |
| 3134 | |
| 3135 /* can't end before the start */ | |
| 3136 if (hl_endpos->lnum == startpos->lnum | |
| 3137 && hl_endpos->col < startpos->col) | |
| 3138 hl_endpos->col = startpos->col; | |
| 3139 limit_pos(hl_endpos, m_endpos); | |
| 3140 | |
| 3141 /* now the match ends where the highlighting ends, it is turned | |
| 3142 * into the matchgroup for the end */ | |
| 3143 *m_endpos = *hl_endpos; | |
| 3144 } | |
| 3145 else | |
| 3146 { | |
| 3147 *end_idx = 0; | |
| 3148 *hl_endpos = *end_endpos; | |
| 3149 } | |
| 3150 | |
| 3151 *flagsp = spp->sp_flags; | |
| 3152 | |
| 3153 had_match = TRUE; | |
| 3154 break; | |
| 3155 } | |
| 3156 | |
| 3157 /* no match for an END pattern in this line */ | |
| 3158 if (!had_match) | |
| 3159 m_endpos->lnum = 0; | |
| 3160 | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3161 restore_chartab(buf_chartab); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3162 |
| 7 | 3163 /* Remove external matches. */ |
| 3164 unref_extmatch(re_extmatch_in); | |
| 3165 re_extmatch_in = NULL; | |
| 3166 } | |
| 3167 | |
| 3168 /* | |
| 3169 * Limit "pos" not to be after "limit". | |
| 3170 */ | |
| 3171 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3172 limit_pos(lpos_T *pos, lpos_T *limit) |
| 7 | 3173 { |
| 3174 if (pos->lnum > limit->lnum) | |
| 3175 *pos = *limit; | |
| 3176 else if (pos->lnum == limit->lnum && pos->col > limit->col) | |
| 3177 pos->col = limit->col; | |
| 3178 } | |
| 3179 | |
| 3180 /* | |
| 3181 * Limit "pos" not to be after "limit", unless pos->lnum is zero. | |
| 3182 */ | |
| 3183 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3184 limit_pos_zero( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3185 lpos_T *pos, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3186 lpos_T *limit) |
| 7 | 3187 { |
| 3188 if (pos->lnum == 0) | |
| 3189 *pos = *limit; | |
| 3190 else | |
| 3191 limit_pos(pos, limit); | |
| 3192 } | |
| 3193 | |
| 3194 /* | |
| 3195 * Add offset to matched text for end of match or highlight. | |
| 3196 */ | |
| 3197 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3198 syn_add_end_off( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3199 lpos_T *result, /* returned position */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3200 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
|
3201 synpat_T *spp, /* matched pattern */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3202 int idx, /* index of offset */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3203 int extra) /* extra chars for offset to start */ |
| 7 | 3204 { |
| 3205 int col; | |
| 1624 | 3206 int off; |
| 3207 char_u *base; | |
| 3208 char_u *p; | |
| 7 | 3209 |
| 3210 if (spp->sp_off_flags & (1 << idx)) | |
| 3211 { | |
| 3212 result->lnum = regmatch->startpos[0].lnum; | |
| 1624 | 3213 col = regmatch->startpos[0].col; |
| 3214 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3215 } |
| 3216 else | |
| 3217 { | |
| 3218 result->lnum = regmatch->endpos[0].lnum; | |
| 3219 col = regmatch->endpos[0].col; | |
| 1624 | 3220 off = spp->sp_offsets[idx]; |
| 3221 } | |
| 3222 /* Don't go past the end of the line. Matters for "rs=e+2" when there | |
| 3223 * is a matchgroup. Watch out for match with last NL in the buffer. */ | |
| 3224 if (result->lnum > syn_buf->b_ml.ml_line_count) | |
| 3225 col = 0; | |
| 3226 else if (off != 0) | |
| 3227 { | |
| 3228 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3229 p = base + col; | |
| 3230 if (off > 0) | |
| 3231 { | |
| 3232 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
|
3233 MB_PTR_ADV(p); |
| 1624 | 3234 } |
| 3235 else if (off < 0) | |
| 3236 { | |
| 3237 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
|
3238 MB_PTR_BACK(base, p); |
| 1624 | 3239 } |
| 3240 col = (int)(p - base); | |
| 3241 } | |
| 3242 result->col = col; | |
| 7 | 3243 } |
| 3244 | |
| 3245 /* | |
| 3246 * Add offset to matched text for start of match or highlight. | |
| 3247 * Avoid resulting column to become negative. | |
| 3248 */ | |
| 3249 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3250 syn_add_start_off( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3251 lpos_T *result, /* returned position */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3252 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
|
3253 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3254 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3255 int extra) /* extra chars for offset to end */ |
| 7 | 3256 { |
| 3257 int col; | |
| 1624 | 3258 int off; |
| 3259 char_u *base; | |
| 3260 char_u *p; | |
| 7 | 3261 |
| 3262 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT))) | |
| 3263 { | |
| 3264 result->lnum = regmatch->endpos[0].lnum; | |
| 1624 | 3265 col = regmatch->endpos[0].col; |
| 3266 off = spp->sp_offsets[idx] + extra; | |
| 7 | 3267 } |
| 3268 else | |
| 3269 { | |
| 3270 result->lnum = regmatch->startpos[0].lnum; | |
| 3271 col = regmatch->startpos[0].col; | |
| 1624 | 3272 off = spp->sp_offsets[idx]; |
| 3273 } | |
|
2092
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3274 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
|
3275 { |
|
98cc757f7e3d
updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
3276 /* 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
|
3277 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
|
3278 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
|
3279 } |
| 1624 | 3280 if (off != 0) |
| 3281 { | |
| 3282 base = ml_get_buf(syn_buf, result->lnum, FALSE); | |
| 3283 p = base + col; | |
| 3284 if (off > 0) | |
| 3285 { | |
| 3286 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
|
3287 MB_PTR_ADV(p); |
| 1624 | 3288 } |
| 3289 else if (off < 0) | |
| 3290 { | |
| 3291 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
|
3292 MB_PTR_BACK(base, p); |
| 1624 | 3293 } |
| 3294 col = (int)(p - base); | |
| 3295 } | |
| 3296 result->col = col; | |
| 7 | 3297 } |
| 3298 | |
| 3299 /* | |
| 3300 * Get current line in syntax buffer. | |
| 3301 */ | |
| 3302 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3303 syn_getcurline(void) |
| 7 | 3304 { |
| 3305 return ml_get_buf(syn_buf, current_lnum, FALSE); | |
| 3306 } | |
| 3307 | |
| 3308 /* | |
| 410 | 3309 * Call vim_regexec() to find a match with "rmp" in "syn_buf". |
| 7 | 3310 * Returns TRUE when there is a match. |
| 3311 */ | |
| 3312 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3313 syn_regexec( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3314 regmmatch_T *rmp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3315 linenr_T lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3316 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3317 syn_time_T *st UNUSED) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3318 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3319 int r; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3320 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3321 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
|
3322 #endif |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3323 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3324 proftime_T pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3325 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3326 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3327 profile_start(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3328 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3329 |
| 410 | 3330 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
|
3331 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
|
3332 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3333 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
|
3334 #else |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3335 NULL, NULL |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3336 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3337 ); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3338 |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
3339 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3340 if (syn_time_on) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3341 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3342 profile_end(&pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3343 profile_add(&st->total, &pt); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3344 if (profile_cmp(&pt, &st->slowest) < 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3345 st->slowest = pt; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3346 ++st->count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3347 if (r > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3348 ++st->match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3349 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3350 #endif |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3351 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3352 if (timed_out) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3353 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
|
3354 #endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3355 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3356 if (r > 0) |
| 7 | 3357 { |
| 3358 rmp->startpos[0].lnum += lnum; | |
| 3359 rmp->endpos[0].lnum += lnum; | |
| 3360 return TRUE; | |
| 3361 } | |
| 3362 return FALSE; | |
| 3363 } | |
| 3364 | |
| 3365 /* | |
| 3366 * Check one position in a line for a matching keyword. | |
| 3367 * 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
|
3368 * Return its ID if found, 0 otherwise. |
| 7 | 3369 */ |
| 3370 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3371 check_keyword_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3372 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3373 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
|
3374 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
|
3375 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
|
3376 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
|
3377 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
|
3378 int *ccharp UNUSED) /* conceal substitution char */ |
| 7 | 3379 { |
| 134 | 3380 keyentry_T *kp; |
| 3381 char_u *kwp; | |
| 7 | 3382 int round; |
| 134 | 3383 int kwlen; |
| 7 | 3384 char_u keyword[MAXKEYWLEN + 1]; /* assume max. keyword len is 80 */ |
| 134 | 3385 hashtab_T *ht; |
| 3386 hashitem_T *hi; | |
| 7 | 3387 |
| 3388 /* Find first character after the keyword. First character was already | |
| 3389 * checked. */ | |
| 134 | 3390 kwp = line + startcol; |
| 3391 kwlen = 0; | |
| 7 | 3392 do |
| 3393 { | |
| 3394 #ifdef FEAT_MBYTE | |
| 3395 if (has_mbyte) | |
| 474 | 3396 kwlen += (*mb_ptr2len)(kwp + kwlen); |
| 7 | 3397 else |
| 3398 #endif | |
| 134 | 3399 ++kwlen; |
| 3400 } | |
| 4043 | 3401 while (vim_iswordp_buf(kwp + kwlen, syn_buf)); |
| 134 | 3402 |
| 3403 if (kwlen > MAXKEYWLEN) | |
| 7 | 3404 return 0; |
| 3405 | |
| 3406 /* | |
| 3407 * Must make a copy of the keyword, so we can add a NUL and make it | |
| 3408 * lowercase. | |
| 3409 */ | |
| 419 | 3410 vim_strncpy(keyword, kwp, kwlen); |
| 7 | 3411 |
| 3412 /* | |
| 3413 * Try twice: | |
| 3414 * 1. matching case | |
| 3415 * 2. ignoring case | |
| 3416 */ | |
| 3417 for (round = 1; round <= 2; ++round) | |
| 3418 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3419 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic; |
| 134 | 3420 if (ht->ht_used == 0) |
| 7 | 3421 continue; |
| 134 | 3422 if (round == 2) /* ignore case */ |
| 3423 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1); | |
| 7 | 3424 |
| 3425 /* | |
| 134 | 3426 * Find keywords that match. There can be several with different |
| 3427 * attributes. | |
| 7 | 3428 * When current_next_list is non-zero accept only that group, otherwise: |
| 3429 * Accept a not-contained keyword at toplevel. | |
| 3430 * Accept a keyword at other levels only if it is in the contains list. | |
| 3431 */ | |
| 134 | 3432 hi = hash_find(ht, keyword); |
| 3433 if (!HASHITEM_EMPTY(hi)) | |
| 3434 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next) | |
| 7 | 3435 { |
| 134 | 3436 if (current_next_list != 0 |
| 3437 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0) | |
| 3438 : (cur_si == NULL | |
| 3439 ? !(kp->flags & HL_CONTAINED) | |
| 3440 : in_id_list(cur_si, cur_si->si_cont_list, | |
| 3441 &kp->k_syn, kp->flags & HL_CONTAINED))) | |
| 3442 { | |
| 3443 *endcolp = startcol + kwlen; | |
| 3444 *flagsp = kp->flags; | |
| 3445 *next_listp = kp->next_list; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3446 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3447 *ccharp = kp->k_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3448 #endif |
| 134 | 3449 return kp->k_syn.id; |
| 3450 } | |
| 7 | 3451 } |
| 3452 } | |
| 3453 return 0; | |
| 3454 } | |
| 3455 | |
| 3456 /* | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3457 * Handle ":syntax conceal" command. |
|
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 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3460 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
|
3461 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3462 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3463 char_u *arg = eap->arg; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3464 char_u *next; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3465 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3466 eap->nextcmd = find_nextcmd(arg); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3467 if (eap->skip) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3468 return; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3469 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3470 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
|
3471 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
|
3472 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3473 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
|
3474 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
|
3475 else |
|
11514
7c42cf66d5be
patch 8.0.0640: mismatch between help and actual message
Christian Brabandt <cb@256bit.org>
parents:
11465
diff
changeset
|
3476 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
|
3477 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3478 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
|
3479 curwin->w_s->b_syn_conceal = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3480 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
|
3481 curwin->w_s->b_syn_conceal = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3482 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3483 EMSG2(_("E390: Illegal argument: %s"), arg); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3484 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3485 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3486 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3487 /* |
| 7 | 3488 * Handle ":syntax case" command. |
| 3489 */ | |
| 3490 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3491 syn_cmd_case(exarg_T *eap, int syncing UNUSED) |
| 7 | 3492 { |
| 3493 char_u *arg = eap->arg; | |
| 3494 char_u *next; | |
| 3495 | |
| 3496 eap->nextcmd = find_nextcmd(arg); | |
| 3497 if (eap->skip) | |
| 3498 return; | |
| 3499 | |
| 3500 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
|
3501 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
|
3502 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3503 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
|
3504 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
|
3505 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3506 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
|
3507 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3508 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
|
3509 curwin->w_s->b_syn_ic = FALSE; |
| 7 | 3510 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
|
3511 curwin->w_s->b_syn_ic = TRUE; |
| 7 | 3512 else |
| 3513 EMSG2(_("E390: Illegal argument: %s"), arg); | |
| 3514 } | |
| 3515 | |
| 3516 /* | |
| 419 | 3517 * Handle ":syntax spell" command. |
| 3518 */ | |
| 3519 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3520 syn_cmd_spell(exarg_T *eap, int syncing UNUSED) |
| 419 | 3521 { |
| 3522 char_u *arg = eap->arg; | |
| 3523 char_u *next; | |
| 3524 | |
| 3525 eap->nextcmd = find_nextcmd(arg); | |
| 3526 if (eap->skip) | |
| 3527 return; | |
| 3528 | |
| 3529 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
|
3530 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
|
3531 { |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3532 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
|
3533 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
|
3534 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
|
3535 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
|
3536 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3537 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
|
3538 } |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
3539 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
|
3540 curwin->w_s->b_syn_spell = SYNSPL_TOP; |
| 419 | 3541 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
|
3542 curwin->w_s->b_syn_spell = SYNSPL_NOTOP; |
| 1064 | 3543 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
|
3544 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT; |
| 419 | 3545 else |
| 6880 | 3546 { |
| 419 | 3547 EMSG2(_("E390: Illegal argument: %s"), arg); |
| 6880 | 3548 return; |
| 3549 } | |
| 3550 | |
| 3551 /* assume spell checking changed, force a redraw */ | |
| 3552 redraw_win_later(curwin, NOT_VALID); | |
| 419 | 3553 } |
| 3554 | |
| 3555 /* | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3556 * Handle ":syntax iskeyword" command. |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3557 */ |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3558 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3559 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
|
3560 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3561 char_u *arg = eap->arg; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3562 char_u save_chartab[32]; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3563 char_u *save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3564 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3565 if (eap->skip) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3566 return; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3567 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3568 arg = skipwhite(arg); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3569 if (*arg == NUL) |
|
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 MSG_PUTS("\n"); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3572 MSG_PUTS(_("syntax iskeyword ")); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3573 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
|
3574 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
|
3575 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3576 msg_outtrans((char_u *)"not set"); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3577 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3578 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3579 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3580 if (STRNICMP(arg, "clear", 5) == 0) |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3581 { |
|
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 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
|
3585 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3586 else |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3587 { |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3588 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
|
3589 save_isk = curbuf->b_p_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3590 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
|
3591 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3592 buf_init_chartab(curbuf, FALSE); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3593 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
|
3594 (size_t)32); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3595 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
|
3596 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
|
3597 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
|
3598 curbuf->b_p_isk = save_isk; |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3599 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3600 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3601 redraw_win_later(curwin, NOT_VALID); |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3602 } |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3603 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3604 /* |
| 7 | 3605 * Clear all syntax info for one buffer. |
| 3606 */ | |
| 3607 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3608 syntax_clear(synblock_T *block) |
| 7 | 3609 { |
| 3610 int i; | |
| 3611 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3612 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
|
3613 #ifdef FEAT_RELTIME |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3614 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
|
3615 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3616 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
|
3617 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
|
3618 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
|
3619 #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
|
3620 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
|
3621 #endif |
| 7 | 3622 |
| 3623 /* free the keywords */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3624 clear_keywtab(&block->b_keywtab); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3625 clear_keywtab(&block->b_keywtab_ic); |
| 7 | 3626 |
| 3627 /* free the syntax patterns */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3628 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
|
3629 syn_clear_pattern(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3630 ga_clear(&block->b_syn_patterns); |
| 7 | 3631 |
| 3632 /* free the syntax clusters */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3633 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
|
3634 syn_clear_cluster(block, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3635 ga_clear(&block->b_syn_clusters); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3636 block->b_spell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3637 block->b_nospell_cluster_id = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3638 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3639 block->b_syn_sync_flags = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3640 block->b_syn_sync_minlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3641 block->b_syn_sync_maxlines = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3642 block->b_syn_sync_linebreaks = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3643 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3644 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
|
3645 block->b_syn_linecont_prog = NULL; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3646 VIM_CLEAR(block->b_syn_linecont_pat); |
| 7 | 3647 #ifdef FEAT_FOLDING |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3648 block->b_syn_folditems = 0; |
| 7 | 3649 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3650 clear_string_option(&block->b_syn_isk); |
| 7 | 3651 |
| 3652 /* free the stored states */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3653 syn_stack_free_all(block); |
| 7 | 3654 invalidate_current_state(); |
| 2743 | 3655 |
| 3656 /* Reset the counter for ":syn include" */ | |
| 3657 running_syn_inc_tag = 0; | |
| 7 | 3658 } |
| 3659 | |
| 3660 /* | |
|
2253
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3661 * 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
|
3662 */ |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3663 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3664 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
|
3665 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3666 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
|
3667 { |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3668 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
|
3669 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
|
3670 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
|
3671 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3672 } |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3673 |
|
12ebd6f6dfce
Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents:
2252
diff
changeset
|
3674 /* |
| 7 | 3675 * Clear syncing info for one buffer. |
| 3676 */ | |
| 3677 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3678 syntax_sync_clear(void) |
| 7 | 3679 { |
| 3680 int i; | |
| 3681 | |
| 3682 /* free the syntax patterns */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3683 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
|
3684 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
|
3685 syn_remove_pattern(curwin->w_s, i); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3686 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3687 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
|
3688 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
|
3689 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
|
3690 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
|
3691 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
3692 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
|
3693 curwin->w_s->b_syn_linecont_prog = NULL; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3694 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat); |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3695 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
|
3696 |
|
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
3697 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 3698 } |
| 3699 | |
| 3700 /* | |
| 3701 * Remove one pattern from the buffer's pattern list. | |
| 3702 */ | |
| 3703 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3704 syn_remove_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3705 synblock_T *block, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3706 int idx) |
| 7 | 3707 { |
| 3708 synpat_T *spp; | |
| 3709 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3710 spp = &(SYN_ITEMS(block)[idx]); |
| 7 | 3711 #ifdef FEAT_FOLDING |
| 3712 if (spp->sp_flags & HL_FOLD) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3713 --block->b_syn_folditems; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3714 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3715 syn_clear_pattern(block, idx); |
| 7 | 3716 mch_memmove(spp, spp + 1, |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3717 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
|
3718 --block->b_syn_patterns.ga_len; |
| 7 | 3719 } |
| 3720 | |
| 3721 /* | |
| 3722 * Clear and free one syntax pattern. When clearing all, must be called from | |
| 3723 * last to first! | |
| 3724 */ | |
| 3725 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3726 syn_clear_pattern(synblock_T *block, int i) |
| 7 | 3727 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3728 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
|
3729 vim_regfree(SYN_ITEMS(block)[i].sp_prog); |
| 7 | 3730 /* 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
|
3731 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
|
3732 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3733 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
|
3734 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
|
3735 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list); |
| 7 | 3736 } |
| 3737 } | |
| 3738 | |
| 3739 /* | |
| 3740 * Clear and free one syntax cluster. | |
| 3741 */ | |
| 3742 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3743 syn_clear_cluster(synblock_T *block, int i) |
| 7 | 3744 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3745 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
|
3746 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
|
3747 vim_free(SYN_CLSTR(block)[i].scl_list); |
| 7 | 3748 } |
| 3749 | |
| 3750 /* | |
| 3751 * Handle ":syntax clear" command. | |
| 3752 */ | |
| 3753 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3754 syn_cmd_clear(exarg_T *eap, int syncing) |
| 7 | 3755 { |
| 3756 char_u *arg = eap->arg; | |
| 3757 char_u *arg_end; | |
| 3758 int id; | |
| 3759 | |
| 3760 eap->nextcmd = find_nextcmd(arg); | |
| 3761 if (eap->skip) | |
| 3762 return; | |
| 3763 | |
| 3764 /* | |
| 3765 * We have to disable this within ":syn include @group filename", | |
| 3766 * because otherwise @group would get deleted. | |
| 3767 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn | |
| 3768 * clear". | |
| 3769 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3770 if (curwin->w_s->b_syn_topgrp != 0) |
| 7 | 3771 return; |
| 3772 | |
| 3773 if (ends_excmd(*arg)) | |
| 3774 { | |
| 3775 /* | |
| 3776 * No argument: Clear all syntax items. | |
| 3777 */ | |
| 3778 if (syncing) | |
| 3779 syntax_sync_clear(); | |
| 3780 else | |
| 3781 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3782 syntax_clear(curwin->w_s); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3783 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
|
3784 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
3785 do_unlet((char_u *)"w:current_syntax", TRUE); |
| 7 | 3786 } |
| 3787 } | |
| 3788 else | |
| 3789 { | |
| 3790 /* | |
| 3791 * Clear the group IDs that are in the argument. | |
| 3792 */ | |
| 3793 while (!ends_excmd(*arg)) | |
| 3794 { | |
| 3795 arg_end = skiptowhite(arg); | |
| 3796 if (*arg == '@') | |
| 3797 { | |
| 3798 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 3799 if (id == 0) | |
| 3800 { | |
| 3801 EMSG2(_("E391: No such syntax cluster: %s"), arg); | |
| 3802 break; | |
| 3803 } | |
| 3804 else | |
| 3805 { | |
| 3806 /* | |
| 3807 * We can't physically delete a cluster without changing | |
| 3808 * the IDs of other clusters, so we do the next best thing | |
| 3809 * and make it empty. | |
| 3810 */ | |
| 3811 short scl_id = id - SYNID_CLUSTER; | |
| 3812 | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
3813 VIM_CLEAR(SYN_CLSTR(curwin->w_s)[scl_id].scl_list); |
| 7 | 3814 } |
| 3815 } | |
| 3816 else | |
| 3817 { | |
| 3818 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 3819 if (id == 0) | |
| 3820 { | |
| 3821 EMSG2(_(e_nogroup), arg); | |
| 3822 break; | |
| 3823 } | |
| 3824 else | |
| 3825 syn_clear_one(id, syncing); | |
| 3826 } | |
| 3827 arg = skipwhite(arg_end); | |
| 3828 } | |
| 3829 } | |
| 745 | 3830 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3831 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 3832 } |
| 3833 | |
| 3834 /* | |
| 3835 * Clear one syntax group for the current buffer. | |
| 3836 */ | |
| 3837 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3838 syn_clear_one(int id, int syncing) |
| 7 | 3839 { |
| 3840 synpat_T *spp; | |
| 3841 int idx; | |
| 3842 | |
| 3843 /* Clear keywords only when not ":syn sync clear group-name" */ | |
| 3844 if (!syncing) | |
| 3845 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3846 (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
|
3847 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic); |
| 7 | 3848 } |
| 3849 | |
| 3850 /* clear the patterns for "id" */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3851 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
|
3852 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3853 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 3854 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 3855 continue; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3856 syn_remove_pattern(curwin->w_s, idx); |
| 7 | 3857 } |
| 3858 } | |
| 3859 | |
| 3860 /* | |
| 3861 * Handle ":syntax on" command. | |
| 3862 */ | |
| 3863 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3864 syn_cmd_on(exarg_T *eap, int syncing UNUSED) |
| 7 | 3865 { |
| 3866 syn_cmd_onoff(eap, "syntax"); | |
| 3867 } | |
| 3868 | |
| 3869 /* | |
| 3870 * Handle ":syntax enable" command. | |
| 3871 */ | |
| 3872 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3873 syn_cmd_enable(exarg_T *eap, int syncing UNUSED) |
| 7 | 3874 { |
| 3875 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable"); | |
| 3876 syn_cmd_onoff(eap, "syntax"); | |
| 148 | 3877 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3878 } |
| 3879 | |
| 3880 /* | |
| 3881 * Handle ":syntax reset" command. | |
|
8815
50d9fb580ffe
commit https://github.com/vim/vim/commit/8bc189e81aa98ba4aebb03a9dc9527a210fce816
Christian Brabandt <cb@256bit.org>
parents:
8806
diff
changeset
|
3882 * It actually resets highlighting, not syntax. |
| 7 | 3883 */ |
| 3884 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3885 syn_cmd_reset(exarg_T *eap, int syncing UNUSED) |
| 7 | 3886 { |
| 3887 eap->nextcmd = check_nextcmd(eap->arg); | |
| 3888 if (!eap->skip) | |
| 3889 { | |
| 3890 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset"); | |
| 3891 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim"); | |
| 148 | 3892 do_unlet((char_u *)"g:syntax_cmd", TRUE); |
| 7 | 3893 } |
| 3894 } | |
| 3895 | |
| 3896 /* | |
| 3897 * Handle ":syntax manual" command. | |
| 3898 */ | |
| 3899 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3900 syn_cmd_manual(exarg_T *eap, int syncing UNUSED) |
| 7 | 3901 { |
| 3902 syn_cmd_onoff(eap, "manual"); | |
| 3903 } | |
| 3904 | |
| 3905 /* | |
| 3906 * Handle ":syntax off" command. | |
| 3907 */ | |
| 3908 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3909 syn_cmd_off(exarg_T *eap, int syncing UNUSED) |
| 7 | 3910 { |
| 3911 syn_cmd_onoff(eap, "nosyntax"); | |
| 3912 } | |
| 3913 | |
| 3914 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3915 syn_cmd_onoff(exarg_T *eap, char *name) |
| 7 | 3916 { |
| 3917 char_u buf[100]; | |
| 3918 | |
| 3919 eap->nextcmd = check_nextcmd(eap->arg); | |
| 3920 if (!eap->skip) | |
| 3921 { | |
| 3922 STRCPY(buf, "so "); | |
| 274 | 3923 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name); |
| 7 | 3924 do_cmdline_cmd(buf); |
| 3925 } | |
| 3926 } | |
| 3927 | |
| 3928 /* | |
| 3929 * Handle ":syntax [list]" command: list current syntax words. | |
| 3930 */ | |
| 3931 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3932 syn_cmd_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3933 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3934 int syncing) /* when TRUE: list syncing items */ |
| 7 | 3935 { |
| 3936 char_u *arg = eap->arg; | |
| 3937 int id; | |
| 3938 char_u *arg_end; | |
| 3939 | |
| 3940 eap->nextcmd = find_nextcmd(arg); | |
| 3941 if (eap->skip) | |
| 3942 return; | |
| 3943 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3944 if (!syntax_present(curwin)) |
| 7 | 3945 { |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3946 MSG(_(msg_no_items)); |
| 7 | 3947 return; |
| 3948 } | |
| 3949 | |
| 3950 if (syncing) | |
| 3951 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3952 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT) |
| 7 | 3953 { |
| 3954 MSG_PUTS(_("syncing on C-style comments")); | |
| 3955 syn_lines_msg(); | |
| 3956 syn_match_msg(); | |
| 3957 return; | |
| 3958 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3959 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
|
3960 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3961 if (curwin->w_s->b_syn_sync_minlines == 0) |
| 7 | 3962 MSG_PUTS(_("no syncing")); |
| 3963 else | |
| 3964 { | |
| 3965 MSG_PUTS(_("syncing starts ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3966 msg_outnum(curwin->w_s->b_syn_sync_minlines); |
| 7 | 3967 MSG_PUTS(_(" lines before top line")); |
| 3968 syn_match_msg(); | |
| 3969 } | |
| 3970 return; | |
| 3971 } | |
| 3972 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
|
3973 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
|
3974 || 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
|
3975 || curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 3976 { |
| 3977 MSG_PUTS(_("\nsyncing on items")); | |
| 3978 syn_lines_msg(); | |
| 3979 syn_match_msg(); | |
| 3980 } | |
| 3981 } | |
| 3982 else | |
| 3983 MSG_PUTS_TITLE(_("\n--- Syntax items ---")); | |
| 3984 if (ends_excmd(*arg)) | |
| 3985 { | |
| 3986 /* | |
| 3987 * No argument: List all group IDs and all syntax clusters. | |
| 3988 */ | |
| 3989 for (id = 1; id <= highlight_ga.ga_len && !got_int; ++id) | |
| 3990 syn_list_one(id, syncing, FALSE); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
3991 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id) |
| 7 | 3992 syn_list_cluster(id); |
| 3993 } | |
| 3994 else | |
| 3995 { | |
| 3996 /* | |
| 3997 * List the group IDs and syntax clusters that are in the argument. | |
| 3998 */ | |
| 3999 while (!ends_excmd(*arg) && !got_int) | |
| 4000 { | |
| 4001 arg_end = skiptowhite(arg); | |
| 4002 if (*arg == '@') | |
| 4003 { | |
| 4004 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1)); | |
| 4005 if (id == 0) | |
| 4006 EMSG2(_("E392: No such syntax cluster: %s"), arg); | |
| 4007 else | |
| 4008 syn_list_cluster(id - SYNID_CLUSTER); | |
| 4009 } | |
| 4010 else | |
| 4011 { | |
| 4012 id = syn_namen2id(arg, (int)(arg_end - arg)); | |
| 4013 if (id == 0) | |
| 4014 EMSG2(_(e_nogroup), arg); | |
| 4015 else | |
| 4016 syn_list_one(id, syncing, TRUE); | |
| 4017 } | |
| 4018 arg = skipwhite(arg_end); | |
| 4019 } | |
| 4020 } | |
| 4021 eap->nextcmd = check_nextcmd(arg); | |
| 4022 } | |
| 4023 | |
| 4024 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4025 syn_lines_msg(void) |
| 7 | 4026 { |
|
2250
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 > 0 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4028 || curwin->w_s->b_syn_sync_minlines > 0) |
| 7 | 4029 { |
| 4030 MSG_PUTS("; "); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4031 if (curwin->w_s->b_syn_sync_minlines > 0) |
| 7 | 4032 { |
| 4033 MSG_PUTS(_("minimal ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4034 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
|
4035 if (curwin->w_s->b_syn_sync_maxlines) |
| 7 | 4036 MSG_PUTS(", "); |
| 4037 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4038 if (curwin->w_s->b_syn_sync_maxlines > 0) |
| 7 | 4039 { |
| 4040 MSG_PUTS(_("maximal ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4041 msg_outnum(curwin->w_s->b_syn_sync_maxlines); |
| 7 | 4042 } |
| 4043 MSG_PUTS(_(" lines before top line")); | |
| 4044 } | |
| 4045 } | |
| 4046 | |
| 4047 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4048 syn_match_msg(void) |
| 7 | 4049 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4050 if (curwin->w_s->b_syn_sync_linebreaks > 0) |
| 7 | 4051 { |
| 4052 MSG_PUTS(_("; match ")); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4053 msg_outnum(curwin->w_s->b_syn_sync_linebreaks); |
| 7 | 4054 MSG_PUTS(_(" line breaks")); |
| 4055 } | |
| 4056 } | |
| 4057 | |
| 4058 static int last_matchgroup; | |
| 4059 | |
| 4060 struct name_list | |
| 4061 { | |
| 4062 int flag; | |
| 4063 char *name; | |
| 4064 }; | |
| 4065 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
4066 static void syn_list_flags(struct name_list *nl, int flags, int attr); |
| 7 | 4067 |
| 4068 /* | |
| 4069 * List one syntax item, for ":syntax" or "syntax list syntax_name". | |
| 4070 */ | |
| 4071 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4072 syn_list_one( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4073 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4074 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
|
4075 int link_only) /* when TRUE; list link-only too */ |
| 7 | 4076 { |
| 4077 int attr; | |
| 4078 int idx; | |
| 4079 int did_header = FALSE; | |
| 4080 synpat_T *spp; | |
| 4081 static struct name_list namelist1[] = | |
| 4082 { | |
| 4083 {HL_DISPLAY, "display"}, | |
| 4084 {HL_CONTAINED, "contained"}, | |
| 4085 {HL_ONELINE, "oneline"}, | |
| 4086 {HL_KEEPEND, "keepend"}, | |
| 4087 {HL_EXTEND, "extend"}, | |
| 4088 {HL_EXCLUDENL, "excludenl"}, | |
| 4089 {HL_TRANSP, "transparent"}, | |
| 4090 {HL_FOLD, "fold"}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4091 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4092 {HL_CONCEAL, "conceal"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4093 {HL_CONCEALENDS, "concealends"}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4094 #endif |
| 7 | 4095 {0, NULL} |
| 4096 }; | |
| 4097 static struct name_list namelist2[] = | |
| 4098 { | |
| 4099 {HL_SKIPWHITE, "skipwhite"}, | |
| 4100 {HL_SKIPNL, "skipnl"}, | |
| 4101 {HL_SKIPEMPTY, "skipempty"}, | |
| 4102 {0, NULL} | |
| 4103 }; | |
| 4104 | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4105 attr = HL_ATTR(HLF_D); /* highlight like directories */ |
| 7 | 4106 |
| 4107 /* list the keywords for "id" */ | |
| 4108 if (!syncing) | |
| 4109 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4110 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
|
4111 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic, |
| 7 | 4112 did_header, attr); |
| 4113 } | |
| 4114 | |
| 4115 /* list the patterns for "id" */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4116 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
|
4117 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4118 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
| 7 | 4119 if (spp->sp_syn.id != id || spp->sp_syncing != syncing) |
| 4120 continue; | |
| 4121 | |
| 4122 (void)syn_list_header(did_header, 999, id); | |
| 4123 did_header = TRUE; | |
| 4124 last_matchgroup = 0; | |
| 4125 if (spp->sp_type == SPTYPE_MATCH) | |
| 4126 { | |
| 4127 put_pattern("match", ' ', spp, attr); | |
| 4128 msg_putchar(' '); | |
| 4129 } | |
| 4130 else if (spp->sp_type == SPTYPE_START) | |
| 4131 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4132 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
|
4133 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
|
4134 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
|
4135 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
|
4136 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
|
4137 && 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
|
4138 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr); |
| 7 | 4139 --idx; |
| 4140 msg_putchar(' '); | |
| 4141 } | |
| 4142 syn_list_flags(namelist1, spp->sp_flags, attr); | |
| 4143 | |
| 4144 if (spp->sp_cont_list != NULL) | |
| 4145 put_id_list((char_u *)"contains", spp->sp_cont_list, attr); | |
| 4146 | |
| 4147 if (spp->sp_syn.cont_in_list != NULL) | |
| 4148 put_id_list((char_u *)"containedin", | |
| 4149 spp->sp_syn.cont_in_list, attr); | |
| 4150 | |
| 4151 if (spp->sp_next_list != NULL) | |
| 4152 { | |
| 4153 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr); | |
| 4154 syn_list_flags(namelist2, spp->sp_flags, attr); | |
| 4155 } | |
| 4156 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE)) | |
| 4157 { | |
| 4158 if (spp->sp_flags & HL_SYNC_HERE) | |
| 4159 msg_puts_attr((char_u *)"grouphere", attr); | |
| 4160 else | |
| 4161 msg_puts_attr((char_u *)"groupthere", attr); | |
| 4162 msg_putchar(' '); | |
| 4163 if (spp->sp_sync_idx >= 0) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4164 msg_outtrans(HL_TABLE()[SYN_ITEMS(curwin->w_s) |
| 7 | 4165 [spp->sp_sync_idx].sp_syn.id - 1].sg_name); |
| 4166 else | |
| 4167 MSG_PUTS("NONE"); | |
| 4168 msg_putchar(' '); | |
| 4169 } | |
| 4170 } | |
| 4171 | |
| 4172 /* list the link, if there is one */ | |
| 4173 if (HL_TABLE()[id - 1].sg_link && (did_header || link_only) && !got_int) | |
| 4174 { | |
| 4175 (void)syn_list_header(did_header, 999, id); | |
| 4176 msg_puts_attr((char_u *)"links to", attr); | |
| 4177 msg_putchar(' '); | |
| 4178 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name); | |
| 4179 } | |
| 4180 } | |
| 4181 | |
| 4182 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4183 syn_list_flags(struct name_list *nlist, int flags, int attr) |
| 7 | 4184 { |
| 4185 int i; | |
| 4186 | |
| 3263 | 4187 for (i = 0; nlist[i].flag != 0; ++i) |
| 4188 if (flags & nlist[i].flag) | |
| 4189 { | |
| 4190 msg_puts_attr((char_u *)nlist[i].name, attr); | |
| 7 | 4191 msg_putchar(' '); |
| 4192 } | |
| 4193 } | |
| 4194 | |
| 4195 /* | |
| 4196 * List one syntax cluster, for ":syntax" or "syntax list syntax_name". | |
| 4197 */ | |
| 4198 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4199 syn_list_cluster(int id) |
| 7 | 4200 { |
| 4201 int endcol = 15; | |
| 4202 | |
| 4203 /* slight hack: roughly duplicate the guts of syn_list_header() */ | |
| 4204 msg_putchar('\n'); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4205 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name); |
| 7 | 4206 |
| 4207 if (msg_col >= endcol) /* output at least one space */ | |
| 4208 endcol = msg_col + 1; | |
| 4209 if (Columns <= endcol) /* avoid hang for tiny window */ | |
| 4210 endcol = Columns - 1; | |
| 4211 | |
| 4212 msg_advance(endcol); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4213 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
|
4214 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4215 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
|
4216 HL_ATTR(HLF_D)); |
| 7 | 4217 } |
| 4218 else | |
| 4219 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4220 msg_puts_attr((char_u *)"cluster", HL_ATTR(HLF_D)); |
| 7 | 4221 msg_puts((char_u *)"=NONE"); |
| 4222 } | |
| 4223 } | |
| 4224 | |
| 4225 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4226 put_id_list(char_u *name, short *list, int attr) |
| 7 | 4227 { |
| 4228 short *p; | |
| 4229 | |
| 4230 msg_puts_attr(name, attr); | |
| 4231 msg_putchar('='); | |
| 4232 for (p = list; *p; ++p) | |
| 4233 { | |
| 4234 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP) | |
| 4235 { | |
| 4236 if (p[1]) | |
| 4237 MSG_PUTS("ALLBUT"); | |
| 4238 else | |
| 4239 MSG_PUTS("ALL"); | |
| 4240 } | |
| 4241 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED) | |
| 4242 { | |
| 4243 MSG_PUTS("TOP"); | |
| 4244 } | |
| 4245 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER) | |
| 4246 { | |
| 4247 MSG_PUTS("CONTAINED"); | |
| 4248 } | |
| 4249 else if (*p >= SYNID_CLUSTER) | |
| 4250 { | |
| 4251 short scl_id = *p - SYNID_CLUSTER; | |
| 4252 | |
| 4253 msg_putchar('@'); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4254 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name); |
| 7 | 4255 } |
| 4256 else | |
| 4257 msg_outtrans(HL_TABLE()[*p - 1].sg_name); | |
| 4258 if (p[1]) | |
| 4259 msg_putchar(','); | |
| 4260 } | |
| 4261 msg_putchar(' '); | |
| 4262 } | |
| 4263 | |
| 4264 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4265 put_pattern( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4266 char *s, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4267 int c, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4268 synpat_T *spp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4269 int attr) |
| 7 | 4270 { |
| 4271 long n; | |
| 4272 int mask; | |
| 4273 int first; | |
| 4274 static char *sepchars = "/+=-#@\"|'^&"; | |
| 4275 int i; | |
| 4276 | |
| 4277 /* May have to write "matchgroup=group" */ | |
| 4278 if (last_matchgroup != spp->sp_syn_match_id) | |
| 4279 { | |
| 4280 last_matchgroup = spp->sp_syn_match_id; | |
| 4281 msg_puts_attr((char_u *)"matchgroup", attr); | |
| 4282 msg_putchar('='); | |
| 4283 if (last_matchgroup == 0) | |
| 4284 msg_outtrans((char_u *)"NONE"); | |
| 4285 else | |
| 4286 msg_outtrans(HL_TABLE()[last_matchgroup - 1].sg_name); | |
| 4287 msg_putchar(' '); | |
| 4288 } | |
| 4289 | |
| 4290 /* output the name of the pattern and an '=' or ' ' */ | |
| 4291 msg_puts_attr((char_u *)s, attr); | |
| 4292 msg_putchar(c); | |
| 4293 | |
| 4294 /* output the pattern, in between a char that is not in the pattern */ | |
| 4295 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; ) | |
| 4296 if (sepchars[++i] == NUL) | |
| 4297 { | |
| 4298 i = 0; /* no good char found, just use the first one */ | |
| 4299 break; | |
| 4300 } | |
| 4301 msg_putchar(sepchars[i]); | |
| 4302 msg_outtrans(spp->sp_pattern); | |
| 4303 msg_putchar(sepchars[i]); | |
| 4304 | |
| 4305 /* output any pattern options */ | |
| 4306 first = TRUE; | |
| 4307 for (i = 0; i < SPO_COUNT; ++i) | |
| 4308 { | |
| 4309 mask = (1 << i); | |
| 4310 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT))) | |
| 4311 { | |
| 4312 if (!first) | |
| 4313 msg_putchar(','); /* separate with commas */ | |
| 4314 msg_puts((char_u *)spo_name_tab[i]); | |
| 4315 n = spp->sp_offsets[i]; | |
| 4316 if (i != SPO_LC_OFF) | |
| 4317 { | |
| 4318 if (spp->sp_off_flags & mask) | |
| 4319 msg_putchar('s'); | |
| 4320 else | |
| 4321 msg_putchar('e'); | |
| 4322 if (n > 0) | |
| 4323 msg_putchar('+'); | |
| 4324 } | |
| 4325 if (n || i == SPO_LC_OFF) | |
| 4326 msg_outnum(n); | |
| 4327 first = FALSE; | |
| 4328 } | |
| 4329 } | |
| 4330 msg_putchar(' '); | |
| 4331 } | |
| 4332 | |
| 4333 /* | |
| 4334 * List or clear the keywords for one syntax group. | |
| 4335 * Return TRUE if the header has been printed. | |
| 4336 */ | |
| 4337 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4338 syn_list_keywords( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4339 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4340 hashtab_T *ht, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4341 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
|
4342 int attr) |
| 7 | 4343 { |
| 4344 int outlen; | |
| 134 | 4345 hashitem_T *hi; |
| 4346 keyentry_T *kp; | |
| 4347 int todo; | |
| 7 | 4348 int prev_contained = 0; |
| 4349 short *prev_next_list = NULL; | |
| 4350 short *prev_cont_in_list = NULL; | |
| 4351 int prev_skipnl = 0; | |
| 4352 int prev_skipwhite = 0; | |
| 4353 int prev_skipempty = 0; | |
| 4354 | |
| 4355 /* | |
| 4356 * Unfortunately, this list of keywords is not sorted on alphabet but on | |
| 4357 * hash value... | |
| 4358 */ | |
| 835 | 4359 todo = (int)ht->ht_used; |
| 134 | 4360 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi) |
| 4361 { | |
| 4362 if (!HASHITEM_EMPTY(hi)) | |
| 4363 { | |
| 4364 --todo; | |
| 4365 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next) | |
| 7 | 4366 { |
| 134 | 4367 if (kp->k_syn.id == id) |
| 7 | 4368 { |
| 134 | 4369 if (prev_contained != (kp->flags & HL_CONTAINED) |
| 4370 || prev_skipnl != (kp->flags & HL_SKIPNL) | |
| 4371 || prev_skipwhite != (kp->flags & HL_SKIPWHITE) | |
| 4372 || prev_skipempty != (kp->flags & HL_SKIPEMPTY) | |
| 4373 || prev_cont_in_list != kp->k_syn.cont_in_list | |
| 4374 || prev_next_list != kp->next_list) | |
| 4375 outlen = 9999; | |
| 4376 else | |
| 4377 outlen = (int)STRLEN(kp->keyword); | |
| 4378 /* output "contained" and "nextgroup" on each line */ | |
| 4379 if (syn_list_header(did_header, outlen, id)) | |
| 4380 { | |
| 4381 prev_contained = 0; | |
| 4382 prev_next_list = NULL; | |
| 4383 prev_cont_in_list = NULL; | |
| 4384 prev_skipnl = 0; | |
| 4385 prev_skipwhite = 0; | |
| 4386 prev_skipempty = 0; | |
| 4387 } | |
| 4388 did_header = TRUE; | |
| 4389 if (prev_contained != (kp->flags & HL_CONTAINED)) | |
| 4390 { | |
| 4391 msg_puts_attr((char_u *)"contained", attr); | |
| 4392 msg_putchar(' '); | |
| 4393 prev_contained = (kp->flags & HL_CONTAINED); | |
| 4394 } | |
| 4395 if (kp->k_syn.cont_in_list != prev_cont_in_list) | |
| 4396 { | |
| 4397 put_id_list((char_u *)"containedin", | |
| 4398 kp->k_syn.cont_in_list, attr); | |
| 4399 msg_putchar(' '); | |
| 4400 prev_cont_in_list = kp->k_syn.cont_in_list; | |
| 4401 } | |
| 4402 if (kp->next_list != prev_next_list) | |
| 4403 { | |
| 4404 put_id_list((char_u *)"nextgroup", kp->next_list, attr); | |
| 4405 msg_putchar(' '); | |
| 4406 prev_next_list = kp->next_list; | |
| 4407 if (kp->flags & HL_SKIPNL) | |
| 4408 { | |
| 4409 msg_puts_attr((char_u *)"skipnl", attr); | |
| 4410 msg_putchar(' '); | |
| 4411 prev_skipnl = (kp->flags & HL_SKIPNL); | |
| 4412 } | |
| 4413 if (kp->flags & HL_SKIPWHITE) | |
| 4414 { | |
| 4415 msg_puts_attr((char_u *)"skipwhite", attr); | |
| 4416 msg_putchar(' '); | |
| 4417 prev_skipwhite = (kp->flags & HL_SKIPWHITE); | |
| 4418 } | |
| 4419 if (kp->flags & HL_SKIPEMPTY) | |
| 4420 { | |
| 4421 msg_puts_attr((char_u *)"skipempty", attr); | |
| 4422 msg_putchar(' '); | |
| 4423 prev_skipempty = (kp->flags & HL_SKIPEMPTY); | |
| 4424 } | |
| 4425 } | |
| 4426 msg_outtrans(kp->keyword); | |
| 7 | 4427 } |
| 4428 } | |
| 4429 } | |
| 4430 } | |
| 4431 | |
| 4432 return did_header; | |
| 4433 } | |
| 4434 | |
| 4435 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4436 syn_clear_keyword(int id, hashtab_T *ht) |
| 134 | 4437 { |
| 4438 hashitem_T *hi; | |
| 4439 keyentry_T *kp; | |
| 4440 keyentry_T *kp_prev; | |
| 4441 keyentry_T *kp_next; | |
| 4442 int todo; | |
| 4443 | |
| 4444 hash_lock(ht); | |
| 835 | 4445 todo = (int)ht->ht_used; |
| 134 | 4446 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4447 { | |
| 4448 if (!HASHITEM_EMPTY(hi)) | |
| 4449 { | |
| 4450 --todo; | |
| 4451 kp_prev = NULL; | |
| 4452 for (kp = HI2KE(hi); kp != NULL; ) | |
| 7 | 4453 { |
| 134 | 4454 if (kp->k_syn.id == id) |
| 4455 { | |
| 4456 kp_next = kp->ke_next; | |
| 4457 if (kp_prev == NULL) | |
| 4458 { | |
| 4459 if (kp_next == NULL) | |
| 4460 hash_remove(ht, hi); | |
| 4461 else | |
| 4462 hi->hi_key = KE2HIKEY(kp_next); | |
| 4463 } | |
| 4464 else | |
| 4465 kp_prev->ke_next = kp_next; | |
| 4466 vim_free(kp->next_list); | |
| 4467 vim_free(kp->k_syn.cont_in_list); | |
| 4468 vim_free(kp); | |
| 4469 kp = kp_next; | |
| 4470 } | |
| 7 | 4471 else |
| 134 | 4472 { |
| 4473 kp_prev = kp; | |
| 4474 kp = kp->ke_next; | |
| 4475 } | |
| 7 | 4476 } |
| 134 | 4477 } |
| 4478 } | |
| 4479 hash_unlock(ht); | |
| 4480 } | |
| 4481 | |
| 4482 /* | |
| 4483 * Clear a whole keyword table. | |
| 7 | 4484 */ |
| 4485 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4486 clear_keywtab(hashtab_T *ht) |
| 134 | 4487 { |
| 4488 hashitem_T *hi; | |
| 4489 int todo; | |
| 4490 keyentry_T *kp; | |
| 4491 keyentry_T *kp_next; | |
| 4492 | |
| 835 | 4493 todo = (int)ht->ht_used; |
| 134 | 4494 for (hi = ht->ht_array; todo > 0; ++hi) |
| 4495 { | |
| 4496 if (!HASHITEM_EMPTY(hi)) | |
| 4497 { | |
| 4498 --todo; | |
| 4499 for (kp = HI2KE(hi); kp != NULL; kp = kp_next) | |
| 7 | 4500 { |
| 134 | 4501 kp_next = kp->ke_next; |
| 4502 vim_free(kp->next_list); | |
| 4503 vim_free(kp->k_syn.cont_in_list); | |
| 4504 vim_free(kp); | |
| 7 | 4505 } |
| 134 | 4506 } |
| 4507 } | |
| 4508 hash_clear(ht); | |
| 4509 hash_init(ht); | |
| 7 | 4510 } |
| 4511 | |
| 4512 /* | |
| 4513 * Add a keyword to the list of keywords. | |
| 4514 */ | |
| 4515 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4516 add_keyword( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4517 char_u *name, /* name of keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4518 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
|
4519 int flags, /* flags for this keyword */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4520 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
|
4521 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
|
4522 int conceal_char) |
| 7 | 4523 { |
| 134 | 4524 keyentry_T *kp; |
| 4525 hashtab_T *ht; | |
| 4526 hashitem_T *hi; | |
| 154 | 4527 char_u *name_ic; |
| 134 | 4528 long_u hash; |
| 154 | 4529 char_u name_folded[MAXKEYWLEN + 1]; |
| 7 | 4530 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4531 if (curwin->w_s->b_syn_ic) |
| 154 | 4532 name_ic = str_foldcase(name, (int)STRLEN(name), |
| 4533 name_folded, MAXKEYWLEN + 1); | |
| 4534 else | |
| 4535 name_ic = name; | |
| 134 | 4536 kp = (keyentry_T *)alloc((int)(sizeof(keyentry_T) + STRLEN(name_ic))); |
| 4537 if (kp == NULL) | |
| 4538 return; | |
| 4539 STRCPY(kp->keyword, name_ic); | |
| 4540 kp->k_syn.id = id; | |
| 4541 kp->k_syn.inc_tag = current_syn_inc_tag; | |
| 4542 kp->flags = flags; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4543 kp->k_char = conceal_char; |
| 134 | 4544 kp->k_syn.cont_in_list = copy_id_list(cont_in_list); |
| 4545 if (cont_in_list != NULL) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4546 curwin->w_s->b_syn_containedin = TRUE; |
| 134 | 4547 kp->next_list = copy_id_list(next_list); |
| 4548 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4549 if (curwin->w_s->b_syn_ic) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4550 ht = &curwin->w_s->b_keywtab_ic; |
| 7 | 4551 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4552 ht = &curwin->w_s->b_keywtab; |
| 134 | 4553 |
| 4554 hash = hash_hash(kp->keyword); | |
| 4555 hi = hash_lookup(ht, kp->keyword, hash); | |
| 4556 if (HASHITEM_EMPTY(hi)) | |
| 4557 { | |
| 4558 /* new keyword, add to hashtable */ | |
| 4559 kp->ke_next = NULL; | |
| 4560 hash_add_item(ht, hi, kp->keyword, hash); | |
| 4561 } | |
| 4562 else | |
| 4563 { | |
| 4564 /* keyword already exists, prepend to list */ | |
| 4565 kp->ke_next = HI2KE(hi); | |
| 4566 hi->hi_key = KE2HIKEY(kp); | |
| 4567 } | |
| 7 | 4568 } |
| 4569 | |
| 4570 /* | |
| 4571 * Get the start and end of the group name argument. | |
| 4572 * Return a pointer to the first argument. | |
| 4573 * Return NULL if the end of the command was found instead of further args. | |
| 4574 */ | |
| 4575 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4576 get_group_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4577 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
|
4578 char_u **name_end) /* pointer to end of the name */ |
| 7 | 4579 { |
| 4580 char_u *rest; | |
| 4581 | |
| 4582 *name_end = skiptowhite(arg); | |
| 4583 rest = skipwhite(*name_end); | |
| 4584 | |
| 4585 /* | |
| 4586 * Check if there are enough arguments. The first argument may be a | |
| 4587 * pattern, where '|' is allowed, so only check for NUL. | |
| 4588 */ | |
| 4589 if (ends_excmd(*arg) || *rest == NUL) | |
| 4590 return NULL; | |
| 4591 return rest; | |
| 4592 } | |
| 4593 | |
| 4594 /* | |
| 4595 * Check for syntax command option arguments. | |
| 4596 * This can be called at any place in the list of arguments, and just picks | |
| 4597 * out the arguments that are known. Can be called several times in a row to | |
| 4598 * collect all options in between other arguments. | |
| 4599 * Return a pointer to the next argument (which isn't an option). | |
| 4600 * Return NULL for any error; | |
| 4601 */ | |
| 4602 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4603 get_syn_options( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4604 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
|
4605 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
|
4606 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
|
4607 int skip) /* TRUE if skipping over command */ |
| 154 | 4608 { |
| 7 | 4609 char_u *gname_start, *gname; |
| 4610 int syn_id; | |
| 4611 int len; | |
| 154 | 4612 char *p; |
| 7 | 4613 int i; |
| 4614 int fidx; | |
| 4615 static struct flag | |
| 4616 { | |
| 4617 char *name; | |
| 154 | 4618 int argtype; |
| 4619 int flags; | |
| 4620 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED}, | |
| 4621 {"oOnNeElLiInNeE", 0, HL_ONELINE}, | |
| 4622 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND}, | |
| 4623 {"eExXtTeEnNdD", 0, HL_EXTEND}, | |
| 4624 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL}, | |
| 4625 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP}, | |
| 4626 {"sSkKiIpPnNlL", 0, HL_SKIPNL}, | |
| 4627 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE}, | |
| 4628 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY}, | |
| 4629 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE}, | |
| 4630 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE}, | |
| 4631 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY}, | |
| 4632 {"fFoOlLdD", 0, HL_FOLD}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4633 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4634 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS}, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4635 {"cCcChHaArR", 11, 0}, |
| 154 | 4636 {"cCoOnNtTaAiInNsS", 1, 0}, |
| 4637 {"cCoOnNtTaAiInNeEdDiInN", 2, 0}, | |
| 4638 {"nNeExXtTgGrRoOuUpP", 3, 0}, | |
| 7 | 4639 }; |
| 154 | 4640 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN"; |
| 7 | 4641 |
| 4642 if (arg == NULL) /* already detected error */ | |
| 4643 return NULL; | |
| 4644 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4645 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4646 if (curwin->w_s->b_syn_conceal) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4647 opt->flags |= HL_CONCEAL; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4648 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4649 |
| 7 | 4650 for (;;) |
| 4651 { | |
| 154 | 4652 /* |
| 4653 * This is used very often when a large number of keywords is defined. | |
| 4654 * Need to skip quickly when no option name is found. | |
| 4655 * Also avoid tolower(), it's slow. | |
| 4656 */ | |
| 4657 if (strchr(first_letters, *arg) == NULL) | |
| 4658 break; | |
| 7 | 4659 |
| 4660 for (fidx = sizeof(flagtab) / sizeof(struct flag); --fidx >= 0; ) | |
| 4661 { | |
| 154 | 4662 p = flagtab[fidx].name; |
| 4663 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len) | |
| 4664 if (arg[len] != p[i] && arg[len] != p[i + 1]) | |
| 4665 break; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4666 if (p[i] == NUL && (VIM_ISWHITE(arg[len]) |
| 154 | 4667 || (flagtab[fidx].argtype > 0 |
| 4668 ? arg[len] == '=' | |
| 4669 : ends_excmd(arg[len])))) | |
| 7 | 4670 { |
| 154 | 4671 if (opt->keyword |
| 4672 && (flagtab[fidx].flags == HL_DISPLAY | |
| 4673 || flagtab[fidx].flags == HL_FOLD | |
| 4674 || flagtab[fidx].flags == HL_EXTEND)) | |
| 7 | 4675 /* treat "display", "fold" and "extend" as a keyword */ |
| 4676 fidx = -1; | |
| 4677 break; | |
| 4678 } | |
| 4679 } | |
| 154 | 4680 if (fidx < 0) /* no match found */ |
| 4681 break; | |
| 4682 | |
| 4683 if (flagtab[fidx].argtype == 1) | |
| 4684 { | |
| 4685 if (!opt->has_cont_list) | |
| 7 | 4686 { |
| 4687 EMSG(_("E395: contains argument not accepted here")); | |
| 4688 return NULL; | |
| 4689 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4690 if (get_id_list(&arg, 8, &opt->cont_list, skip) == FAIL) |
| 7 | 4691 return NULL; |
| 4692 } | |
| 154 | 4693 else if (flagtab[fidx].argtype == 2) |
| 4694 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4695 if (get_id_list(&arg, 11, &opt->cont_in_list, skip) == FAIL) |
| 7 | 4696 return NULL; |
| 4697 } | |
| 154 | 4698 else if (flagtab[fidx].argtype == 3) |
| 4699 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4700 if (get_id_list(&arg, 9, &opt->next_list, skip) == FAIL) |
| 7 | 4701 return NULL; |
| 4702 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4703 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
|
4704 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4705 #ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4706 /* cchar=? */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4707 if (has_mbyte) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4708 { |
|
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 = mb_ptr2char(arg + 6); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4711 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4712 arg += mb_ptr2len(arg + 6) - 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4713 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4714 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4715 #endif |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4716 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4717 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4718 *conceal_char = arg[6]; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4719 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4720 ; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4721 #endif |
|
2251
646d34788036
Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents:
2250
diff
changeset
|
4722 } |
| 2686 | 4723 #ifdef FEAT_CONCEAL |
| 4724 if (!vim_isprintc_strict(*conceal_char)) | |
| 4725 { | |
| 4726 EMSG(_("E844: invalid cchar value")); | |
| 4727 return NULL; | |
| 4728 } | |
| 4729 #endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4730 arg = skipwhite(arg + 7); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4731 } |
| 7 | 4732 else |
| 154 | 4733 { |
| 4734 opt->flags |= flagtab[fidx].flags; | |
| 4735 arg = skipwhite(arg + len); | |
| 4736 | |
| 4737 if (flagtab[fidx].flags == HL_SYNC_HERE | |
| 4738 || flagtab[fidx].flags == HL_SYNC_THERE) | |
| 4739 { | |
| 4740 if (opt->sync_idx == NULL) | |
| 4741 { | |
| 4742 EMSG(_("E393: group[t]here not accepted here")); | |
| 4743 return NULL; | |
| 4744 } | |
| 4745 gname_start = arg; | |
| 4746 arg = skiptowhite(arg); | |
| 4747 if (gname_start == arg) | |
| 4748 return NULL; | |
| 4749 gname = vim_strnsave(gname_start, (int)(arg - gname_start)); | |
| 4750 if (gname == NULL) | |
| 4751 return NULL; | |
| 4752 if (STRCMP(gname, "NONE") == 0) | |
| 4753 *opt->sync_idx = NONE_IDX; | |
| 4754 else | |
| 4755 { | |
| 4756 syn_id = syn_name2id(gname); | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4757 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
|
4758 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
|
4759 && SYN_ITEMS(curwin->w_s)[i].sp_type == SPTYPE_START) |
| 154 | 4760 { |
| 4761 *opt->sync_idx = i; | |
| 4762 break; | |
| 4763 } | |
| 4764 if (i < 0) | |
| 4765 { | |
| 4766 EMSG2(_("E394: Didn't find region item for %s"), gname); | |
| 4767 vim_free(gname); | |
| 4768 return NULL; | |
| 4769 } | |
| 4770 } | |
| 4771 | |
| 4772 vim_free(gname); | |
| 4773 arg = skipwhite(arg); | |
| 4774 } | |
| 4775 #ifdef FEAT_FOLDING | |
| 4776 else if (flagtab[fidx].flags == HL_FOLD | |
| 4777 && foldmethodIsSyntax(curwin)) | |
| 4778 /* Need to update folds later. */ | |
| 4779 foldUpdateAll(curwin); | |
| 4780 #endif | |
| 4781 } | |
| 4782 } | |
| 7 | 4783 |
| 4784 return arg; | |
| 4785 } | |
| 4786 | |
| 4787 /* | |
| 4788 * Adjustments to syntax item when declared in a ":syn include"'d file. | |
| 4789 * Set the contained flag, and if the item is not already contained, add it | |
| 4790 * to the specified top-level group, if any. | |
| 4791 */ | |
| 4792 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4793 syn_incl_toplevel(int id, int *flagsp) |
| 7 | 4794 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4795 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0) |
| 7 | 4796 return; |
| 4797 *flagsp |= HL_CONTAINED; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4798 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER) |
| 7 | 4799 { |
| 4800 /* We have to alloc this, because syn_combine_list() will free it. */ | |
| 4801 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
|
4802 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER; |
| 7 | 4803 |
| 4804 if (grp_list != NULL) | |
| 4805 { | |
| 4806 grp_list[0] = id; | |
| 4807 grp_list[1] = 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4808 syn_combine_list(&SYN_CLSTR(curwin->w_s)[tlg_id].scl_list, &grp_list, |
| 7 | 4809 CLUSTER_ADD); |
| 4810 } | |
| 4811 } | |
| 4812 } | |
| 4813 | |
| 4814 /* | |
| 4815 * Handle ":syntax include [@{group-name}] filename" command. | |
| 4816 */ | |
| 4817 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4818 syn_cmd_include(exarg_T *eap, int syncing UNUSED) |
| 7 | 4819 { |
| 4820 char_u *arg = eap->arg; | |
| 4821 int sgl_id = 1; | |
| 4822 char_u *group_name_end; | |
| 4823 char_u *rest; | |
| 4824 char_u *errormsg = NULL; | |
| 4825 int prev_toplvl_grp; | |
| 4826 int prev_syn_inc_tag; | |
| 4827 int source = FALSE; | |
| 4828 | |
| 4829 eap->nextcmd = find_nextcmd(arg); | |
| 4830 if (eap->skip) | |
| 4831 return; | |
| 4832 | |
| 4833 if (arg[0] == '@') | |
| 4834 { | |
| 4835 ++arg; | |
| 4836 rest = get_group_name(arg, &group_name_end); | |
| 4837 if (rest == NULL) | |
| 4838 { | |
| 4839 EMSG((char_u *)_("E397: Filename required")); | |
| 4840 return; | |
| 4841 } | |
| 4842 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); | |
| 2743 | 4843 if (sgl_id == 0) |
| 4844 return; | |
| 7 | 4845 /* separate_nextcmd() and expand_filename() depend on this */ |
| 4846 eap->arg = rest; | |
| 4847 } | |
| 4848 | |
| 4849 /* | |
| 4850 * Everything that's left, up to the next command, should be the | |
| 4851 * filename to include. | |
| 4852 */ | |
| 4853 eap->argt |= (XFILE | NOSPC); | |
| 4854 separate_nextcmd(eap); | |
| 4855 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg)) | |
| 4856 { | |
| 4857 /* For an absolute path, "$VIM/..." or "<sfile>.." we ":source" the | |
| 4858 * file. Need to expand the file name first. In other cases | |
| 4859 * ":runtime!" is used. */ | |
| 4860 source = TRUE; | |
| 4861 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL) | |
| 4862 { | |
| 4863 if (errormsg != NULL) | |
| 4864 EMSG(errormsg); | |
| 4865 return; | |
| 4866 } | |
| 4867 } | |
| 4868 | |
| 4869 /* | |
| 4870 * Save and restore the existing top-level grouplist id and ":syn | |
| 4871 * include" tag around the actual inclusion. | |
| 4872 */ | |
| 2743 | 4873 if (running_syn_inc_tag >= MAX_SYN_INC_TAG) |
| 4874 { | |
| 4875 EMSG((char_u *)_("E847: Too many syntax includes")); | |
| 4876 return; | |
| 4877 } | |
| 7 | 4878 prev_syn_inc_tag = current_syn_inc_tag; |
| 4879 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
|
4880 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
|
4881 curwin->w_s->b_syn_topgrp = sgl_id; |
| 1299 | 4882 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
|
4883 : source_runtime(eap->arg, DIP_ALL) == FAIL) |
| 7 | 4884 EMSG2(_(e_notopen), eap->arg); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4885 curwin->w_s->b_syn_topgrp = prev_toplvl_grp; |
| 7 | 4886 current_syn_inc_tag = prev_syn_inc_tag; |
| 4887 } | |
| 4888 | |
| 4889 /* | |
| 4890 * Handle ":syntax keyword {group-name} [{option}] keyword .." command. | |
| 4891 */ | |
| 4892 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
4893 syn_cmd_keyword(exarg_T *eap, int syncing UNUSED) |
| 7 | 4894 { |
| 4895 char_u *arg = eap->arg; | |
| 4896 char_u *group_name_end; | |
| 4897 int syn_id; | |
| 4898 char_u *rest; | |
| 2743 | 4899 char_u *keyword_copy = NULL; |
| 7 | 4900 char_u *p; |
| 154 | 4901 char_u *kw; |
| 4902 syn_opt_arg_T syn_opt_arg; | |
| 4903 int cnt; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4904 int conceal_char = NUL; |
| 7 | 4905 |
| 4906 rest = get_group_name(arg, &group_name_end); | |
| 4907 | |
| 4908 if (rest != NULL) | |
| 4909 { | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4910 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
|
4911 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
|
4912 else |
|
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4913 syn_id = syn_check_group(arg, (int)(group_name_end - arg)); |
| 2743 | 4914 if (syn_id != 0) |
| 4915 /* allocate a buffer, for removing backslashes in the keyword */ | |
| 4916 keyword_copy = alloc((unsigned)STRLEN(rest) + 1); | |
| 7 | 4917 if (keyword_copy != NULL) |
| 4918 { | |
| 154 | 4919 syn_opt_arg.flags = 0; |
| 4920 syn_opt_arg.keyword = TRUE; | |
| 4921 syn_opt_arg.sync_idx = NULL; | |
| 4922 syn_opt_arg.has_cont_list = FALSE; | |
| 4923 syn_opt_arg.cont_in_list = NULL; | |
| 4924 syn_opt_arg.next_list = NULL; | |
| 4925 | |
| 7 | 4926 /* |
| 4927 * The options given apply to ALL keywords, so all options must be | |
| 4928 * found before keywords can be created. | |
| 154 | 4929 * 1: collect the options and copy the keywords to keyword_copy. |
| 7 | 4930 */ |
| 154 | 4931 cnt = 0; |
| 4932 p = keyword_copy; | |
| 4933 for ( ; rest != NULL && !ends_excmd(*rest); rest = skipwhite(rest)) | |
| 7 | 4934 { |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
4935 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
|
4936 eap->skip); |
| 154 | 4937 if (rest == NULL || ends_excmd(*rest)) |
| 4938 break; | |
| 4939 /* 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
|
4940 while (*rest != NUL && !VIM_ISWHITE(*rest)) |
| 154 | 4941 { |
| 4942 if (*rest == '\\' && rest[1] != NUL) | |
| 4943 ++rest; | |
| 4944 *p++ = *rest++; | |
| 4945 } | |
| 4946 *p++ = NUL; | |
| 4947 ++cnt; | |
| 4948 } | |
| 4949 | |
| 4950 if (!eap->skip) | |
| 4951 { | |
| 4952 /* Adjust flags for use of ":syn include". */ | |
| 4953 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); | |
| 4954 | |
| 7 | 4955 /* |
| 154 | 4956 * 2: Add an entry for each keyword. |
| 7 | 4957 */ |
| 154 | 4958 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1) |
| 7 | 4959 { |
| 154 | 4960 for (p = vim_strchr(kw, '['); ; ) |
| 7 | 4961 { |
| 154 | 4962 if (p != NULL) |
| 4963 *p = NUL; | |
| 4964 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
|
4965 syn_opt_arg.cont_in_list, |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
4966 syn_opt_arg.next_list, conceal_char); |
| 168 | 4967 if (p == NULL) |
| 4968 break; | |
| 4969 if (p[1] == NUL) | |
| 4970 { | |
| 838 | 4971 EMSG2(_("E789: Missing ']': %s"), kw); |
| 7017 | 4972 goto error; |
| 168 | 4973 } |
| 4974 if (p[1] == ']') | |
| 4975 { | |
| 7017 | 4976 if (p[2] != NUL) |
| 4977 { | |
| 4978 EMSG3(_("E890: trailing char after ']': %s]%s"), | |
| 4979 kw, &p[2]); | |
| 4980 goto error; | |
| 4981 } | |
| 168 | 4982 kw = p + 1; /* skip over the "]" */ |
| 4983 break; | |
| 4984 } | |
| 154 | 4985 #ifdef FEAT_MBYTE |
| 4986 if (has_mbyte) | |
| 7 | 4987 { |
| 474 | 4988 int l = (*mb_ptr2len)(p + 1); |
| 154 | 4989 |
| 4990 mch_memmove(p, p + 1, l); | |
| 4991 p += l; | |
| 4992 } | |
| 4993 else | |
| 7 | 4994 #endif |
| 154 | 4995 { |
| 4996 p[0] = p[1]; | |
| 4997 ++p; | |
| 7 | 4998 } |
| 4999 } | |
| 5000 } | |
| 5001 } | |
| 7017 | 5002 error: |
| 7 | 5003 vim_free(keyword_copy); |
| 168 | 5004 vim_free(syn_opt_arg.cont_in_list); |
| 5005 vim_free(syn_opt_arg.next_list); | |
| 7 | 5006 } |
| 5007 } | |
| 5008 | |
| 5009 if (rest != NULL) | |
| 5010 eap->nextcmd = check_nextcmd(rest); | |
| 5011 else | |
| 5012 EMSG2(_(e_invarg2), arg); | |
| 5013 | |
| 745 | 5014 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5015 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5016 } |
| 5017 | |
| 5018 /* | |
| 5019 * Handle ":syntax match {name} [{options}] {pattern} [{options}]". | |
| 5020 * | |
| 5021 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .." | |
| 5022 */ | |
| 5023 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5024 syn_cmd_match( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5025 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5026 int syncing) /* TRUE for ":syntax sync match .. " */ |
| 7 | 5027 { |
| 5028 char_u *arg = eap->arg; | |
| 5029 char_u *group_name_end; | |
| 5030 char_u *rest; | |
| 5031 synpat_T item; /* the item found in the line */ | |
| 5032 int syn_id; | |
| 5033 int idx; | |
| 154 | 5034 syn_opt_arg_T syn_opt_arg; |
| 7 | 5035 int sync_idx = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5036 int conceal_char = NUL; |
| 7 | 5037 |
| 5038 /* Isolate the group name, check for validity */ | |
| 5039 rest = get_group_name(arg, &group_name_end); | |
| 5040 | |
| 5041 /* Get options before the pattern */ | |
| 154 | 5042 syn_opt_arg.flags = 0; |
| 5043 syn_opt_arg.keyword = FALSE; | |
| 5044 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL; | |
| 5045 syn_opt_arg.has_cont_list = TRUE; | |
| 5046 syn_opt_arg.cont_list = NULL; | |
| 5047 syn_opt_arg.cont_in_list = NULL; | |
| 5048 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
|
5049 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5050 |
| 5051 /* get the pattern. */ | |
| 5052 init_syn_patterns(); | |
| 5053 vim_memset(&item, 0, sizeof(item)); | |
| 5054 rest = get_syn_pattern(rest, &item); | |
| 154 | 5055 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 5056 syn_opt_arg.flags |= HL_HAS_EOL; | |
| 7 | 5057 |
| 5058 /* 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
|
5059 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5060 |
| 5061 if (rest != NULL) /* all arguments are valid */ | |
| 5062 { | |
| 5063 /* | |
| 5064 * Check for trailing command and illegal trailing arguments. | |
| 5065 */ | |
| 5066 eap->nextcmd = check_nextcmd(rest); | |
| 5067 if (!ends_excmd(*rest) || eap->skip) | |
| 5068 rest = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5069 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL |
| 7 | 5070 && (syn_id = syn_check_group(arg, |
| 5071 (int)(group_name_end - arg))) != 0) | |
| 5072 { | |
| 154 | 5073 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 5074 /* |
| 5075 * Store the pattern in the syn_items list | |
| 5076 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5077 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
|
5078 SYN_ITEMS(curwin->w_s)[idx] = item; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5079 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
|
5080 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
|
5081 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
|
5082 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
|
5083 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
|
5084 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
|
5085 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
|
5086 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 5087 syn_opt_arg.cont_in_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5088 #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
|
5089 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
|
5090 #endif |
| 154 | 5091 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
|
5092 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5093 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
|
5094 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5095 |
| 5096 /* remember that we found a match for syncing on */ | |
| 154 | 5097 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
|
5098 curwin->w_s->b_syn_sync_flags |= SF_MATCH; |
| 7 | 5099 #ifdef FEAT_FOLDING |
| 154 | 5100 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
|
5101 ++curwin->w_s->b_syn_folditems; |
| 7 | 5102 #endif |
| 5103 | |
| 745 | 5104 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5105 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5106 return; /* don't free the progs and patterns now */ |
| 5107 } | |
| 5108 } | |
| 5109 | |
| 5110 /* | |
| 5111 * Something failed, free the allocated memory. | |
| 5112 */ | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5113 vim_regfree(item.sp_prog); |
| 7 | 5114 vim_free(item.sp_pattern); |
| 154 | 5115 vim_free(syn_opt_arg.cont_list); |
| 5116 vim_free(syn_opt_arg.cont_in_list); | |
| 5117 vim_free(syn_opt_arg.next_list); | |
| 7 | 5118 |
| 5119 if (rest == NULL) | |
| 5120 EMSG2(_(e_invarg2), arg); | |
| 5121 } | |
| 5122 | |
| 5123 /* | |
| 5124 * Handle ":syntax region {group-name} [matchgroup={group-name}] | |
| 5125 * start {start} .. [skip {skip}] end {end} .. [{options}]". | |
| 5126 */ | |
| 5127 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5128 syn_cmd_region( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5129 exarg_T *eap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5130 int syncing) /* TRUE for ":syntax sync region .." */ |
| 7 | 5131 { |
| 5132 char_u *arg = eap->arg; | |
| 5133 char_u *group_name_end; | |
| 5134 char_u *rest; /* next arg, NULL on error */ | |
| 5135 char_u *key_end; | |
| 5136 char_u *key = NULL; | |
| 5137 char_u *p; | |
| 5138 int item; | |
| 5139 #define ITEM_START 0 | |
| 5140 #define ITEM_SKIP 1 | |
| 5141 #define ITEM_END 2 | |
| 5142 #define ITEM_MATCHGROUP 3 | |
| 5143 struct pat_ptr | |
| 5144 { | |
| 5145 synpat_T *pp_synp; /* pointer to syn_pattern */ | |
| 5146 int pp_matchgroup_id; /* matchgroup ID */ | |
| 5147 struct pat_ptr *pp_next; /* pointer to next pat_ptr */ | |
| 5148 } *(pat_ptrs[3]); | |
| 5149 /* patterns found in the line */ | |
| 5150 struct pat_ptr *ppp; | |
| 5151 struct pat_ptr *ppp_next; | |
| 5152 int pat_count = 0; /* nr of syn_patterns found */ | |
| 5153 int syn_id; | |
| 5154 int matchgroup_id = 0; | |
| 5155 int not_enough = FALSE; /* not enough arguments */ | |
| 5156 int illegal = FALSE; /* illegal arguments */ | |
| 5157 int success = FALSE; | |
| 5158 int idx; | |
| 154 | 5159 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
|
5160 int conceal_char = NUL; |
| 7 | 5161 |
| 5162 /* Isolate the group name, check for validity */ | |
| 5163 rest = get_group_name(arg, &group_name_end); | |
| 5164 | |
| 5165 pat_ptrs[0] = NULL; | |
| 5166 pat_ptrs[1] = NULL; | |
| 5167 pat_ptrs[2] = NULL; | |
| 5168 | |
| 5169 init_syn_patterns(); | |
| 5170 | |
| 154 | 5171 syn_opt_arg.flags = 0; |
| 5172 syn_opt_arg.keyword = FALSE; | |
| 5173 syn_opt_arg.sync_idx = NULL; | |
| 5174 syn_opt_arg.has_cont_list = TRUE; | |
| 5175 syn_opt_arg.cont_list = NULL; | |
| 5176 syn_opt_arg.cont_in_list = NULL; | |
| 5177 syn_opt_arg.next_list = NULL; | |
| 5178 | |
| 7 | 5179 /* |
| 5180 * get the options, patterns and matchgroup. | |
| 5181 */ | |
| 5182 while (rest != NULL && !ends_excmd(*rest)) | |
| 5183 { | |
| 5184 /* 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
|
5185 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char, eap->skip); |
| 7 | 5186 if (rest == NULL || ends_excmd(*rest)) |
| 5187 break; | |
| 5188 | |
| 5189 /* must be a pattern or matchgroup then */ | |
| 5190 key_end = rest; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5191 while (*key_end && !VIM_ISWHITE(*key_end) && *key_end != '=') |
| 7 | 5192 ++key_end; |
| 5193 vim_free(key); | |
| 5194 key = vim_strnsave_up(rest, (int)(key_end - rest)); | |
| 5195 if (key == NULL) /* out of memory */ | |
| 5196 { | |
| 5197 rest = NULL; | |
| 5198 break; | |
| 5199 } | |
| 5200 if (STRCMP(key, "MATCHGROUP") == 0) | |
| 5201 item = ITEM_MATCHGROUP; | |
| 5202 else if (STRCMP(key, "START") == 0) | |
| 5203 item = ITEM_START; | |
| 5204 else if (STRCMP(key, "END") == 0) | |
| 5205 item = ITEM_END; | |
| 5206 else if (STRCMP(key, "SKIP") == 0) | |
| 5207 { | |
| 5208 if (pat_ptrs[ITEM_SKIP] != NULL) /* one skip pattern allowed */ | |
| 5209 { | |
| 5210 illegal = TRUE; | |
| 5211 break; | |
| 5212 } | |
| 5213 item = ITEM_SKIP; | |
| 5214 } | |
| 5215 else | |
| 5216 break; | |
| 5217 rest = skipwhite(key_end); | |
| 5218 if (*rest != '=') | |
| 5219 { | |
| 5220 rest = NULL; | |
| 5221 EMSG2(_("E398: Missing '=': %s"), arg); | |
| 5222 break; | |
| 5223 } | |
| 5224 rest = skipwhite(rest + 1); | |
| 5225 if (*rest == NUL) | |
| 5226 { | |
| 5227 not_enough = TRUE; | |
| 5228 break; | |
| 5229 } | |
| 5230 | |
| 5231 if (item == ITEM_MATCHGROUP) | |
| 5232 { | |
| 5233 p = skiptowhite(rest); | |
| 5234 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip) | |
| 5235 matchgroup_id = 0; | |
| 5236 else | |
| 5237 { | |
| 5238 matchgroup_id = syn_check_group(rest, (int)(p - rest)); | |
| 5239 if (matchgroup_id == 0) | |
| 5240 { | |
| 5241 illegal = TRUE; | |
| 5242 break; | |
| 5243 } | |
| 5244 } | |
| 5245 rest = skipwhite(p); | |
| 5246 } | |
| 5247 else | |
| 5248 { | |
| 5249 /* | |
| 5250 * Allocate room for a syn_pattern, and link it in the list of | |
| 5251 * syn_patterns for this item, at the start (because the list is | |
| 5252 * used from end to start). | |
| 5253 */ | |
| 5254 ppp = (struct pat_ptr *)alloc((unsigned)sizeof(struct pat_ptr)); | |
| 5255 if (ppp == NULL) | |
| 5256 { | |
| 5257 rest = NULL; | |
| 5258 break; | |
| 5259 } | |
| 5260 ppp->pp_next = pat_ptrs[item]; | |
| 5261 pat_ptrs[item] = ppp; | |
| 5262 ppp->pp_synp = (synpat_T *)alloc_clear((unsigned)sizeof(synpat_T)); | |
| 5263 if (ppp->pp_synp == NULL) | |
| 5264 { | |
| 5265 rest = NULL; | |
| 5266 break; | |
| 5267 } | |
| 5268 | |
| 5269 /* | |
| 5270 * Get the syntax pattern and the following offset(s). | |
| 5271 */ | |
| 5272 /* Enable the appropriate \z specials. */ | |
| 5273 if (item == ITEM_START) | |
| 5274 reg_do_extmatch = REX_SET; | |
| 5275 else if (item == ITEM_SKIP || item == ITEM_END) | |
| 5276 reg_do_extmatch = REX_USE; | |
| 5277 rest = get_syn_pattern(rest, ppp->pp_synp); | |
| 5278 reg_do_extmatch = 0; | |
| 5279 if (item == ITEM_END && vim_regcomp_had_eol() | |
| 154 | 5280 && !(syn_opt_arg.flags & HL_EXCLUDENL)) |
| 7 | 5281 ppp->pp_synp->sp_flags |= HL_HAS_EOL; |
| 5282 ppp->pp_matchgroup_id = matchgroup_id; | |
| 5283 ++pat_count; | |
| 5284 } | |
| 5285 } | |
| 5286 vim_free(key); | |
| 5287 if (illegal || not_enough) | |
| 5288 rest = NULL; | |
| 5289 | |
| 5290 /* | |
| 5291 * Must have a "start" and "end" pattern. | |
| 5292 */ | |
| 5293 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL || | |
| 5294 pat_ptrs[ITEM_END] == NULL)) | |
| 5295 { | |
| 5296 not_enough = TRUE; | |
| 5297 rest = NULL; | |
| 5298 } | |
| 5299 | |
| 5300 if (rest != NULL) | |
| 5301 { | |
| 5302 /* | |
| 5303 * Check for trailing garbage or command. | |
| 5304 * If OK, add the item. | |
| 5305 */ | |
| 5306 eap->nextcmd = check_nextcmd(rest); | |
| 5307 if (!ends_excmd(*rest) || eap->skip) | |
| 5308 rest = NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5309 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL |
| 7 | 5310 && (syn_id = syn_check_group(arg, |
| 5311 (int)(group_name_end - arg))) != 0) | |
| 5312 { | |
| 154 | 5313 syn_incl_toplevel(syn_id, &syn_opt_arg.flags); |
| 7 | 5314 /* |
| 5315 * Store the start/skip/end in the syn_items list | |
| 5316 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5317 idx = curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5318 for (item = ITEM_START; item <= ITEM_END; ++item) |
| 5319 { | |
| 5320 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next) | |
| 5321 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5322 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
|
5323 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
|
5324 SYN_ITEMS(curwin->w_s)[idx].sp_type = |
| 7 | 5325 (item == ITEM_START) ? SPTYPE_START : |
| 5326 (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
|
5327 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
|
5328 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id; |
| 2743 | 5329 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag = |
| 5330 current_syn_inc_tag; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5331 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id = |
| 7 | 5332 ppp->pp_matchgroup_id; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5333 #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
|
5334 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
|
5335 #endif |
| 7 | 5336 if (item == ITEM_START) |
| 5337 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5338 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list = |
| 154 | 5339 syn_opt_arg.cont_list; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5340 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list = |
| 154 | 5341 syn_opt_arg.cont_in_list; |
| 5342 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
|
5343 curwin->w_s->b_syn_containedin = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5344 SYN_ITEMS(curwin->w_s)[idx].sp_next_list = |
| 154 | 5345 syn_opt_arg.next_list; |
| 7 | 5346 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5347 ++curwin->w_s->b_syn_patterns.ga_len; |
| 7 | 5348 ++idx; |
| 5349 #ifdef FEAT_FOLDING | |
| 154 | 5350 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
|
5351 ++curwin->w_s->b_syn_folditems; |
| 7 | 5352 #endif |
| 5353 } | |
| 5354 } | |
| 5355 | |
| 745 | 5356 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5357 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5358 success = TRUE; /* don't free the progs and patterns now */ |
| 5359 } | |
| 5360 } | |
| 5361 | |
| 5362 /* | |
| 5363 * Free the allocated memory. | |
| 5364 */ | |
| 5365 for (item = ITEM_START; item <= ITEM_END; ++item) | |
| 5366 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next) | |
| 5367 { | |
| 5368 if (!success) | |
| 5369 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
5370 vim_regfree(ppp->pp_synp->sp_prog); |
| 7 | 5371 vim_free(ppp->pp_synp->sp_pattern); |
| 5372 } | |
| 5373 vim_free(ppp->pp_synp); | |
| 5374 ppp_next = ppp->pp_next; | |
| 5375 vim_free(ppp); | |
| 5376 } | |
| 5377 | |
| 5378 if (!success) | |
| 5379 { | |
| 154 | 5380 vim_free(syn_opt_arg.cont_list); |
| 5381 vim_free(syn_opt_arg.cont_in_list); | |
| 5382 vim_free(syn_opt_arg.next_list); | |
| 7 | 5383 if (not_enough) |
| 5384 EMSG2(_("E399: Not enough arguments: syntax region %s"), arg); | |
| 5385 else if (illegal || rest == NULL) | |
| 5386 EMSG2(_(e_invarg2), arg); | |
| 5387 } | |
| 5388 } | |
| 5389 | |
| 5390 /* | |
| 5391 * A simple syntax group ID comparison function suitable for use in qsort() | |
| 5392 */ | |
| 5393 static int | |
| 5394 #ifdef __BORLANDC__ | |
| 5395 _RTLENTRYF | |
| 5396 #endif | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5397 syn_compare_stub(const void *v1, const void *v2) |
| 7 | 5398 { |
| 5399 const short *s1 = v1; | |
| 5400 const short *s2 = v2; | |
| 5401 | |
| 5402 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0); | |
| 5403 } | |
| 5404 | |
| 5405 /* | |
| 5406 * Combines lists of syntax clusters. | |
| 5407 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed. | |
| 5408 */ | |
| 5409 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5410 syn_combine_list(short **clstr1, short **clstr2, int list_op) |
| 7 | 5411 { |
| 5412 int count1 = 0; | |
| 5413 int count2 = 0; | |
| 5414 short *g1; | |
| 5415 short *g2; | |
| 5416 short *clstr = NULL; | |
| 5417 int count; | |
| 5418 int round; | |
| 5419 | |
| 5420 /* | |
| 5421 * Handle degenerate cases. | |
| 5422 */ | |
| 5423 if (*clstr2 == NULL) | |
| 5424 return; | |
| 5425 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE) | |
| 5426 { | |
| 5427 if (list_op == CLUSTER_REPLACE) | |
| 5428 vim_free(*clstr1); | |
| 5429 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD) | |
| 5430 *clstr1 = *clstr2; | |
| 5431 else | |
| 5432 vim_free(*clstr2); | |
| 5433 return; | |
| 5434 } | |
| 5435 | |
| 5436 for (g1 = *clstr1; *g1; g1++) | |
| 5437 ++count1; | |
| 5438 for (g2 = *clstr2; *g2; g2++) | |
| 5439 ++count2; | |
| 5440 | |
| 5441 /* | |
| 5442 * For speed purposes, sort both lists. | |
| 5443 */ | |
| 5444 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub); | |
| 5445 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub); | |
| 5446 | |
| 5447 /* | |
| 5448 * We proceed in two passes; in round 1, we count the elements to place | |
| 5449 * in the new list, and in round 2, we allocate and populate the new | |
| 5450 * list. For speed, we use a mergesort-like method, adding the smaller | |
| 5451 * of the current elements in each list to the new list. | |
| 5452 */ | |
| 5453 for (round = 1; round <= 2; round++) | |
| 5454 { | |
| 5455 g1 = *clstr1; | |
| 5456 g2 = *clstr2; | |
| 5457 count = 0; | |
| 5458 | |
| 5459 /* | |
| 5460 * First, loop through the lists until one of them is empty. | |
| 5461 */ | |
| 5462 while (*g1 && *g2) | |
| 5463 { | |
| 5464 /* | |
| 5465 * We always want to add from the first list. | |
| 5466 */ | |
| 5467 if (*g1 < *g2) | |
| 5468 { | |
| 5469 if (round == 2) | |
| 5470 clstr[count] = *g1; | |
| 5471 count++; | |
| 5472 g1++; | |
| 5473 continue; | |
| 5474 } | |
| 5475 /* | |
| 5476 * We only want to add from the second list if we're adding the | |
| 5477 * lists. | |
| 5478 */ | |
| 5479 if (list_op == CLUSTER_ADD) | |
| 5480 { | |
| 5481 if (round == 2) | |
| 5482 clstr[count] = *g2; | |
| 5483 count++; | |
| 5484 } | |
| 5485 if (*g1 == *g2) | |
| 5486 g1++; | |
| 5487 g2++; | |
| 5488 } | |
| 5489 | |
| 5490 /* | |
| 5491 * Now add the leftovers from whichever list didn't get finished | |
| 5492 * first. As before, we only want to add from the second list if | |
| 5493 * we're adding the lists. | |
| 5494 */ | |
| 5495 for (; *g1; g1++, count++) | |
| 5496 if (round == 2) | |
| 5497 clstr[count] = *g1; | |
| 5498 if (list_op == CLUSTER_ADD) | |
| 5499 for (; *g2; g2++, count++) | |
| 5500 if (round == 2) | |
| 5501 clstr[count] = *g2; | |
| 5502 | |
| 5503 if (round == 1) | |
| 5504 { | |
| 5505 /* | |
| 5506 * If the group ended up empty, we don't need to allocate any | |
| 5507 * space for it. | |
| 5508 */ | |
| 5509 if (count == 0) | |
| 5510 { | |
| 5511 clstr = NULL; | |
| 5512 break; | |
| 5513 } | |
| 5514 clstr = (short *)alloc((unsigned)((count + 1) * sizeof(short))); | |
| 5515 if (clstr == NULL) | |
| 5516 break; | |
| 5517 clstr[count] = 0; | |
| 5518 } | |
| 5519 } | |
| 5520 | |
| 5521 /* | |
| 5522 * Finally, put the new list in place. | |
| 5523 */ | |
| 5524 vim_free(*clstr1); | |
| 5525 vim_free(*clstr2); | |
| 5526 *clstr1 = clstr; | |
| 5527 } | |
| 5528 | |
| 5529 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5530 * Lookup a syntax cluster name and return its ID. |
| 7 | 5531 * If it is not found, 0 is returned. |
| 5532 */ | |
| 5533 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5534 syn_scl_name2id(char_u *name) |
| 7 | 5535 { |
| 5536 int i; | |
| 5537 char_u *name_u; | |
| 5538 | |
| 5539 /* Avoid using stricmp() too much, it's slow on some systems */ | |
| 5540 name_u = vim_strsave_up(name); | |
| 5541 if (name_u == NULL) | |
| 5542 return 0; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5543 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
|
5544 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
|
5545 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0) |
| 7 | 5546 break; |
| 5547 vim_free(name_u); | |
| 5548 return (i < 0 ? 0 : i + SYNID_CLUSTER); | |
| 5549 } | |
| 5550 | |
| 5551 /* | |
| 5552 * Like syn_scl_name2id(), but take a pointer + length argument. | |
| 5553 */ | |
| 5554 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5555 syn_scl_namen2id(char_u *linep, int len) |
| 7 | 5556 { |
| 5557 char_u *name; | |
| 5558 int id = 0; | |
| 5559 | |
| 5560 name = vim_strnsave(linep, len); | |
| 5561 if (name != NULL) | |
| 5562 { | |
| 5563 id = syn_scl_name2id(name); | |
| 5564 vim_free(name); | |
| 5565 } | |
| 5566 return id; | |
| 5567 } | |
| 5568 | |
| 5569 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5570 * Find syntax cluster name in the table and return its ID. |
| 7 | 5571 * The argument is a pointer to the name and the length of the name. |
| 5572 * If it doesn't exist yet, a new entry is created. | |
| 5573 * Return 0 for failure. | |
| 5574 */ | |
| 5575 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5576 syn_check_cluster(char_u *pp, int len) |
| 7 | 5577 { |
| 5578 int id; | |
| 5579 char_u *name; | |
| 5580 | |
| 5581 name = vim_strnsave(pp, len); | |
| 5582 if (name == NULL) | |
| 5583 return 0; | |
| 5584 | |
| 5585 id = syn_scl_name2id(name); | |
| 5586 if (id == 0) /* doesn't exist yet */ | |
| 5587 id = syn_add_cluster(name); | |
| 5588 else | |
| 5589 vim_free(name); | |
| 5590 return id; | |
| 5591 } | |
| 5592 | |
| 5593 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
5594 * Add new syntax cluster and return its ID. |
| 7 | 5595 * "name" must be an allocated string, it will be consumed. |
| 5596 * Return 0 for failure. | |
| 5597 */ | |
| 5598 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5599 syn_add_cluster(char_u *name) |
| 221 | 5600 { |
| 5601 int len; | |
| 7 | 5602 |
| 5603 /* | |
| 5604 * First call for this growarray: init growing array. | |
| 5605 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5606 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
|
5607 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5608 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
|
5609 curwin->w_s->b_syn_clusters.ga_growsize = 10; |
| 7 | 5610 } |
| 5611 | |
| 2743 | 5612 len = curwin->w_s->b_syn_clusters.ga_len; |
| 5613 if (len >= MAX_CLUSTER_ID) | |
| 5614 { | |
| 5615 EMSG((char_u *)_("E848: Too many syntax clusters")); | |
| 5616 vim_free(name); | |
| 5617 return 0; | |
| 5618 } | |
| 5619 | |
| 7 | 5620 /* |
| 5621 * Make room for at least one other cluster entry. | |
| 5622 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5623 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL) |
| 7 | 5624 { |
| 5625 vim_free(name); | |
| 5626 return 0; | |
| 5627 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5628 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5629 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
|
5630 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
|
5631 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
|
5632 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
|
5633 ++curwin->w_s->b_syn_clusters.ga_len; |
| 7 | 5634 |
| 221 | 5635 if (STRICMP(name, "Spell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5636 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER; |
| 227 | 5637 if (STRICMP(name, "NoSpell") == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5638 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER; |
| 221 | 5639 |
| 7 | 5640 return len + SYNID_CLUSTER; |
| 5641 } | |
| 5642 | |
| 5643 /* | |
| 5644 * Handle ":syntax cluster {cluster-name} [contains={groupname},..] | |
| 5645 * [add={groupname},..] [remove={groupname},..]". | |
| 5646 */ | |
| 5647 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5648 syn_cmd_cluster(exarg_T *eap, int syncing UNUSED) |
| 7 | 5649 { |
| 5650 char_u *arg = eap->arg; | |
| 5651 char_u *group_name_end; | |
| 5652 char_u *rest; | |
| 5653 int scl_id; | |
| 5654 short *clstr_list; | |
| 5655 int got_clstr = FALSE; | |
| 5656 int opt_len; | |
| 5657 int list_op; | |
| 5658 | |
| 5659 eap->nextcmd = find_nextcmd(arg); | |
| 5660 if (eap->skip) | |
| 5661 return; | |
| 5662 | |
| 5663 rest = get_group_name(arg, &group_name_end); | |
| 5664 | |
| 5665 if (rest != NULL) | |
| 5666 { | |
| 2743 | 5667 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg)); |
| 5668 if (scl_id == 0) | |
| 5669 return; | |
| 5670 scl_id -= SYNID_CLUSTER; | |
| 7 | 5671 |
| 5672 for (;;) | |
| 5673 { | |
| 5674 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
|
5675 && (VIM_ISWHITE(rest[3]) || rest[3] == '=')) |
| 7 | 5676 { |
| 5677 opt_len = 3; | |
| 5678 list_op = CLUSTER_ADD; | |
| 5679 } | |
| 5680 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
|
5681 && (VIM_ISWHITE(rest[6]) || rest[6] == '=')) |
| 7 | 5682 { |
| 5683 opt_len = 6; | |
| 5684 list_op = CLUSTER_SUBTRACT; | |
| 5685 } | |
| 5686 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
|
5687 && (VIM_ISWHITE(rest[8]) || rest[8] == '=')) |
| 7 | 5688 { |
| 5689 opt_len = 8; | |
| 5690 list_op = CLUSTER_REPLACE; | |
| 5691 } | |
| 5692 else | |
| 5693 break; | |
| 5694 | |
| 5695 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
|
5696 if (get_id_list(&rest, opt_len, &clstr_list, eap->skip) == FAIL) |
| 7 | 5697 { |
| 5698 EMSG2(_(e_invarg2), rest); | |
| 5699 break; | |
| 5700 } | |
|
10618
4ee16e5e2e26
patch 8.0.0198: some syntax arguments take effect even after "if 0"
Christian Brabandt <cb@256bit.org>
parents:
10534
diff
changeset
|
5701 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
|
5702 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list, |
| 7 | 5703 &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
|
5704 else |
|
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
5705 vim_free(clstr_list); |
| 7 | 5706 got_clstr = TRUE; |
| 5707 } | |
| 5708 | |
| 5709 if (got_clstr) | |
| 5710 { | |
| 745 | 5711 redraw_curbuf_later(SOME_VALID); |
| 2743 | 5712 syn_stack_free_all(curwin->w_s); /* Need to recompute all. */ |
| 7 | 5713 } |
| 5714 } | |
| 5715 | |
| 5716 if (!got_clstr) | |
| 5717 EMSG(_("E400: No cluster specified")); | |
| 5718 if (rest == NULL || !ends_excmd(*rest)) | |
| 5719 EMSG2(_(e_invarg2), arg); | |
| 5720 } | |
| 5721 | |
| 5722 /* | |
| 5723 * On first call for current buffer: Init growing array. | |
| 5724 */ | |
| 5725 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5726 init_syn_patterns(void) |
| 7 | 5727 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5728 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
|
5729 curwin->w_s->b_syn_patterns.ga_growsize = 10; |
| 7 | 5730 } |
| 5731 | |
| 5732 /* | |
| 5733 * Get one pattern for a ":syntax match" or ":syntax region" command. | |
| 5734 * Stores the pattern and program in a synpat_T. | |
| 5735 * Returns a pointer to the next argument, or NULL in case of an error. | |
| 5736 */ | |
| 5737 static char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5738 get_syn_pattern(char_u *arg, synpat_T *ci) |
| 7 | 5739 { |
| 5740 char_u *end; | |
| 5741 int *p; | |
| 5742 int idx; | |
| 5743 char_u *cpo_save; | |
| 5744 | |
| 5745 /* need at least three chars */ | |
| 6993 | 5746 if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL) |
| 7 | 5747 return NULL; |
| 5748 | |
| 5749 end = skip_regexp(arg + 1, *arg, TRUE, NULL); | |
| 5750 if (*end != *arg) /* end delimiter not found */ | |
| 5751 { | |
| 5752 EMSG2(_("E401: Pattern delimiter not found: %s"), arg); | |
| 5753 return NULL; | |
| 5754 } | |
| 5755 /* store the pattern and compiled regexp program */ | |
| 5756 if ((ci->sp_pattern = vim_strnsave(arg + 1, (int)(end - arg - 1))) == NULL) | |
| 5757 return NULL; | |
| 5758 | |
| 5759 /* Make 'cpoptions' empty, to avoid the 'l' flag */ | |
| 5760 cpo_save = p_cpo; | |
| 5761 p_cpo = (char_u *)""; | |
| 5762 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC); | |
| 5763 p_cpo = cpo_save; | |
| 5764 | |
| 5765 if (ci->sp_prog == NULL) | |
| 5766 return NULL; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5767 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
|
5768 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5769 syn_clear_time(&ci->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5770 #endif |
| 7 | 5771 |
| 5772 /* | |
| 5773 * Check for a match, highlight or region offset. | |
| 5774 */ | |
| 5775 ++end; | |
| 5776 do | |
| 5777 { | |
| 5778 for (idx = SPO_COUNT; --idx >= 0; ) | |
| 5779 if (STRNCMP(end, spo_name_tab[idx], 3) == 0) | |
| 5780 break; | |
| 5781 if (idx >= 0) | |
| 5782 { | |
| 5783 p = &(ci->sp_offsets[idx]); | |
| 5784 if (idx != SPO_LC_OFF) | |
| 5785 switch (end[3]) | |
| 5786 { | |
| 5787 case 's': break; | |
| 5788 case 'b': break; | |
| 5789 case 'e': idx += SPO_COUNT; break; | |
| 5790 default: idx = -1; break; | |
| 5791 } | |
| 5792 if (idx >= 0) | |
| 5793 { | |
| 5794 ci->sp_off_flags |= (1 << idx); | |
| 5795 if (idx == SPO_LC_OFF) /* lc=99 */ | |
| 5796 { | |
| 5797 end += 3; | |
| 5798 *p = getdigits(&end); | |
| 5799 | |
| 5800 /* "lc=" offset automatically sets "ms=" offset */ | |
| 5801 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF))) | |
| 5802 { | |
| 5803 ci->sp_off_flags |= (1 << SPO_MS_OFF); | |
| 5804 ci->sp_offsets[SPO_MS_OFF] = *p; | |
| 5805 } | |
| 5806 } | |
| 5807 else /* yy=x+99 */ | |
| 5808 { | |
| 5809 end += 4; | |
| 5810 if (*end == '+') | |
| 5811 { | |
| 5812 ++end; | |
| 5813 *p = getdigits(&end); /* positive offset */ | |
| 5814 } | |
| 5815 else if (*end == '-') | |
| 5816 { | |
| 5817 ++end; | |
| 5818 *p = -getdigits(&end); /* negative offset */ | |
| 5819 } | |
| 5820 } | |
| 5821 if (*end != ',') | |
| 5822 break; | |
| 5823 ++end; | |
| 5824 } | |
| 5825 } | |
| 5826 } while (idx >= 0); | |
| 5827 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5828 if (!ends_excmd(*end) && !VIM_ISWHITE(*end)) |
| 7 | 5829 { |
| 5830 EMSG2(_("E402: Garbage after pattern: %s"), arg); | |
| 5831 return NULL; | |
| 5832 } | |
| 5833 return skipwhite(end); | |
| 5834 } | |
| 5835 | |
| 5836 /* | |
| 5837 * Handle ":syntax sync .." command. | |
| 5838 */ | |
| 5839 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5840 syn_cmd_sync(exarg_T *eap, int syncing UNUSED) |
| 7 | 5841 { |
| 5842 char_u *arg_start = eap->arg; | |
| 5843 char_u *arg_end; | |
| 5844 char_u *key = NULL; | |
| 5845 char_u *next_arg; | |
| 5846 int illegal = FALSE; | |
| 5847 int finished = FALSE; | |
| 5848 long n; | |
| 5849 char_u *cpo_save; | |
| 5850 | |
| 5851 if (ends_excmd(*arg_start)) | |
| 5852 { | |
| 5853 syn_cmd_list(eap, TRUE); | |
| 5854 return; | |
| 5855 } | |
| 5856 | |
| 5857 while (!ends_excmd(*arg_start)) | |
| 5858 { | |
| 5859 arg_end = skiptowhite(arg_start); | |
| 5860 next_arg = skipwhite(arg_end); | |
| 5861 vim_free(key); | |
| 5862 key = vim_strnsave_up(arg_start, (int)(arg_end - arg_start)); | |
| 5863 if (STRCMP(key, "CCOMMENT") == 0) | |
| 5864 { | |
| 5865 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5866 curwin->w_s->b_syn_sync_flags |= SF_CCOMMENT; |
| 7 | 5867 if (!ends_excmd(*next_arg)) |
| 5868 { | |
| 5869 arg_end = skiptowhite(next_arg); | |
| 5870 if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5871 curwin->w_s->b_syn_sync_id = syn_check_group(next_arg, |
| 7 | 5872 (int)(arg_end - next_arg)); |
| 5873 next_arg = skipwhite(arg_end); | |
| 5874 } | |
| 5875 else if (!eap->skip) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5876 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment"); |
| 7 | 5877 } |
| 5878 else if ( STRNCMP(key, "LINES", 5) == 0 | |
| 5879 || STRNCMP(key, "MINLINES", 8) == 0 | |
| 5880 || STRNCMP(key, "MAXLINES", 8) == 0 | |
| 5881 || STRNCMP(key, "LINEBREAKS", 10) == 0) | |
| 5882 { | |
| 5883 if (key[4] == 'S') | |
| 5884 arg_end = key + 6; | |
| 5885 else if (key[0] == 'L') | |
| 5886 arg_end = key + 11; | |
| 5887 else | |
| 5888 arg_end = key + 9; | |
| 5889 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end)) | |
| 5890 { | |
| 5891 illegal = TRUE; | |
| 5892 break; | |
| 5893 } | |
| 5894 n = getdigits(&arg_end); | |
| 5895 if (!eap->skip) | |
| 5896 { | |
| 5897 if (key[4] == 'B') | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5898 curwin->w_s->b_syn_sync_linebreaks = n; |
| 7 | 5899 else if (key[1] == 'A') |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5900 curwin->w_s->b_syn_sync_maxlines = n; |
| 7 | 5901 else |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5902 curwin->w_s->b_syn_sync_minlines = n; |
| 7 | 5903 } |
| 5904 } | |
| 5905 else if (STRCMP(key, "FROMSTART") == 0) | |
| 5906 { | |
| 5907 if (!eap->skip) | |
| 5908 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5909 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
|
5910 curwin->w_s->b_syn_sync_maxlines = 0; |
| 7 | 5911 } |
| 5912 } | |
| 5913 else if (STRCMP(key, "LINECONT") == 0) | |
| 5914 { | |
|
7504
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5915 if (*next_arg == NUL) /* missing pattern */ |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5916 { |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5917 illegal = TRUE; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5918 break; |
|
013f285f31a6
commit https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
Christian Brabandt <cb@256bit.org>
parents:
7500
diff
changeset
|
5919 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5920 if (curwin->w_s->b_syn_linecont_pat != NULL) |
| 7 | 5921 { |
| 5922 EMSG(_("E403: syntax sync: line continuations pattern specified twice")); | |
| 5923 finished = TRUE; | |
| 5924 break; | |
| 5925 } | |
| 5926 arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE, NULL); | |
| 5927 if (*arg_end != *next_arg) /* end delimiter not found */ | |
| 5928 { | |
| 5929 illegal = TRUE; | |
| 5930 break; | |
| 5931 } | |
| 5932 | |
| 5933 if (!eap->skip) | |
| 5934 { | |
| 5935 /* 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
|
5936 if ((curwin->w_s->b_syn_linecont_pat = vim_strnsave(next_arg + 1, |
| 7 | 5937 (int)(arg_end - next_arg - 1))) == NULL) |
| 5938 { | |
| 5939 finished = TRUE; | |
| 5940 break; | |
| 5941 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5942 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic; |
| 7 | 5943 |
| 5944 /* Make 'cpoptions' empty, to avoid the 'l' flag */ | |
| 5945 cpo_save = p_cpo; | |
| 5946 p_cpo = (char_u *)""; | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5947 curwin->w_s->b_syn_linecont_prog = |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5948 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC); |
| 7 | 5949 p_cpo = cpo_save; |
|
4766
ec24ff78a79c
updated for version 7.3.1130
Bram Moolenaar <bram@vim.org>
parents:
4764
diff
changeset
|
5950 #ifdef FEAT_PROFILE |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5951 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
|
5952 #endif |
| 7 | 5953 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5954 if (curwin->w_s->b_syn_linecont_prog == NULL) |
| 7 | 5955 { |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
5956 VIM_CLEAR(curwin->w_s->b_syn_linecont_pat); |
| 7 | 5957 finished = TRUE; |
| 5958 break; | |
| 5959 } | |
| 5960 } | |
| 5961 next_arg = skipwhite(arg_end + 1); | |
| 5962 } | |
| 5963 else | |
| 5964 { | |
| 5965 eap->arg = next_arg; | |
| 5966 if (STRCMP(key, "MATCH") == 0) | |
| 5967 syn_cmd_match(eap, TRUE); | |
| 5968 else if (STRCMP(key, "REGION") == 0) | |
| 5969 syn_cmd_region(eap, TRUE); | |
| 5970 else if (STRCMP(key, "CLEAR") == 0) | |
| 5971 syn_cmd_clear(eap, TRUE); | |
| 5972 else | |
| 5973 illegal = TRUE; | |
| 5974 finished = TRUE; | |
| 5975 break; | |
| 5976 } | |
| 5977 arg_start = next_arg; | |
| 5978 } | |
| 5979 vim_free(key); | |
| 5980 if (illegal) | |
| 5981 EMSG2(_("E404: Illegal arguments: %s"), arg_start); | |
| 5982 else if (!finished) | |
| 5983 { | |
| 5984 eap->nextcmd = check_nextcmd(arg_start); | |
| 745 | 5985 redraw_curbuf_later(SOME_VALID); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
5986 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */ |
| 7 | 5987 } |
| 5988 } | |
| 5989 | |
| 5990 /* | |
| 5991 * Convert a line of highlight group names into a list of group ID numbers. | |
| 5992 * "arg" should point to the "contains" or "nextgroup" keyword. | |
| 5993 * "arg" is advanced to after the last group name. | |
| 5994 * Careful: the argument is modified (NULs added). | |
| 5995 * returns FAIL for some error, OK for success. | |
| 5996 */ | |
| 5997 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5998 get_id_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
5999 char_u **arg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6000 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
|
6001 short **list, /* where to store the resulting list, if not |
| 7 | 6002 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
|
6003 int skip) |
| 7 | 6004 { |
| 6005 char_u *p = NULL; | |
| 6006 char_u *end; | |
| 6007 int round; | |
| 6008 int count; | |
| 6009 int total_count = 0; | |
| 6010 short *retval = NULL; | |
| 6011 char_u *name; | |
| 6012 regmatch_T regmatch; | |
| 6013 int id; | |
| 6014 int i; | |
| 6015 int failed = FALSE; | |
| 6016 | |
| 6017 /* | |
| 6018 * We parse the list twice: | |
| 6019 * round == 1: count the number of items, allocate the array. | |
| 6020 * round == 2: fill the array with the items. | |
| 6021 * In round 1 new groups may be added, causing the number of items to | |
| 6022 * grow when a regexp is used. In that case round 1 is done once again. | |
| 6023 */ | |
| 6024 for (round = 1; round <= 2; ++round) | |
| 6025 { | |
| 6026 /* | |
| 6027 * skip "contains" | |
| 6028 */ | |
| 6029 p = skipwhite(*arg + keylen); | |
| 6030 if (*p != '=') | |
| 6031 { | |
| 6032 EMSG2(_("E405: Missing equal sign: %s"), *arg); | |
| 6033 break; | |
| 6034 } | |
| 6035 p = skipwhite(p + 1); | |
| 6036 if (ends_excmd(*p)) | |
| 6037 { | |
| 6038 EMSG2(_("E406: Empty argument: %s"), *arg); | |
| 6039 break; | |
| 6040 } | |
| 6041 | |
| 6042 /* | |
| 6043 * parse the arguments after "contains" | |
| 6044 */ | |
| 6045 count = 0; | |
| 6046 while (!ends_excmd(*p)) | |
| 6047 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
6048 for (end = p; *end && !VIM_ISWHITE(*end) && *end != ','; ++end) |
| 7 | 6049 ; |
| 6050 name = alloc((int)(end - p + 3)); /* leave room for "^$" */ | |
| 6051 if (name == NULL) | |
| 6052 { | |
| 6053 failed = TRUE; | |
| 6054 break; | |
| 6055 } | |
| 419 | 6056 vim_strncpy(name + 1, p, end - p); |
| 7 | 6057 if ( STRCMP(name + 1, "ALLBUT") == 0 |
| 6058 || STRCMP(name + 1, "ALL") == 0 | |
| 6059 || STRCMP(name + 1, "TOP") == 0 | |
| 6060 || STRCMP(name + 1, "CONTAINED") == 0) | |
| 6061 { | |
| 6062 if (TOUPPER_ASC(**arg) != 'C') | |
| 6063 { | |
| 6064 EMSG2(_("E407: %s not allowed here"), name + 1); | |
| 6065 failed = TRUE; | |
| 6066 vim_free(name); | |
| 6067 break; | |
| 6068 } | |
| 6069 if (count != 0) | |
| 6070 { | |
|
10648
4f3decf25b7d
patch 8.0.0214: leaking memory when syntax cluster id is unknown
Christian Brabandt <cb@256bit.org>
parents:
10629
diff
changeset
|
6071 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
|
6072 name + 1); |
| 7 | 6073 failed = TRUE; |
| 6074 vim_free(name); | |
| 6075 break; | |
| 6076 } | |
| 6077 if (name[1] == 'A') | |
| 6078 id = SYNID_ALLBUT; | |
| 6079 else if (name[1] == 'T') | |
| 6080 id = SYNID_TOP; | |
| 6081 else | |
| 6082 id = SYNID_CONTAINED; | |
| 6083 id += current_syn_inc_tag; | |
| 6084 } | |
| 6085 else if (name[1] == '@') | |
| 6086 { | |
|
10629
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6087 if (skip) |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6088 id = -1; |
|
16fc46021e51
patch 8.0.0204: compiler warns for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10624
diff
changeset
|
6089 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
|
6090 id = syn_check_cluster(name + 2, (int)(end - p - 1)); |
| 7 | 6091 } |
| 6092 else | |
| 6093 { | |
| 6094 /* | |
| 6095 * Handle full group name. | |
| 6096 */ | |
| 6097 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL) | |
| 6098 id = syn_check_group(name + 1, (int)(end - p)); | |
| 6099 else | |
| 6100 { | |
| 6101 /* | |
| 6102 * Handle match of regexp with group names. | |
| 6103 */ | |
| 6104 *name = '^'; | |
| 6105 STRCAT(name, "$"); | |
| 6106 regmatch.regprog = vim_regcomp(name, RE_MAGIC); | |
| 6107 if (regmatch.regprog == NULL) | |
| 6108 { | |
| 6109 failed = TRUE; | |
| 6110 vim_free(name); | |
| 6111 break; | |
| 6112 } | |
| 6113 | |
| 6114 regmatch.rm_ic = TRUE; | |
| 6115 id = 0; | |
| 6116 for (i = highlight_ga.ga_len; --i >= 0; ) | |
| 6117 { | |
| 6118 if (vim_regexec(®match, HL_TABLE()[i].sg_name, | |
| 6119 (colnr_T)0)) | |
| 6120 { | |
| 6121 if (round == 2) | |
| 6122 { | |
| 6123 /* Got more items than expected; can happen | |
| 6124 * when adding items that match: | |
| 6125 * "contains=a.*b,axb". | |
| 6126 * Go back to first round */ | |
| 6127 if (count >= total_count) | |
| 6128 { | |
| 6129 vim_free(retval); | |
| 6130 round = 1; | |
| 6131 } | |
| 6132 else | |
| 6133 retval[count] = i + 1; | |
| 6134 } | |
| 6135 ++count; | |
| 6136 id = -1; /* remember that we found one */ | |
| 6137 } | |
| 6138 } | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4803
diff
changeset
|
6139 vim_regfree(regmatch.regprog); |
| 7 | 6140 } |
| 6141 } | |
| 6142 vim_free(name); | |
| 6143 if (id == 0) | |
| 6144 { | |
| 6145 EMSG2(_("E409: Unknown group name: %s"), p); | |
| 6146 failed = TRUE; | |
| 6147 break; | |
| 6148 } | |
| 6149 if (id > 0) | |
| 6150 { | |
| 6151 if (round == 2) | |
| 6152 { | |
| 6153 /* Got more items than expected, go back to first round */ | |
| 6154 if (count >= total_count) | |
| 6155 { | |
| 6156 vim_free(retval); | |
| 6157 round = 1; | |
| 6158 } | |
| 6159 else | |
| 6160 retval[count] = id; | |
| 6161 } | |
| 6162 ++count; | |
| 6163 } | |
| 6164 p = skipwhite(end); | |
| 6165 if (*p != ',') | |
| 6166 break; | |
| 6167 p = skipwhite(p + 1); /* skip comma in between arguments */ | |
| 6168 } | |
| 6169 if (failed) | |
| 6170 break; | |
| 6171 if (round == 1) | |
| 6172 { | |
| 6173 retval = (short *)alloc((unsigned)((count + 1) * sizeof(short))); | |
| 6174 if (retval == NULL) | |
| 6175 break; | |
| 6176 retval[count] = 0; /* zero means end of the list */ | |
| 6177 total_count = count; | |
| 6178 } | |
| 6179 } | |
| 6180 | |
| 6181 *arg = p; | |
| 6182 if (failed || retval == NULL) | |
| 6183 { | |
| 6184 vim_free(retval); | |
| 6185 return FAIL; | |
| 6186 } | |
| 6187 | |
| 6188 if (*list == NULL) | |
| 6189 *list = retval; | |
| 6190 else | |
| 6191 vim_free(retval); /* list already found, don't overwrite it */ | |
| 6192 | |
| 6193 return OK; | |
| 6194 } | |
| 6195 | |
| 6196 /* | |
| 6197 * Make a copy of an ID list. | |
| 6198 */ | |
| 6199 static short * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6200 copy_id_list(short *list) |
| 7 | 6201 { |
| 6202 int len; | |
| 6203 int count; | |
| 6204 short *retval; | |
| 6205 | |
| 6206 if (list == NULL) | |
| 6207 return NULL; | |
| 6208 | |
| 6209 for (count = 0; list[count]; ++count) | |
| 6210 ; | |
| 6211 len = (count + 1) * sizeof(short); | |
| 6212 retval = (short *)alloc((unsigned)len); | |
| 6213 if (retval != NULL) | |
| 6214 mch_memmove(retval, list, (size_t)len); | |
| 6215 | |
| 6216 return retval; | |
| 6217 } | |
| 6218 | |
| 6219 /* | |
| 6220 * Check if syntax group "ssp" is in the ID list "list" of "cur_si". | |
| 6221 * "cur_si" can be NULL if not checking the "containedin" list. | |
| 6222 * Used to check if a syntax item is in the "contains" or "nextgroup" list of | |
| 6223 * the current item. | |
| 6224 * This function is called very often, keep it fast!! | |
| 6225 */ | |
| 6226 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6227 in_id_list( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6228 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
|
6229 short *list, /* id list */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6230 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
|
6231 int contained) /* group id is contained */ |
| 7 | 6232 { |
| 6233 int retval; | |
| 6234 short *scl_list; | |
| 6235 short item; | |
| 6236 short id = ssp->id; | |
| 6237 static int depth = 0; | |
| 6238 int r; | |
| 6239 | |
| 4352 | 6240 /* If ssp has a "containedin" list and "cur_si" is in it, return TRUE. */ |
| 36 | 6241 if (cur_si != NULL && ssp->cont_in_list != NULL |
| 6242 && !(cur_si->si_flags & HL_MATCH)) | |
| 7 | 6243 { |
| 6244 /* Ignore transparent items without a contains argument. Double check | |
| 6245 * that we don't go back past the first one. */ | |
| 6246 while ((cur_si->si_flags & HL_TRANS_CONT) | |
| 6247 && cur_si > (stateitem_T *)(current_state.ga_data)) | |
| 6248 --cur_si; | |
| 6249 /* cur_si->si_idx is -1 for keywords, these never contain anything. */ | |
| 6250 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
|
6251 &(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
|
6252 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED)) |
| 7 | 6253 return TRUE; |
| 6254 } | |
| 6255 | |
| 6256 if (list == NULL) | |
| 6257 return FALSE; | |
| 6258 | |
| 6259 /* | |
| 6260 * If list is ID_LIST_ALL, we are in a transparent item that isn't | |
| 6261 * inside anything. Only allow not-contained groups. | |
| 6262 */ | |
| 6263 if (list == ID_LIST_ALL) | |
| 6264 return !contained; | |
| 6265 | |
| 6266 /* | |
| 6267 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the | |
| 6268 * contains list. We also require that "id" is at the same ":syn include" | |
| 6269 * level as the list. | |
| 6270 */ | |
| 6271 item = *list; | |
| 6272 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER) | |
| 6273 { | |
| 6274 if (item < SYNID_TOP) | |
| 6275 { | |
| 6276 /* ALL or ALLBUT: accept all groups in the same file */ | |
| 6277 if (item - SYNID_ALLBUT != ssp->inc_tag) | |
| 6278 return FALSE; | |
| 6279 } | |
| 6280 else if (item < SYNID_CONTAINED) | |
| 6281 { | |
| 6282 /* TOP: accept all not-contained groups in the same file */ | |
| 6283 if (item - SYNID_TOP != ssp->inc_tag || contained) | |
| 6284 return FALSE; | |
| 6285 } | |
| 6286 else | |
| 6287 { | |
| 6288 /* CONTAINED: accept all contained groups in the same file */ | |
| 6289 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained) | |
| 6290 return FALSE; | |
| 6291 } | |
| 6292 item = *++list; | |
| 6293 retval = FALSE; | |
| 6294 } | |
| 6295 else | |
| 6296 retval = TRUE; | |
| 6297 | |
| 6298 /* | |
| 6299 * Return "retval" if id is in the contains list. | |
| 6300 */ | |
| 6301 while (item != 0) | |
| 6302 { | |
| 6303 if (item == id) | |
| 6304 return retval; | |
| 6305 if (item >= SYNID_CLUSTER) | |
| 6306 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6307 scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list; |
| 7 | 6308 /* restrict recursiveness to 30 to avoid an endless loop for a |
| 6309 * cluster that includes itself (indirectly) */ | |
| 6310 if (scl_list != NULL && depth < 30) | |
| 6311 { | |
| 6312 ++depth; | |
| 6313 r = in_id_list(NULL, scl_list, ssp, contained); | |
| 6314 --depth; | |
| 6315 if (r) | |
| 6316 return retval; | |
| 6317 } | |
| 6318 } | |
| 6319 item = *++list; | |
| 6320 } | |
| 6321 return !retval; | |
| 6322 } | |
| 6323 | |
| 6324 struct subcommand | |
| 6325 { | |
|
7807
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6326 char *name; /* subcommand name */ |
|
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6327 void (*func)(exarg_T *, int); /* function to call */ |
| 7 | 6328 }; |
| 6329 | |
| 6330 static struct subcommand subcommands[] = | |
| 6331 { | |
| 6332 {"case", syn_cmd_case}, | |
| 6333 {"clear", syn_cmd_clear}, | |
| 6334 {"cluster", syn_cmd_cluster}, | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6335 {"conceal", syn_cmd_conceal}, |
| 7 | 6336 {"enable", syn_cmd_enable}, |
| 6337 {"include", syn_cmd_include}, | |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6338 {"iskeyword", syn_cmd_iskeyword}, |
| 7 | 6339 {"keyword", syn_cmd_keyword}, |
| 6340 {"list", syn_cmd_list}, | |
| 6341 {"manual", syn_cmd_manual}, | |
| 6342 {"match", syn_cmd_match}, | |
| 6343 {"on", syn_cmd_on}, | |
| 6344 {"off", syn_cmd_off}, | |
| 6345 {"region", syn_cmd_region}, | |
| 6346 {"reset", syn_cmd_reset}, | |
| 419 | 6347 {"spell", syn_cmd_spell}, |
| 7 | 6348 {"sync", syn_cmd_sync}, |
| 6349 {"", syn_cmd_list}, | |
| 6350 {NULL, NULL} | |
| 6351 }; | |
| 6352 | |
| 6353 /* | |
| 6354 * ":syntax". | |
| 6355 * This searches the subcommands[] table for the subcommand name, and calls a | |
| 6356 * syntax_subcommand() function to do the rest. | |
| 6357 */ | |
| 6358 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6359 ex_syntax(exarg_T *eap) |
| 7 | 6360 { |
| 6361 char_u *arg = eap->arg; | |
| 6362 char_u *subcmd_end; | |
| 6363 char_u *subcmd_name; | |
| 6364 int i; | |
| 6365 | |
| 6366 syn_cmdlinep = eap->cmdlinep; | |
| 6367 | |
| 6368 /* isolate subcommand name */ | |
| 6369 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end) | |
| 6370 ; | |
| 6371 subcmd_name = vim_strnsave(arg, (int)(subcmd_end - arg)); | |
| 6372 if (subcmd_name != NULL) | |
| 6373 { | |
| 6374 if (eap->skip) /* skip error messages for all subcommands */ | |
| 6375 ++emsg_skip; | |
| 6376 for (i = 0; ; ++i) | |
| 6377 { | |
| 6378 if (subcommands[i].name == NULL) | |
| 6379 { | |
| 6380 EMSG2(_("E410: Invalid :syntax subcommand: %s"), subcmd_name); | |
| 6381 break; | |
| 6382 } | |
| 6383 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0) | |
| 6384 { | |
| 6385 eap->arg = skipwhite(subcmd_end); | |
| 6386 (subcommands[i].func)(eap, FALSE); | |
| 6387 break; | |
| 6388 } | |
| 6389 } | |
| 6390 vim_free(subcmd_name); | |
| 6391 if (eap->skip) | |
| 6392 --emsg_skip; | |
| 6393 } | |
| 6394 } | |
| 6395 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6396 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6397 ex_ownsyntax(exarg_T *eap) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6398 { |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6399 char_u *old_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6400 char_u *new_value; |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6401 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6402 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
|
6403 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6404 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
|
6405 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
|
6406 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
|
6407 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
|
6408 #ifdef FEAT_SPELL |
| 6386 | 6409 /* 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
|
6410 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
|
6411 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
|
6412 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
|
6413 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
|
6414 #endif |
|
7687
61354fabf8a2
commit https://github.com/vim/vim/commit/b8060fe862f684b591f9ac679eac5b2594d6c5a0
Christian Brabandt <cb@256bit.org>
parents:
7685
diff
changeset
|
6415 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
|
6416 } |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6417 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6418 /* save value of b:current_syntax */ |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6419 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
|
6420 if (old_value != NULL) |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6421 old_value = vim_strsave(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6422 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6423 /* 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
|
6424 * file. */ |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6425 apply_autocmds(EVENT_SYNTAX, eap->arg, curbuf->b_fname, TRUE, curbuf); |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6426 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6427 /* 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
|
6428 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
|
6429 if (new_value != NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6430 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
|
6431 |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6432 /* restore value of b:current_syntax */ |
|
2256
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6433 if (old_value == NULL) |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6434 do_unlet((char_u *)"b:current_syntax", TRUE); |
|
8b3203df361f
Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents:
2253
diff
changeset
|
6435 else |
|
2252
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6436 { |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6437 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
|
6438 vim_free(old_value); |
|
a0b5918c33cc
Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents:
2251
diff
changeset
|
6439 } |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6440 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6441 |
| 7 | 6442 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6443 syntax_present(win_T *win) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6444 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6445 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
|
6446 || 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
|
6447 || 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
|
6448 || win->w_s->b_keywtab_ic.ht_used > 0); |
| 7 | 6449 } |
| 6450 | |
| 6451 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) | |
| 6452 | |
| 6453 static enum | |
| 6454 { | |
| 6455 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
|
6456 EXP_CASE, /* expand ":syn case" arguments */ |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6457 EXP_SPELL, /* expand ":syn spell" arguments */ |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6458 EXP_SYNC /* expand ":syn sync" arguments */ |
| 7 | 6459 } expand_what; |
| 6460 | |
| 1322 | 6461 /* |
| 6462 * Reset include_link, include_default, include_none to 0. | |
| 6463 * Called when we are done expanding. | |
| 6464 */ | |
| 6465 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6466 reset_expand_highlight(void) |
| 1322 | 6467 { |
| 6468 include_link = include_default = include_none = 0; | |
| 6469 } | |
| 6470 | |
| 6471 /* | |
| 6472 * Handle command line completion for :match and :echohl command: Add "None" | |
| 6473 * as highlight group. | |
| 6474 */ | |
| 6475 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6476 set_context_in_echohl_cmd(expand_T *xp, char_u *arg) |
| 1322 | 6477 { |
| 6478 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 6479 xp->xp_pattern = arg; | |
| 6480 include_none = 1; | |
| 6481 } | |
| 7 | 6482 |
| 6483 /* | |
| 6484 * Handle command line completion for :syntax command. | |
| 6485 */ | |
| 6486 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6487 set_context_in_syntax_cmd(expand_T *xp, char_u *arg) |
| 7 | 6488 { |
| 6489 char_u *p; | |
| 6490 | |
| 6491 /* Default: expand subcommands */ | |
| 6492 xp->xp_context = EXPAND_SYNTAX; | |
| 6493 expand_what = EXP_SUBCMD; | |
| 6494 xp->xp_pattern = arg; | |
| 1322 | 6495 include_link = 0; |
| 6496 include_default = 0; | |
| 7 | 6497 |
| 6498 /* (part of) subcommand already typed */ | |
| 6499 if (*arg != NUL) | |
| 6500 { | |
| 6501 p = skiptowhite(arg); | |
| 6502 if (*p != NUL) /* past first word */ | |
| 6503 { | |
| 6504 xp->xp_pattern = skipwhite(p); | |
| 6505 if (*skiptowhite(xp->xp_pattern) != NUL) | |
| 6506 xp->xp_context = EXPAND_NOTHING; | |
| 6507 else if (STRNICMP(arg, "case", p - arg) == 0) | |
| 6508 expand_what = EXP_CASE; | |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6509 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
|
6510 expand_what = EXP_SPELL; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6511 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
|
6512 expand_what = EXP_SYNC; |
| 7 | 6513 else if ( STRNICMP(arg, "keyword", p - arg) == 0 |
| 6514 || STRNICMP(arg, "region", p - arg) == 0 | |
| 6515 || STRNICMP(arg, "match", p - arg) == 0 | |
| 6516 || STRNICMP(arg, "list", p - arg) == 0) | |
| 6517 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 6518 else | |
| 6519 xp->xp_context = EXPAND_NOTHING; | |
| 6520 } | |
| 6521 } | |
| 6522 } | |
| 6523 | |
| 6524 /* | |
| 6525 * Function given to ExpandGeneric() to obtain the list syntax names for | |
| 6526 * expansion. | |
| 6527 */ | |
| 6528 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6529 get_syntax_name(expand_T *xp UNUSED, int idx) |
| 7 | 6530 { |
|
10534
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6531 switch (expand_what) |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6532 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6533 case EXP_SUBCMD: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6534 return (char_u *)subcommands[idx].name; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6535 case EXP_CASE: |
|
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 *case_args[] = {"match", "ignore", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6538 return (char_u *)case_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6539 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6540 case EXP_SPELL: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6541 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6542 static char *spell_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6543 {"toplevel", "notoplevel", "default", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6544 return (char_u *)spell_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6545 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6546 case EXP_SYNC: |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6547 { |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6548 static char *sync_args[] = |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6549 {"ccomment", "clear", "fromstart", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6550 "linebreaks=", "linecont", "lines=", "match", |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6551 "maxlines=", "minlines=", "region", NULL}; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6552 return (char_u *)sync_args[idx]; |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6553 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6554 } |
|
1c6db35e3527
commit https://github.com/vim/vim/commit/2d02839050a2557bf36dab37ccd9f92168a757d1
Christian Brabandt <cb@256bit.org>
parents:
10530
diff
changeset
|
6555 return NULL; |
| 7 | 6556 } |
| 6557 | |
| 6558 #endif /* FEAT_CMDL_COMPL */ | |
| 6559 | |
| 6560 /* | |
| 6561 * Function called for expression evaluation: get syntax ID at file position. | |
| 6562 */ | |
| 6563 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6564 syn_get_id( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6565 win_T *wp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6566 long lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6567 colnr_T col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6568 int trans, /* remove transparency */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6569 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
|
6570 int keep_state) /* keep state of char at "col" */ |
| 7 | 6571 { |
| 6572 /* When the position is not after the current position and in the same | |
| 6573 * line of the same buffer, need to restart parsing. */ | |
| 499 | 6574 if (wp->w_buffer != syn_buf |
| 7 | 6575 || lnum != current_lnum |
| 253 | 6576 || col < current_col) |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6577 syntax_start(wp, lnum); |
|
7685
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6578 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
|
6579 && lnum == current_lnum |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6580 && col > current_col) |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6581 /* 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
|
6582 * "skip" expression in searchpair() */ |
|
616460b73ee3
commit https://github.com/vim/vim/commit/6773a348da0dcf45df3c6c6649880655ec0d2042
Christian Brabandt <cb@256bit.org>
parents:
7504
diff
changeset
|
6583 next_match_idx = -1; |
| 7 | 6584 |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6585 (void)get_syntax_attr(col, spellp, keep_state); |
| 7 | 6586 |
| 6587 return (trans ? current_trans_id : current_id); | |
| 6588 } | |
| 6589 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6590 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6591 /* |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6592 * 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
|
6593 * 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
|
6594 * 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
|
6595 * 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
|
6596 */ |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6597 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6598 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
|
6599 { |
|
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
|
6600 *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
|
6601 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
|
6602 } |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6603 |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2318
diff
changeset
|
6604 /* |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6605 * Return conceal substitution character |
|
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 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6608 syn_get_sub_char(void) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6609 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6610 return current_sub_char; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6611 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6612 #endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6613 |
| 1500 | 6614 #if defined(FEAT_EVAL) || defined(PROTO) |
| 6615 /* | |
| 6616 * Return the syntax ID at position "i" in the current stack. | |
| 6617 * The caller must have called syn_get_id() before to fill the stack. | |
| 6618 * Returns -1 when "i" is out of range. | |
| 6619 */ | |
| 6620 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6621 syn_get_stack_item(int i) |
| 1500 | 6622 { |
| 1504 | 6623 if (i >= current_state.ga_len) |
| 6624 { | |
| 6625 /* Need to invalidate the state, because we didn't properly finish it | |
| 6626 * for the last character, "keep_state" was TRUE. */ | |
| 6627 invalidate_current_state(); | |
| 6628 current_col = MAXCOL; | |
| 1500 | 6629 return -1; |
| 1504 | 6630 } |
| 1500 | 6631 return CUR_STATE(i).si_id; |
| 6632 } | |
| 6633 #endif | |
| 6634 | |
| 7 | 6635 #if defined(FEAT_FOLDING) || defined(PROTO) |
| 6636 /* | |
| 6637 * Function called to get folding level for line "lnum" in window "wp". | |
| 6638 */ | |
| 6639 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6640 syn_get_foldlevel(win_T *wp, long lnum) |
| 7 | 6641 { |
| 6642 int level = 0; | |
| 6643 int i; | |
| 6644 | |
| 6645 /* 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
|
6646 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
|
6647 && !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
|
6648 # 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
|
6649 && !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
|
6650 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6651 ) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
6652 { |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
6653 syntax_start(wp, lnum); |
| 7 | 6654 |
| 6655 for (i = 0; i < current_state.ga_len; ++i) | |
| 6656 if (CUR_STATE(i).si_flags & HL_FOLD) | |
| 6657 ++level; | |
| 6658 } | |
| 6659 if (level > wp->w_p_fdn) | |
| 1028 | 6660 { |
| 7 | 6661 level = wp->w_p_fdn; |
| 1028 | 6662 if (level < 0) |
| 6663 level = 0; | |
| 6664 } | |
| 7 | 6665 return level; |
| 6666 } | |
| 6667 #endif | |
| 6668 | |
| 6567 | 6669 #if defined(FEAT_PROFILE) || defined(PROTO) |
|
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 * ":syntime". |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6672 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6673 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6674 ex_syntime(exarg_T *eap) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6675 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6676 if (STRCMP(eap->arg, "on") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6677 syn_time_on = TRUE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6678 else if (STRCMP(eap->arg, "off") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6679 syn_time_on = FALSE; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6680 else if (STRCMP(eap->arg, "clear") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6681 syntime_clear(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6682 else if (STRCMP(eap->arg, "report") == 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6683 syntime_report(); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6684 else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6685 EMSG2(_(e_invarg2), eap->arg); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6686 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6687 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6688 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6689 syn_clear_time(syn_time_T *st) |
|
4764
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 profile_zero(&st->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6692 profile_zero(&st->slowest); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6693 st->count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6694 st->match = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6695 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6696 |
|
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 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6699 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6700 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6701 syntime_clear(void) |
|
4764
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 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6704 synpat_T *spp; |
|
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 if (!syntax_present(curwin)) |
|
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 MSG(_(msg_no_items)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6709 return; |
|
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 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
|
6712 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6713 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6714 syn_clear_time(&spp->sp_time); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6715 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6716 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6717 |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6718 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6719 /* |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6720 * 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
|
6721 * ":syntime {on,off,clear,report}" command. |
|
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 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6724 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
|
6725 { |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6726 switch (idx) |
|
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 case 0: return (char_u *)"on"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6729 case 1: return (char_u *)"off"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6730 case 2: return (char_u *)"clear"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6731 case 3: return (char_u *)"report"; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6732 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6733 return NULL; |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6734 } |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6735 #endif |
|
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6736 |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6737 typedef struct |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6738 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6739 proftime_T total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6740 int count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6741 int match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6742 proftime_T slowest; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6743 proftime_T average; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6744 int id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6745 char_u *pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6746 } time_entry_T; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6747 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6748 static int |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6749 #ifdef __BORLANDC__ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6750 _RTLENTRYF |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6751 #endif |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6752 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
|
6753 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6754 const time_entry_T *s1 = v1; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6755 const time_entry_T *s2 = v2; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6756 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6757 return profile_cmp(&s1->total, &s2->total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6758 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6759 |
|
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 * Clear the syntax timing for the current buffer. |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6762 */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6763 static void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
6764 syntime_report(void) |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6765 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6766 int idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6767 synpat_T *spp; |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6768 # ifdef FEAT_FLOAT |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6769 proftime_T tm; |
|
4803
220bdea4f579
updated for version 7.3.1148
Bram Moolenaar <bram@vim.org>
parents:
4791
diff
changeset
|
6770 # endif |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6771 int len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6772 proftime_T total_total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6773 int total_count = 0; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6774 garray_T ga; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6775 time_entry_T *p; |
|
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 if (!syntax_present(curwin)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6778 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6779 MSG(_(msg_no_items)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6780 return; |
|
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 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6783 ga_init2(&ga, sizeof(time_entry_T), 50); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6784 profile_zero(&total_total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6785 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
|
6786 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6787 spp = &(SYN_ITEMS(curwin->w_s)[idx]); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6788 if (spp->sp_time.count > 0) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6789 { |
| 7009 | 6790 (void)ga_grow(&ga, 1); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6791 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
|
6792 p->total = spp->sp_time.total; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6793 profile_add(&total_total, &spp->sp_time.total); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6794 p->count = spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6795 p->match = spp->sp_time.match; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6796 total_count += spp->sp_time.count; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6797 p->slowest = spp->sp_time.slowest; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6798 # ifdef FEAT_FLOAT |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6799 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
|
6800 p->average = tm; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6801 # endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6802 p->id = spp->sp_syn.id; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6803 p->pattern = spp->sp_pattern; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6804 ++ga.ga_len; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6805 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6806 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6807 |
|
10530
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6808 /* 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
|
6809 * pointer to qsort(). */ |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6810 if (ga.ga_len > 1) |
|
ea5adbeccfc1
commit https://github.com/vim/vim/commit/a216255a4faa91a15e7005ac319f2f62294f3f9e
Christian Brabandt <cb@256bit.org>
parents:
10499
diff
changeset
|
6811 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
|
6812 syn_compare_syntime); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6813 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6814 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
|
6815 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6816 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
|
6817 { |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6818 p = ((time_entry_T *)ga.ga_data) + idx; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6819 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6820 MSG_PUTS(profile_msg(&p->total)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6821 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
|
6822 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6823 msg_outnum(p->count); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6824 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6825 msg_advance(20); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6826 msg_outnum(p->match); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6827 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6828 msg_advance(26); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6829 MSG_PUTS(profile_msg(&p->slowest)); |
|
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 msg_advance(38); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6832 # ifdef FEAT_FLOAT |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6833 MSG_PUTS(profile_msg(&p->average)); |
|
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 # endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6836 msg_advance(50); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6837 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
|
6838 MSG_PUTS(" "); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6839 |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6840 msg_advance(69); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6841 if (Columns < 80) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6842 len = 20; /* will wrap anyway */ |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6843 else |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6844 len = Columns - 70; |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6845 if (len > (int)STRLEN(p->pattern)) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6846 len = (int)STRLEN(p->pattern); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6847 msg_outtrans_len(p->pattern, len); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6848 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6849 } |
|
4791
65cef998f860
updated for version 7.3.1142
Bram Moolenaar <bram@vim.org>
parents:
4776
diff
changeset
|
6850 ga_clear(&ga); |
|
4764
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6851 if (!got_int) |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6852 { |
|
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 MSG_PUTS(profile_msg(&total_total)); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6855 msg_advance(13); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6856 msg_outnum(total_count); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6857 MSG_PUTS("\n"); |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6858 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6859 } |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6860 #endif |
|
f824cb97eb92
updated for version 7.3.1129
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
6861 |
| 7 | 6862 #endif /* FEAT_SYN_HL */ |
| 6863 | |
| 6864 /************************************** | |
| 6865 * Highlighting stuff * | |
| 6866 **************************************/ | |
| 6867 | |
| 6868 /* | |
| 6869 * The default highlight groups. These are compiled-in for fast startup and | |
| 6870 * they still work when the runtime files can't be found. | |
| 6871 * When making changes here, also change runtime/colors/default.vim! | |
| 806 | 6872 * The #ifdefs are needed to reduce the amount of static data. Helps to make |
| 6873 * the 16 bit DOS (museum) version compile. | |
| 7 | 6874 */ |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6875 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 809 | 6876 # define CENT(a, b) b |
| 6877 #else | |
| 6878 # define CENT(a, b) a | |
| 6879 #endif | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6880 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
|
6881 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
|
6882 "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
|
6883 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
|
6884 "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
|
6885 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
|
6886 "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
|
6887 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
|
6888 "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
|
6889 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
|
6890 "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
|
6891 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
|
6892 "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
|
6893 "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
|
6894 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
|
6895 "VertSplit term=reverse cterm=reverse gui=reverse"), |
| 806 | 6896 #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
|
6897 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
|
6898 "VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold"), |
| 806 | 6899 #endif |
| 6900 #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
|
6901 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
|
6902 "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"), |
| 806 | 6903 #endif |
| 6904 #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
|
6905 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
|
6906 "PmenuSbar ctermbg=Grey guibg=Grey"), |
| 806 | 6907 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6908 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
|
6909 "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
|
6910 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
|
6911 "TabLineFill term=reverse cterm=reverse gui=reverse"), |
| 7 | 6912 #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
|
6913 "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
|
6914 "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
|
6915 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6916 "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
|
6917 NULL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6918 }; |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6919 |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6920 /* 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
|
6921 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
|
6922 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
|
6923 "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
|
6924 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
|
6925 "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
|
6926 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
|
6927 "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
|
6928 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
|
6929 "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
|
6930 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
|
6931 "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
|
6932 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
|
6933 "Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE"), |
| 806 | 6934 #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
|
6935 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
|
6936 "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
|
6937 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
|
6938 "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
|
6939 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
|
6940 "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
|
6941 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
|
6942 "SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"), |
| 806 | 6943 #endif |
| 6944 #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
|
6945 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
|
6946 "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
|
6947 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
|
6948 "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
|
6949 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
|
6950 "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
|
6951 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6952 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
|
6953 "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
|
6954 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
|
6955 "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
|
6956 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
|
6957 "WarningMsg term=standout ctermfg=DarkRed guifg=Red"), |
| 806 | 6958 #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
|
6959 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
|
6960 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"), |
| 806 | 6961 #endif |
| 6962 #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
|
6963 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
|
6964 "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
|
6965 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
|
6966 "FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"), |
| 806 | 6967 #endif |
| 6968 #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
|
6969 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
|
6970 "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
|
6971 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6972 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
|
6973 "Visual term=reverse guibg=LightGrey"), |
| 806 | 6974 #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
|
6975 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
|
6976 "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
|
6977 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
|
6978 "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
|
6979 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
|
6980 "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan"), |
| 806 | 6981 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6982 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
|
6983 "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey"), |
| 806 | 6984 #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
|
6985 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
|
6986 "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
|
6987 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
|
6988 "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
|
6989 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
|
6990 "ColorColumn term=reverse ctermbg=LightRed guibg=LightRed"), |
| 806 | 6991 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2215
diff
changeset
|
6992 #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
|
6993 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
|
6994 "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
|
6995 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
6996 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
|
6997 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"), |
| 806 | 6998 #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
|
6999 "Normal gui=NONE", |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7000 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7001 #ifdef FEAT_TERMINAL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7002 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
|
7003 "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
|
7004 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
|
7005 "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
|
7006 #endif |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7007 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7008 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
|
7009 "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
|
7010 CENT("ToolbarButton cterm=bold ctermfg=White ctermbg=DarkGrey", |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
7011 "ToolbarButton cterm=bold ctermfg=White ctermbg=DarkGrey gui=bold guifg=White guibg=Grey40"), |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
7012 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7013 NULL |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7014 }; |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7015 |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7016 /* 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
|
7017 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
|
7018 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
|
7019 "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
|
7020 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
|
7021 "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
|
7022 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
|
7023 "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
|
7024 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
|
7025 "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
|
7026 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
|
7027 "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
|
7028 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
|
7029 "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
|
7030 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
|
7031 "SpecialKey term=bold ctermfg=LightBlue guifg=Cyan"), |
| 806 | 7032 #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
|
7033 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
|
7034 "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
|
7035 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
|
7036 "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
|
7037 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
|
7038 "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
|
7039 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
|
7040 "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"), |
| 806 | 7041 #endif |
| 7042 #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
|
7043 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
|
7044 "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
|
7045 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
|
7046 "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
|
7047 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
|
7048 "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
|
7049 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7050 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
|
7051 "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
|
7052 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
|
7053 "WarningMsg term=standout ctermfg=LightRed guifg=Red"), |
| 806 | 7054 #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
|
7055 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
|
7056 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"), |
| 806 | 7057 #endif |
| 7058 #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
|
7059 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
|
7060 "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
|
7061 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
|
7062 "FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"), |
| 806 | 7063 #endif |
| 7064 #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
|
7065 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
|
7066 "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
|
7067 #endif |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7068 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
|
7069 "Visual term=reverse guibg=DarkGrey"), |
| 806 | 7070 #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
|
7071 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
|
7072 "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
|
7073 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
|
7074 "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
|
7075 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
|
7076 "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan"), |
| 806 | 7077 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7078 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
|
7079 "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey"), |
| 806 | 7080 #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
|
7081 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
|
7082 "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
|
7083 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
|
7084 "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
|
7085 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
|
7086 "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"), |
| 834 | 7087 #endif |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7088 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
|
7089 "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"), |
|
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", |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
7105 "ToolbarLine term=underline ctermbg=DarkGrey guibg=Grey50"), |
|
12487
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 { | |
|
13810
cad480bac9e1
patch 8.0.1777: cannot cleanup before loading another colorscheme
Christian Brabandt <cb@256bit.org>
parents:
13495
diff
changeset
|
7227 apply_autocmds(EVENT_COLORSCHEMEPRE, name, |
|
cad480bac9e1
patch 8.0.1777: cannot cleanup before loading another colorscheme
Christian Brabandt <cb@256bit.org>
parents:
13495
diff
changeset
|
7228 curbuf->b_fname, FALSE, curbuf); |
| 12 | 7229 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
|
7230 retval = source_runtime(buf, DIP_START + DIP_OPT); |
| 7 | 7231 vim_free(buf); |
| 5521 | 7232 apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf); |
| 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 } |
|
12594
573f8bdeb95a
patch 8.0.1175: build failure without +termresponse
Christian Brabandt <cb@256bit.org>
parents:
12592
diff
changeset
|
7344 #ifdef FEAT_TERMRESPONSE |
|
12592
895da0cbb16e
patch 8.0.1174: Mac Terminal.app has wrong color for white
Christian Brabandt <cb@256bit.org>
parents:
12572
diff
changeset
|
7345 if (t_colors >= 256 && color == 15 && is_mac_terminal) |
|
895da0cbb16e
patch 8.0.1174: Mac Terminal.app has wrong color for white
Christian Brabandt <cb@256bit.org>
parents:
12572
diff
changeset
|
7346 /* Terminal.app has a bug: 15 is light grey. Use white |
|
895da0cbb16e
patch 8.0.1174: Mac Terminal.app has wrong color for white
Christian Brabandt <cb@256bit.org>
parents:
12572
diff
changeset
|
7347 * from the color cube instead. */ |
|
895da0cbb16e
patch 8.0.1174: Mac Terminal.app has wrong color for white
Christian Brabandt <cb@256bit.org>
parents:
12572
diff
changeset
|
7348 color = 231; |
|
12594
573f8bdeb95a
patch 8.0.1175: build failure without +termresponse
Christian Brabandt <cb@256bit.org>
parents:
12592
diff
changeset
|
7349 #endif |
|
11822
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7350 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7351 return color; |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7352 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7353 |
| 7 | 7354 /* |
| 7355 * Handle the ":highlight .." command. | |
| 7356 * When using ":hi clear" this is called recursively for each group with | |
| 7357 * "forceit" and "init" both TRUE. | |
| 7358 */ | |
| 7359 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7360 do_highlight( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7361 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7362 int forceit, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
7363 int init) /* TRUE when called for initializing */ |
| 7 | 7364 { |
| 7365 char_u *name_end; | |
| 7366 char_u *p; | |
| 7367 char_u *linep; | |
| 7368 char_u *key_start; | |
| 7369 char_u *arg_start; | |
| 7370 char_u *key = NULL, *arg = NULL; | |
| 7371 long i; | |
| 7372 int off; | |
| 7373 int len; | |
| 7374 int attr; | |
| 7375 int id; | |
| 7376 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
|
7377 struct hl_group item_before; |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
7378 int did_change = FALSE; |
| 7 | 7379 int dodefault = FALSE; |
| 7380 int doclear = FALSE; | |
| 7381 int dolink = FALSE; | |
| 7382 int error = FALSE; | |
| 7383 int color; | |
| 7384 int is_normal_group = FALSE; /* "Normal" group */ | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7385 #ifdef FEAT_TERMINAL |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7386 int is_terminal_group = FALSE; /* "Terminal" group */ |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7387 #endif |
| 7 | 7388 #ifdef FEAT_GUI_X11 |
| 7389 int is_menu_group = FALSE; /* "Menu" group */ | |
| 7390 int is_scrollbar_group = FALSE; /* "Scrollbar" group */ | |
| 7391 int is_tooltip_group = FALSE; /* "Tooltip" group */ | |
| 7392 int do_colors = FALSE; /* need to update colors? */ | |
| 7393 #else | |
| 7394 # define is_menu_group 0 | |
| 7395 # define is_tooltip_group 0 | |
| 7396 #endif | |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7397 #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
|
7398 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
|
7399 #endif |
| 7 | 7400 |
| 7401 /* | |
| 7402 * If no argument, list current highlighting. | |
| 7403 */ | |
| 7404 if (ends_excmd(*line)) | |
| 7405 { | |
| 7406 for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i) | |
| 7407 /* TODO: only call when the group has attributes set */ | |
| 7408 highlight_list_one((int)i); | |
| 7409 return; | |
| 7410 } | |
| 7411 | |
| 7412 /* | |
| 7413 * Isolate the name. | |
| 7414 */ | |
| 7415 name_end = skiptowhite(line); | |
| 7416 linep = skipwhite(name_end); | |
| 7417 | |
| 7418 /* | |
| 7419 * Check for "default" argument. | |
| 7420 */ | |
| 7421 if (STRNCMP(line, "default", name_end - line) == 0) | |
| 7422 { | |
| 7423 dodefault = TRUE; | |
| 7424 line = linep; | |
| 7425 name_end = skiptowhite(line); | |
| 7426 linep = skipwhite(name_end); | |
| 7427 } | |
| 7428 | |
| 7429 /* | |
| 7430 * Check for "clear" or "link" argument. | |
| 7431 */ | |
| 7432 if (STRNCMP(line, "clear", name_end - line) == 0) | |
| 7433 doclear = TRUE; | |
| 7434 if (STRNCMP(line, "link", name_end - line) == 0) | |
| 7435 dolink = TRUE; | |
| 7436 | |
| 7437 /* | |
| 7438 * ":highlight {group-name}": list highlighting for one group. | |
| 7439 */ | |
| 7440 if (!doclear && !dolink && ends_excmd(*linep)) | |
| 7441 { | |
| 7442 id = syn_namen2id(line, (int)(name_end - line)); | |
| 7443 if (id == 0) | |
| 7444 EMSG2(_("E411: highlight group not found: %s"), line); | |
| 7445 else | |
| 7446 highlight_list_one(id); | |
| 7447 return; | |
| 7448 } | |
| 7449 | |
| 7450 /* | |
| 7451 * Handle ":highlight link {from} {to}" command. | |
| 7452 */ | |
| 7453 if (dolink) | |
| 7454 { | |
| 7455 char_u *from_start = linep; | |
| 7456 char_u *from_end; | |
| 7457 char_u *to_start; | |
| 7458 char_u *to_end; | |
| 7459 int from_id; | |
| 7460 int to_id; | |
| 7461 | |
| 7462 from_end = skiptowhite(from_start); | |
| 7463 to_start = skipwhite(from_end); | |
| 7464 to_end = skiptowhite(to_start); | |
| 7465 | |
| 7466 if (ends_excmd(*from_start) || ends_excmd(*to_start)) | |
| 7467 { | |
| 7468 EMSG2(_("E412: Not enough arguments: \":highlight link %s\""), | |
| 7469 from_start); | |
| 7470 return; | |
| 7471 } | |
| 7472 | |
| 7473 if (!ends_excmd(*skipwhite(to_end))) | |
| 7474 { | |
| 7475 EMSG2(_("E413: Too many arguments: \":highlight link %s\""), from_start); | |
| 7476 return; | |
| 7477 } | |
| 7478 | |
| 7479 from_id = syn_check_group(from_start, (int)(from_end - from_start)); | |
| 7480 if (STRNCMP(to_start, "NONE", 4) == 0) | |
| 7481 to_id = 0; | |
| 7482 else | |
| 7483 to_id = syn_check_group(to_start, (int)(to_end - to_start)); | |
| 7484 | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7485 if (from_id > 0 && (!init || HL_TABLE()[from_id - 1].sg_set == 0)) |
| 7 | 7486 { |
| 7487 /* | |
| 7488 * Don't allow a link when there already is some highlighting | |
| 7489 * for the group, unless '!' is used | |
| 7490 */ | |
| 7491 if (to_id > 0 && !forceit && !init | |
| 7492 && hl_has_settings(from_id - 1, dodefault)) | |
| 7493 { | |
| 7494 if (sourcing_name == NULL && !dodefault) | |
| 7495 EMSG(_("E414: group has settings, highlight link ignored")); | |
| 7496 } | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7497 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
|
7498 #ifdef FEAT_EVAL |
|
12417
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_scriptID != current_SID |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7500 #endif |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7501 || HL_TABLE()[from_id - 1].sg_cleared) |
| 7 | 7502 { |
| 7503 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7504 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
|
7505 HL_TABLE()[from_id - 1].sg_link = to_id; |
| 448 | 7506 #ifdef FEAT_EVAL |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7507 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
|
7508 #endif |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7509 HL_TABLE()[from_id - 1].sg_cleared = FALSE; |
| 745 | 7510 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
|
7511 |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7512 /* 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
|
7513 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
|
7514 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7515 } |
| 7 | 7516 |
| 7517 return; | |
| 7518 } | |
| 7519 | |
| 7520 if (doclear) | |
| 7521 { | |
| 7522 /* | |
| 7523 * ":highlight clear [group]" command. | |
| 7524 */ | |
| 7525 line = linep; | |
| 7526 if (ends_excmd(*line)) | |
| 7527 { | |
| 7528 #ifdef FEAT_GUI | |
| 7529 /* First, we do not destroy the old values, but allocate the new | |
| 7530 * ones and update the display. THEN we destroy the old values. | |
| 7531 * If we destroy the old values first, then the old values | |
| 7532 * (such as GuiFont's or GuiFontset's) will still be displayed but | |
| 7533 * invalid because they were free'd. | |
| 7534 */ | |
| 7535 if (gui.in_use) | |
| 7536 { | |
| 7537 # ifdef FEAT_BEVAL_TIP | |
| 7538 gui_init_tooltip_font(); | |
| 7539 # endif | |
| 7540 # if defined(FEAT_MENU) && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) | |
| 7541 gui_init_menu_font(); | |
| 7542 # endif | |
| 7543 } | |
| 7544 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_X11) | |
| 7545 gui_mch_def_colors(); | |
| 7546 # endif | |
| 7547 # ifdef FEAT_GUI_X11 | |
| 7548 # ifdef FEAT_MENU | |
| 7549 | |
| 7550 /* This only needs to be done when there is no Menu highlight | |
| 7551 * group defined by default, which IS currently the case. | |
| 7552 */ | |
| 7553 gui_mch_new_menu_colors(); | |
| 7554 # endif | |
| 7555 if (gui.in_use) | |
| 7556 { | |
| 7557 gui_new_scrollbar_colors(); | |
|
12871
1a450ce6980c
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Christian Brabandt <cb@256bit.org>
parents:
12594
diff
changeset
|
7558 # ifdef FEAT_BEVAL_GUI |
| 7 | 7559 gui_mch_new_tooltip_colors(); |
| 7560 # endif | |
| 7561 # ifdef FEAT_MENU | |
| 7562 gui_mch_new_menu_font(); | |
| 7563 # endif | |
| 7564 } | |
| 7565 # endif | |
| 7566 | |
| 7567 /* Ok, we're done allocating the new default graphics items. | |
| 7568 * The screen should already be refreshed at this point. | |
| 7569 * It is now Ok to clear out the old data. | |
| 7570 */ | |
| 7571 #endif | |
| 7572 #ifdef FEAT_EVAL | |
| 148 | 7573 do_unlet((char_u *)"colors_name", TRUE); |
| 7 | 7574 #endif |
| 7575 restore_cterm_colors(); | |
| 7576 | |
| 7577 /* | |
| 7578 * Clear all default highlight groups and load the defaults. | |
| 7579 */ | |
| 7580 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 7581 highlight_clear(idx); | |
| 7582 init_highlight(TRUE, TRUE); | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7583 #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
|
7584 if (USE_24BIT) |
| 7 | 7585 highlight_gui_started(); |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7586 else |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7587 #endif |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
7588 highlight_changed(); |
| 7 | 7589 redraw_later_clear(); |
| 7590 return; | |
| 7591 } | |
| 7592 name_end = skiptowhite(line); | |
| 7593 linep = skipwhite(name_end); | |
| 7594 } | |
| 7595 | |
| 7596 /* | |
| 7597 * Find the group name in the table. If it does not exist yet, add it. | |
| 7598 */ | |
| 7599 id = syn_check_group(line, (int)(name_end - line)); | |
| 7600 if (id == 0) /* failed (out of memory) */ | |
| 7601 return; | |
| 7602 idx = id - 1; /* index is ID minus one */ | |
| 7603 | |
| 7604 /* Return if "default" was used and the group already has settings. */ | |
| 7605 if (dodefault && hl_has_settings(idx, TRUE)) | |
| 7606 return; | |
| 7607 | |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7608 /* 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
|
7609 item_before = HL_TABLE()[idx]; |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7610 |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7611 if (STRCMP(HL_TABLE()[idx].sg_name_u, "NORMAL") == 0) |
| 7 | 7612 is_normal_group = TRUE; |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7613 #ifdef FEAT_TERMINAL |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7614 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "TERMINAL") == 0) |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7615 is_terminal_group = TRUE; |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
7616 #endif |
| 7 | 7617 #ifdef FEAT_GUI_X11 |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7618 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "MENU") == 0) |
| 7 | 7619 is_menu_group = TRUE; |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7620 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "SCROLLBAR") == 0) |
| 7 | 7621 is_scrollbar_group = TRUE; |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7622 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "TOOLTIP") == 0) |
| 7 | 7623 is_tooltip_group = TRUE; |
| 7624 #endif | |
| 7625 | |
| 7626 /* Clear the highlighting for ":hi clear {group}" and ":hi clear". */ | |
| 7627 if (doclear || (forceit && init)) | |
| 7628 { | |
| 7629 highlight_clear(idx); | |
| 7630 if (!doclear) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7631 HL_TABLE()[idx].sg_set = 0; |
| 7 | 7632 } |
| 7633 | |
| 7634 if (!doclear) | |
| 7635 while (!ends_excmd(*linep)) | |
| 7636 { | |
| 7637 key_start = linep; | |
| 7638 if (*linep == '=') | |
| 7639 { | |
| 7640 EMSG2(_("E415: unexpected equal sign: %s"), key_start); | |
| 7641 error = TRUE; | |
| 7642 break; | |
| 7643 } | |
| 7644 | |
| 7645 /* | |
| 7646 * Isolate the key ("term", "ctermfg", "ctermbg", "font", "guifg" or | |
| 7647 * "guibg"). | |
| 7648 */ | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
7649 while (*linep && !VIM_ISWHITE(*linep) && *linep != '=') |
| 7 | 7650 ++linep; |
| 7651 vim_free(key); | |
| 7652 key = vim_strnsave_up(key_start, (int)(linep - key_start)); | |
| 7653 if (key == NULL) | |
| 7654 { | |
| 7655 error = TRUE; | |
| 7656 break; | |
| 7657 } | |
| 7658 linep = skipwhite(linep); | |
| 7659 | |
| 7660 if (STRCMP(key, "NONE") == 0) | |
| 7661 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7662 if (!init || HL_TABLE()[idx].sg_set == 0) |
| 7 | 7663 { |
| 7664 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7665 HL_TABLE()[idx].sg_set |= SG_TERM+SG_CTERM+SG_GUI; |
| 7 | 7666 highlight_clear(idx); |
| 7667 } | |
| 7668 continue; | |
| 7669 } | |
| 7670 | |
| 7671 /* | |
| 7672 * Check for the equal sign. | |
| 7673 */ | |
| 7674 if (*linep != '=') | |
| 7675 { | |
| 7676 EMSG2(_("E416: missing equal sign: %s"), key_start); | |
| 7677 error = TRUE; | |
| 7678 break; | |
| 7679 } | |
| 7680 ++linep; | |
| 7681 | |
| 7682 /* | |
| 7683 * Isolate the argument. | |
| 7684 */ | |
| 7685 linep = skipwhite(linep); | |
| 7686 if (*linep == '\'') /* guifg='color name' */ | |
| 7687 { | |
| 7688 arg_start = ++linep; | |
| 7689 linep = vim_strchr(linep, '\''); | |
| 7690 if (linep == NULL) | |
| 7691 { | |
| 7692 EMSG2(_(e_invarg2), key_start); | |
| 7693 error = TRUE; | |
| 7694 break; | |
| 7695 } | |
| 7696 } | |
| 7697 else | |
| 7698 { | |
| 7699 arg_start = linep; | |
| 7700 linep = skiptowhite(linep); | |
| 7701 } | |
| 7702 if (linep == arg_start) | |
| 7703 { | |
| 7704 EMSG2(_("E417: missing argument: %s"), key_start); | |
| 7705 error = TRUE; | |
| 7706 break; | |
| 7707 } | |
| 7708 vim_free(arg); | |
| 7709 arg = vim_strnsave(arg_start, (int)(linep - arg_start)); | |
| 7710 if (arg == NULL) | |
| 7711 { | |
| 7712 error = TRUE; | |
| 7713 break; | |
| 7714 } | |
| 7715 if (*linep == '\'') | |
| 7716 ++linep; | |
| 7717 | |
| 7718 /* | |
| 7719 * Store the argument. | |
| 7720 */ | |
| 7721 if ( STRCMP(key, "TERM") == 0 | |
| 7722 || STRCMP(key, "CTERM") == 0 | |
| 7723 || STRCMP(key, "GUI") == 0) | |
| 7724 { | |
| 7725 attr = 0; | |
| 7726 off = 0; | |
| 7727 while (arg[off] != NUL) | |
| 7728 { | |
| 7729 for (i = sizeof(hl_attr_table) / sizeof(int); --i >= 0; ) | |
| 7730 { | |
| 7731 len = (int)STRLEN(hl_name_table[i]); | |
| 7732 if (STRNICMP(arg + off, hl_name_table[i], len) == 0) | |
| 7733 { | |
| 7734 attr |= hl_attr_table[i]; | |
| 7735 off += len; | |
| 7736 break; | |
| 7737 } | |
| 7738 } | |
| 7739 if (i < 0) | |
| 7740 { | |
| 7741 EMSG2(_("E418: Illegal value: %s"), arg); | |
| 7742 error = TRUE; | |
| 7743 break; | |
| 7744 } | |
| 7745 if (arg[off] == ',') /* another one follows */ | |
| 7746 ++off; | |
| 7747 } | |
| 7748 if (error) | |
| 7749 break; | |
| 7750 if (*key == 'T') | |
| 7751 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7752 if (!init || !(HL_TABLE()[idx].sg_set & SG_TERM)) |
| 7 | 7753 { |
| 7754 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7755 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
|
7756 HL_TABLE()[idx].sg_term = attr; |
| 7 | 7757 } |
| 7758 } | |
| 7759 else if (*key == 'C') | |
| 7760 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7761 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM)) |
| 7 | 7762 { |
| 7763 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7764 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
|
7765 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
|
7766 HL_TABLE()[idx].sg_cterm_bold = FALSE; |
| 7 | 7767 } |
| 7768 } | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
7769 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 7770 else |
| 7771 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7772 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 7773 { |
| 7774 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7775 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
|
7776 HL_TABLE()[idx].sg_gui = attr; |
| 7 | 7777 } |
| 7778 } | |
| 7779 #endif | |
| 7780 } | |
| 7781 else if (STRCMP(key, "FONT") == 0) | |
| 7782 { | |
| 7783 /* in non-GUI fonts are simply ignored */ | |
| 7784 #ifdef FEAT_GUI | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7785 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
|
7786 && 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
|
7787 { |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7788 /* 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
|
7789 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
7790 else if (!gui.shell_created) |
| 7 | 7791 { |
| 7792 /* 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
|
7793 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
|
7794 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
7795 did_change = TRUE; |
| 7 | 7796 } |
| 7797 else | |
| 7798 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7799 GuiFont temp_sg_font = HL_TABLE()[idx].sg_font; |
| 7 | 7800 # ifdef FEAT_XFONTSET |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7801 GuiFontset temp_sg_fontset = HL_TABLE()[idx].sg_fontset; |
| 7 | 7802 # endif |
| 7803 /* First, save the current font/fontset. | |
| 7804 * 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
|
7805 * If the allocation fails, HL_TABLE()[idx].sg_font OR |
| 7 | 7806 * sg_fontset will be set to NOFONT or NOFONTSET respectively. |
| 7807 */ | |
| 7808 | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7809 HL_TABLE()[idx].sg_font = NOFONT; |
| 7 | 7810 # ifdef FEAT_XFONTSET |
|
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 = NOFONTSET; |
| 7 | 7812 # endif |
| 7813 hl_do_font(idx, arg, is_normal_group, is_menu_group, | |
| 3881 | 7814 is_tooltip_group, FALSE); |
| 7 | 7815 |
| 7816 # ifdef FEAT_XFONTSET | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7817 if (HL_TABLE()[idx].sg_fontset != NOFONTSET) |
| 7 | 7818 { |
| 3881 | 7819 /* New fontset was accepted. Free the old one, if there |
| 7820 * was one. */ | |
| 7 | 7821 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
|
7822 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
|
7823 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
7824 did_change = TRUE; |
| 7 | 7825 } |
| 7826 else | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7827 HL_TABLE()[idx].sg_fontset = temp_sg_fontset; |
| 7 | 7828 # endif |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7829 if (HL_TABLE()[idx].sg_font != NOFONT) |
| 7 | 7830 { |
| 7831 /* New font was accepted. Free the old one, if there was | |
| 3881 | 7832 * one. */ |
| 7 | 7833 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
|
7834 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
|
7835 HL_TABLE()[idx].sg_font_name = vim_strsave(arg); |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
7836 did_change = TRUE; |
| 7 | 7837 } |
| 7838 else | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7839 HL_TABLE()[idx].sg_font = temp_sg_font; |
| 7 | 7840 } |
| 7841 #endif | |
| 7842 } | |
| 7843 else if (STRCMP(key, "CTERMFG") == 0 || STRCMP(key, "CTERMBG") == 0) | |
| 7844 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7845 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM)) |
| 7 | 7846 { |
| 7847 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7848 HL_TABLE()[idx].sg_set |= SG_CTERM; |
| 7 | 7849 |
| 7850 /* When setting the foreground color, and previously the "bold" | |
| 7851 * 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
|
7852 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
|
7853 { |
|
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7854 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
|
7855 HL_TABLE()[idx].sg_cterm_bold = FALSE; |
| 7 | 7856 } |
| 7857 | |
| 7858 if (VIM_ISDIGIT(*arg)) | |
| 7859 color = atoi((char *)arg); | |
| 7860 else if (STRICMP(arg, "fg") == 0) | |
| 7861 { | |
| 7862 if (cterm_normal_fg_color) | |
| 7863 color = cterm_normal_fg_color - 1; | |
| 7864 else | |
| 7865 { | |
| 7866 EMSG(_("E419: FG color unknown")); | |
| 7867 error = TRUE; | |
| 7868 break; | |
| 7869 } | |
| 7870 } | |
| 7871 else if (STRICMP(arg, "bg") == 0) | |
| 7872 { | |
| 7873 if (cterm_normal_bg_color > 0) | |
| 7874 color = cterm_normal_bg_color - 1; | |
| 7875 else | |
| 7876 { | |
| 7877 EMSG(_("E420: BG color unknown")); | |
| 7878 error = TRUE; | |
| 7879 break; | |
| 7880 } | |
| 7881 } | |
| 7882 else | |
| 7883 { | |
|
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
|
7884 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
|
7885 |
| 7 | 7886 #if defined(__QNXNTO__) |
| 7887 static int *color_numbers_8_qansi = color_numbers_8; | |
| 7888 /* On qnx, the 8 & 16 color arrays are the same */ | |
| 7889 if (STRNCMP(T_NAME, "qansi", 5) == 0) | |
| 7890 color_numbers_8_qansi = color_numbers_16; | |
| 7891 #endif | |
| 7892 | |
| 7893 /* reduce calls to STRICMP a bit, it can be slow */ | |
| 7894 off = TOUPPER_ASC(*arg); | |
| 7895 for (i = (sizeof(color_names) / sizeof(char *)); --i >= 0; ) | |
| 7896 if (off == color_names[i][0] | |
| 7897 && STRICMP(arg + 1, color_names[i] + 1) == 0) | |
| 7898 break; | |
| 7899 if (i < 0) | |
| 7900 { | |
| 7901 EMSG2(_("E421: Color name or number not recognized: %s"), key_start); | |
| 7902 error = TRUE; | |
| 7903 break; | |
| 7904 } | |
| 7905 | |
|
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
|
7906 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
|
7907 |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7908 /* 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
|
7909 * 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
|
7910 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
|
7911 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7912 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
|
7913 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
|
7914 } |
|
35d7459251fd
patch 8.0.0831: with 8 colors the bold attribute is not set properly
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
7915 else if (bold == FALSE) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7916 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
|
7917 } |
|
1e237c5994fc
patch 8.0.0791: terminal colors depend on the system
Christian Brabandt <cb@256bit.org>
parents:
11755
diff
changeset
|
7918 |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7919 /* 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
|
7920 * "NONE", then "color" is -1. */ |
| 7 | 7921 if (key[5] == 'F') |
| 7922 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7923 HL_TABLE()[idx].sg_cterm_fg = color + 1; |
| 7 | 7924 if (is_normal_group) |
| 7925 { | |
| 7926 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
|
7927 cterm_normal_fg_bold = (HL_TABLE()[idx].sg_cterm & HL_BOLD); |
| 7 | 7928 #ifdef FEAT_GUI |
| 7929 /* Don't do this 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 (termcap_active && color >= 0) |
| 7 | 7935 term_fg_color(color); |
| 7936 } | |
| 7937 } | |
| 7938 } | |
| 7939 else | |
| 7940 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7941 HL_TABLE()[idx].sg_cterm_bg = color + 1; |
| 7 | 7942 if (is_normal_group) |
| 7943 { | |
| 7944 cterm_normal_bg_color = color + 1; | |
| 7945 #ifdef FEAT_GUI | |
| 7946 /* Don't mess with 'background' if the GUI is used. */ | |
| 7947 if (!gui.in_use && !gui.starting) | |
| 7948 #endif | |
| 7949 { | |
| 7950 must_redraw = CLEAR; | |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7951 if (color >= 0) |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7952 { |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7953 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
|
7954 |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7955 if (termcap_active) |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7956 term_bg_color(color); |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7957 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
|
7958 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
|
7959 /* 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
|
7960 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
|
7961 dark = (color < 7 || color == 8); |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7962 /* Set the 'background' option if the value is |
|
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7963 * wrong. */ |
|
11465
7cbcba782c4e
patch 8.0.0616: not always setting 'background' correctly after :hi Normal
Christian Brabandt <cb@256bit.org>
parents:
11254
diff
changeset
|
7964 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
|
7965 && 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
|
7966 && !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
|
7967 { |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7968 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
|
7969 (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
|
7970 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
|
7971 } |
|
2136
431ebc9412a8
updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents:
2123
diff
changeset
|
7972 } |
| 7 | 7973 } |
| 7974 } | |
| 7975 } | |
| 7976 } | |
| 7977 } | |
| 7978 else if (STRCMP(key, "GUIFG") == 0) | |
| 7979 { | |
|
12537
a24356fd94d8
patch 8.0.1147: fail to build with tiny features
Christian Brabandt <cb@256bit.org>
parents:
12535
diff
changeset
|
7980 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7981 char_u **namep = &HL_TABLE()[idx].sg_gui_fg_name; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7982 |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7983 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 7984 { |
| 205 | 7985 if (!init) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7986 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 7987 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7988 # 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
|
7989 /* In GUI guifg colors are only used when recognized */ |
| 205 | 7990 i = color_name2handle(arg); |
|
9029
f06767547415
commit https://github.com/vim/vim/commit/631225627d448b591e529a5d3e7ac74ef44b8459
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
7991 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !USE_24BIT) |
| 205 | 7992 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
7993 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
|
7994 # endif |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7995 if (*namep == NULL || STRCMP(*namep, arg) != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7996 { |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7997 vim_free(*namep); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7998 if (STRCMP(arg, "NONE") != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
7999 *namep = vim_strsave(arg); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8000 else |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8001 *namep = NULL; |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8002 did_change = TRUE; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8003 } |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8004 # 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
|
8005 # ifdef FEAT_GUI_X11 |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8006 if (is_menu_group && gui.menu_fg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8007 { |
| 205 | 8008 gui.menu_fg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8009 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8010 } |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8011 if (is_scrollbar_group && gui.scroll_fg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8012 { |
| 205 | 8013 gui.scroll_fg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8014 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8015 } |
|
12871
1a450ce6980c
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Christian Brabandt <cb@256bit.org>
parents:
12594
diff
changeset
|
8016 # ifdef FEAT_BEVAL_GUI |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8017 if (is_tooltip_group && gui.tooltip_fg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8018 { |
| 205 | 8019 gui.tooltip_fg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8020 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8021 } |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8022 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8023 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8024 } |
| 7 | 8025 # endif |
| 8026 } | |
| 8027 #endif | |
| 8028 } | |
| 8029 else if (STRCMP(key, "GUIBG") == 0) | |
| 8030 { | |
|
12537
a24356fd94d8
patch 8.0.1147: fail to build with tiny features
Christian Brabandt <cb@256bit.org>
parents:
12535
diff
changeset
|
8031 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8032 char_u **namep = &HL_TABLE()[idx].sg_gui_bg_name; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8033 |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8034 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 7 | 8035 { |
| 205 | 8036 if (!init) |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8037 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 8038 |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8039 # 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
|
8040 /* In GUI guifg colors are only used when recognized */ |
| 205 | 8041 i = color_name2handle(arg); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8042 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !USE_24BIT) |
| 205 | 8043 { |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8044 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
|
8045 # endif |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8046 if (*namep == NULL || STRCMP(*namep, arg) != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8047 { |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8048 vim_free(*namep); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8049 if (STRCMP(arg, "NONE") != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8050 *namep = vim_strsave(arg); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8051 else |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8052 *namep = NULL; |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8053 did_change = TRUE; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8054 } |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8055 # 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
|
8056 # ifdef FEAT_GUI_X11 |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8057 if (is_menu_group && gui.menu_bg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8058 { |
| 205 | 8059 gui.menu_bg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8060 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8061 } |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8062 if (is_scrollbar_group && gui.scroll_bg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8063 { |
| 205 | 8064 gui.scroll_bg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8065 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8066 } |
|
12871
1a450ce6980c
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Christian Brabandt <cb@256bit.org>
parents:
12594
diff
changeset
|
8067 # ifdef FEAT_BEVAL_GUI |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8068 if (is_tooltip_group && gui.tooltip_bg_pixel != i) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8069 { |
| 205 | 8070 gui.tooltip_bg_pixel = i; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8071 do_colors = TRUE; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8072 } |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8073 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8074 # endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8075 } |
| 7 | 8076 # endif |
| 8077 } | |
| 205 | 8078 #endif |
| 8079 } | |
| 8080 else if (STRCMP(key, "GUISP") == 0) | |
| 8081 { | |
|
12537
a24356fd94d8
patch 8.0.1147: fail to build with tiny features
Christian Brabandt <cb@256bit.org>
parents:
12535
diff
changeset
|
8082 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8083 char_u **namep = &HL_TABLE()[idx].sg_gui_sp_name; |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8084 |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8085 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI)) |
| 205 | 8086 { |
| 8087 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8088 HL_TABLE()[idx].sg_set |= SG_GUI; |
| 205 | 8089 |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8090 # ifdef FEAT_GUI |
| 205 | 8091 i = color_name2handle(arg); |
| 8092 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use) | |
| 8093 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8094 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
|
8095 # endif |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8096 if (*namep == NULL || STRCMP(*namep, arg) != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8097 { |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8098 vim_free(*namep); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8099 if (STRCMP(arg, "NONE") != 0) |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8100 *namep = vim_strsave(arg); |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8101 else |
|
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8102 *namep = NULL; |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8103 did_change = TRUE; |
|
12535
523162252b06
patch 8.0.1146: redraw when highlight is set with same names
Christian Brabandt <cb@256bit.org>
parents:
12511
diff
changeset
|
8104 } |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8105 # ifdef FEAT_GUI |
| 205 | 8106 } |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8107 # endif |
| 205 | 8108 } |
| 7 | 8109 #endif |
| 8110 } | |
| 8111 else if (STRCMP(key, "START") == 0 || STRCMP(key, "STOP") == 0) | |
| 8112 { | |
| 8113 char_u buf[100]; | |
| 8114 char_u *tname; | |
| 8115 | |
| 8116 if (!init) | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8117 HL_TABLE()[idx].sg_set |= SG_TERM; |
| 7 | 8118 |
| 8119 /* | |
| 8120 * The "start" and "stop" arguments can be a literal escape | |
| 1222 | 8121 * sequence, or a comma separated list of terminal codes. |
| 7 | 8122 */ |
| 8123 if (STRNCMP(arg, "t_", 2) == 0) | |
| 8124 { | |
| 8125 off = 0; | |
| 8126 buf[0] = 0; | |
| 8127 while (arg[off] != NUL) | |
| 8128 { | |
| 8129 /* Isolate one termcap name */ | |
| 8130 for (len = 0; arg[off + len] && | |
| 8131 arg[off + len] != ','; ++len) | |
| 8132 ; | |
| 8133 tname = vim_strnsave(arg + off, len); | |
| 8134 if (tname == NULL) /* out of memory */ | |
| 8135 { | |
| 8136 error = TRUE; | |
| 8137 break; | |
| 8138 } | |
| 8139 /* lookup the escape sequence for the item */ | |
| 8140 p = get_term_code(tname); | |
| 8141 vim_free(tname); | |
| 8142 if (p == NULL) /* ignore non-existing things */ | |
| 8143 p = (char_u *)""; | |
| 8144 | |
| 8145 /* Append it to the already found stuff */ | |
| 8146 if ((int)(STRLEN(buf) + STRLEN(p)) >= 99) | |
| 8147 { | |
| 8148 EMSG2(_("E422: terminal code too long: %s"), arg); | |
| 8149 error = TRUE; | |
| 8150 break; | |
| 8151 } | |
| 8152 STRCAT(buf, p); | |
| 8153 | |
| 8154 /* Advance to the next item */ | |
| 8155 off += len; | |
| 8156 if (arg[off] == ',') /* another one follows */ | |
| 8157 ++off; | |
| 8158 } | |
| 8159 } | |
| 8160 else | |
| 8161 { | |
| 8162 /* | |
| 8163 * Copy characters from arg[] to buf[], translating <> codes. | |
| 8164 */ | |
| 2593 | 8165 for (p = arg, off = 0; off < 100 - 6 && *p; ) |
| 7 | 8166 { |
|
9869
989d44d35a66
commit https://github.com/vim/vim/commit/35a4cfa200917dd171b1fff3cd5b6cee9add673d
Christian Brabandt <cb@256bit.org>
parents:
9141
diff
changeset
|
8167 len = trans_special(&p, buf + off, FALSE, FALSE); |
| 2593 | 8168 if (len > 0) /* recognized special char */ |
| 7 | 8169 off += len; |
| 8170 else /* copy as normal char */ | |
| 8171 buf[off++] = *p++; | |
| 8172 } | |
| 8173 buf[off] = NUL; | |
| 8174 } | |
| 8175 if (error) | |
| 8176 break; | |
| 8177 | |
| 8178 if (STRCMP(buf, "NONE") == 0) /* resetting the value */ | |
| 8179 p = NULL; | |
| 8180 else | |
| 8181 p = vim_strsave(buf); | |
| 8182 if (key[2] == 'A') | |
| 8183 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8184 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
|
8185 HL_TABLE()[idx].sg_start = p; |
| 7 | 8186 } |
| 8187 else | |
| 8188 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8189 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
|
8190 HL_TABLE()[idx].sg_stop = p; |
| 7 | 8191 } |
| 8192 } | |
| 8193 else | |
| 8194 { | |
| 8195 EMSG2(_("E423: Illegal argument: %s"), key_start); | |
| 8196 error = TRUE; | |
| 8197 break; | |
| 8198 } | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8199 HL_TABLE()[idx].sg_cleared = FALSE; |
| 7 | 8200 |
| 8201 /* | |
| 8202 * When highlighting has been given for a group, don't link it. | |
| 8203 */ | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8204 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
|
8205 HL_TABLE()[idx].sg_link = 0; |
| 7 | 8206 |
| 8207 /* | |
| 8208 * Continue with next argument. | |
| 8209 */ | |
| 8210 linep = skipwhite(linep); | |
| 8211 } | |
| 8212 | |
| 8213 /* | |
| 8214 * If there is an error, and it's a new entry, remove it from the table. | |
| 8215 */ | |
| 8216 if (error && idx == highlight_ga.ga_len) | |
| 8217 syn_unadd_group(); | |
| 8218 else | |
| 8219 { | |
| 8220 if (is_normal_group) | |
| 8221 { | |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8222 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
|
8223 HL_TABLE()[idx].sg_cterm_attr = 0; |
| 7 | 8224 #ifdef FEAT_GUI |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8225 HL_TABLE()[idx].sg_gui_attr = 0; |
| 7 | 8226 /* |
| 8227 * Need to update all groups, because they might be using "bg" | |
| 8228 * and/or "fg", which have been changed now. | |
| 8229 */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8230 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8231 #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
|
8232 if (USE_24BIT) |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8233 { |
| 7 | 8234 highlight_gui_started(); |
|
12397
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8235 did_highlight_changed = TRUE; |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8236 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
|
8237 } |
| 7 | 8238 #endif |
| 8239 } | |
|
12973
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
8240 #ifdef FEAT_TERMINAL |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
8241 else if (is_terminal_group) |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
8242 set_terminal_default_colors( |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
8243 HL_TABLE()[idx].sg_cterm_fg, HL_TABLE()[idx].sg_cterm_bg); |
|
418941f0df08
patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Christian Brabandt <cb@256bit.org>
parents:
12871
diff
changeset
|
8244 #endif |
| 7 | 8245 #ifdef FEAT_GUI_X11 |
| 8246 # ifdef FEAT_MENU | |
| 8247 else if (is_menu_group) | |
| 8248 { | |
| 8249 if (gui.in_use && do_colors) | |
| 8250 gui_mch_new_menu_colors(); | |
| 8251 } | |
| 8252 # endif | |
| 8253 else if (is_scrollbar_group) | |
| 8254 { | |
| 8255 if (gui.in_use && do_colors) | |
| 8256 gui_new_scrollbar_colors(); | |
| 8257 } | |
|
12871
1a450ce6980c
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Christian Brabandt <cb@256bit.org>
parents:
12594
diff
changeset
|
8258 # ifdef FEAT_BEVAL_GUI |
| 7 | 8259 else if (is_tooltip_group) |
| 8260 { | |
| 8261 if (gui.in_use && do_colors) | |
| 8262 gui_mch_new_tooltip_colors(); | |
| 8263 } | |
| 8264 # endif | |
| 8265 #endif | |
| 8266 else | |
| 8267 set_hl_attr(idx); | |
| 448 | 8268 #ifdef FEAT_EVAL |
|
12417
c14c81302b75
patch 8.0.1088: occasional memory use after free
Christian Brabandt <cb@256bit.org>
parents:
12397
diff
changeset
|
8269 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
|
8270 #endif |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8271 } |
|
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8272 |
| 7 | 8273 vim_free(key); |
| 8274 vim_free(arg); | |
| 8275 | |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8276 /* 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
|
8277 * commands, and only if an attribute actually changed. */ |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8278 if ((did_change |
|
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8279 || 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
|
8280 #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
|
8281 && !did_highlight_changed |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8282 #endif |
|
2bac51746e2b
patch 8.0.1078: using freed memory with ":hi Normal"
Christian Brabandt <cb@256bit.org>
parents:
12385
diff
changeset
|
8283 ) |
|
12385
972732a27d7c
patch 8.0.1072: :highlight command causes a redraw even when nothing changed
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
8284 { |
|
12572
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8285 /* Do not trigger a redraw when highlighting is changed while |
|
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8286 * redrawing. This may happen when evaluating 'statusline' changes the |
|
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8287 * StatusLine group. */ |
|
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8288 if (!updating_screen) |
|
31737ff54115
patch 8.0.1164: changing StatusLine highlight does not always work
Christian Brabandt <cb@256bit.org>
parents:
12562
diff
changeset
|
8289 redraw_all_later(NOT_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
|
8290 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
|
8291 } |
| 7 | 8292 } |
| 8293 | |
| 356 | 8294 #if defined(EXITFREE) || defined(PROTO) |
| 8295 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8296 free_highlight(void) |
| 356 | 8297 { |
| 8298 int i; | |
| 8299 | |
| 8300 for (i = 0; i < highlight_ga.ga_len; ++i) | |
| 359 | 8301 { |
| 356 | 8302 highlight_clear(i); |
| 359 | 8303 vim_free(HL_TABLE()[i].sg_name); |
| 8304 vim_free(HL_TABLE()[i].sg_name_u); | |
| 8305 } | |
| 356 | 8306 ga_clear(&highlight_ga); |
| 8307 } | |
| 8308 #endif | |
| 8309 | |
| 7 | 8310 /* |
| 8311 * Reset the cterm colors to what they were before Vim was started, if | |
| 8312 * possible. Otherwise reset them to zero. | |
| 8313 */ | |
| 8314 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8315 restore_cterm_colors(void) |
| 7 | 8316 { |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7835
diff
changeset
|
8317 #if defined(WIN3264) && !defined(FEAT_GUI_W32) |
| 7 | 8318 /* Since t_me has been set, this probably means that the user |
| 8319 * wants to use this as default colors. Need to reset default | |
| 8320 * background/foreground colors. */ | |
| 8321 mch_set_normal_colors(); | |
| 8322 #else | |
| 8323 cterm_normal_fg_color = 0; | |
| 8324 cterm_normal_fg_bold = 0; | |
| 8325 cterm_normal_bg_color = 0; | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8326 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8327 cterm_normal_fg_gui_color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8328 cterm_normal_bg_gui_color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8329 # endif |
| 7 | 8330 #endif |
| 8331 } | |
| 8332 | |
| 8333 /* | |
| 8334 * Return TRUE if highlight group "idx" has any settings. | |
| 8335 * When "check_link" is TRUE also check for an existing link. | |
| 8336 */ | |
| 8337 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8338 hl_has_settings(int idx, int check_link) |
| 7 | 8339 { |
| 8340 return ( HL_TABLE()[idx].sg_term_attr != 0 | |
| 8341 || HL_TABLE()[idx].sg_cterm_attr != 0 | |
| 5954 | 8342 || HL_TABLE()[idx].sg_cterm_fg != 0 |
| 8343 || HL_TABLE()[idx].sg_cterm_bg != 0 | |
| 7 | 8344 #ifdef FEAT_GUI |
| 8345 || HL_TABLE()[idx].sg_gui_attr != 0 | |
| 5954 | 8346 || HL_TABLE()[idx].sg_gui_fg_name != NULL |
| 8347 || HL_TABLE()[idx].sg_gui_bg_name != NULL | |
| 8348 || 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
|
8349 || HL_TABLE()[idx].sg_font_name != NULL |
| 7 | 8350 #endif |
| 8351 || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK))); | |
| 8352 } | |
| 8353 | |
| 8354 /* | |
| 8355 * Clear highlighting for one group. | |
| 8356 */ | |
| 8357 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8358 highlight_clear(int idx) |
| 7 | 8359 { |
|
10624
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
8360 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
|
8361 |
| 7 | 8362 HL_TABLE()[idx].sg_term = 0; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8363 VIM_CLEAR(HL_TABLE()[idx].sg_start); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8364 VIM_CLEAR(HL_TABLE()[idx].sg_stop); |
| 7 | 8365 HL_TABLE()[idx].sg_term_attr = 0; |
| 8366 HL_TABLE()[idx].sg_cterm = 0; | |
| 8367 HL_TABLE()[idx].sg_cterm_bold = FALSE; | |
| 8368 HL_TABLE()[idx].sg_cterm_fg = 0; | |
| 8369 HL_TABLE()[idx].sg_cterm_bg = 0; | |
| 8370 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
|
8371 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 8372 HL_TABLE()[idx].sg_gui = 0; |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8373 VIM_CLEAR(HL_TABLE()[idx].sg_gui_fg_name); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8374 VIM_CLEAR(HL_TABLE()[idx].sg_gui_bg_name); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8375 VIM_CLEAR(HL_TABLE()[idx].sg_gui_sp_name); |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8376 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8377 #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
|
8378 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
|
8379 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
|
8380 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8381 #ifdef FEAT_GUI |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
8382 HL_TABLE()[idx].sg_gui_sp = INVALCOLOR; |
| 7 | 8383 gui_mch_free_font(HL_TABLE()[idx].sg_font); |
| 8384 HL_TABLE()[idx].sg_font = NOFONT; | |
| 8385 # ifdef FEAT_XFONTSET | |
| 8386 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); | |
| 8387 HL_TABLE()[idx].sg_fontset = NOFONTSET; | |
| 8388 # endif | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
12973
diff
changeset
|
8389 VIM_CLEAR(HL_TABLE()[idx].sg_font_name); |
| 7 | 8390 HL_TABLE()[idx].sg_gui_attr = 0; |
| 8391 #endif | |
| 448 | 8392 #ifdef FEAT_EVAL |
| 8393 /* Clear the script ID only when there is no link, since that is not | |
| 8394 * cleared. */ | |
| 8395 if (HL_TABLE()[idx].sg_link == 0) | |
| 8396 HL_TABLE()[idx].sg_scriptID = 0; | |
| 8397 #endif | |
| 7 | 8398 } |
| 8399 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8400 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
| 7 | 8401 /* |
| 8402 * Set the normal foreground and background colors according to the "Normal" | |
| 2020 | 8403 * highlighting group. For X11 also set "Menu", "Scrollbar", and |
| 7 | 8404 * "Tooltip" colors. |
| 8405 */ | |
| 8406 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8407 set_normal_colors(void) |
| 7 | 8408 { |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8409 # ifdef FEAT_GUI |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8410 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8411 if (gui.in_use) |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8412 # endif |
|
8969
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 (set_group_colors((char_u *)"Normal", |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8415 &gui.norm_pixel, &gui.back_pixel, |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8416 FALSE, TRUE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8417 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8418 gui_mch_new_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8419 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8420 } |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8421 # ifdef FEAT_GUI_X11 |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8422 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
|
8423 &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
|
8424 TRUE, FALSE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8425 { |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8426 # ifdef FEAT_MENU |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8427 gui_mch_new_menu_colors(); |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8428 # endif |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8429 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8430 } |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8431 # ifdef FEAT_BEVAL_GUI |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8432 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
|
8433 &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
|
8434 FALSE, FALSE, TRUE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8435 { |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8436 # ifdef FEAT_TOOLBAR |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8437 gui_mch_new_tooltip_colors(); |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8438 # endif |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8439 must_redraw = CLEAR; |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8440 } |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8441 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8442 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
|
8443 &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
|
8444 FALSE, FALSE, FALSE)) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8445 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8446 gui_new_scrollbar_colors(); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8447 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8448 } |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8449 # endif |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8450 } |
| 7 | 8451 # endif |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8452 # ifdef FEAT_TERMGUICOLORS |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8453 # ifdef FEAT_GUI |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8454 else |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8455 # endif |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8456 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8457 int idx; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8458 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8459 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
|
8460 if (idx >= 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8461 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8462 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
|
8463 |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8464 /* If the normal fg or bg color changed a complete redraw is |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8465 * required. */ |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8466 if (cterm_normal_fg_gui_color != HL_TABLE()[idx].sg_gui_fg |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8467 || cterm_normal_bg_gui_color != HL_TABLE()[idx].sg_gui_bg) |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8468 { |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8469 /* if the GUI color is INVALCOLOR then we use the default cterm |
|
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8470 * color */ |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8471 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
|
8472 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
|
8473 must_redraw = CLEAR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8474 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8475 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8476 } |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
8477 # endif |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8478 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8479 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8480 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8481 #if defined(FEAT_GUI) || defined(PROTO) |
| 7 | 8482 /* |
| 8483 * Set the colors for "Normal", "Menu", "Tooltip" or "Scrollbar". | |
| 8484 */ | |
| 8485 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8486 set_group_colors( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8487 char_u *name, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8488 guicolor_T *fgp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8489 guicolor_T *bgp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8490 int do_menu, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8491 int use_norm, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8492 int do_tooltip) |
| 7 | 8493 { |
| 8494 int idx; | |
| 8495 | |
| 8496 idx = syn_name2id(name) - 1; | |
| 8497 if (idx >= 0) | |
| 8498 { | |
| 8499 gui_do_one_color(idx, do_menu, do_tooltip); | |
| 8500 | |
| 8501 if (HL_TABLE()[idx].sg_gui_fg != INVALCOLOR) | |
| 8502 *fgp = HL_TABLE()[idx].sg_gui_fg; | |
| 8503 else if (use_norm) | |
| 8504 *fgp = gui.def_norm_pixel; | |
| 8505 if (HL_TABLE()[idx].sg_gui_bg != INVALCOLOR) | |
| 8506 *bgp = HL_TABLE()[idx].sg_gui_bg; | |
| 8507 else if (use_norm) | |
| 8508 *bgp = gui.def_back_pixel; | |
| 8509 return TRUE; | |
| 8510 } | |
| 8511 return FALSE; | |
| 8512 } | |
| 8513 | |
| 8514 /* | |
| 8515 * Get the font of the "Normal" group. | |
| 8516 * Returns "" when it's not found or not set. | |
| 8517 */ | |
| 8518 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8519 hl_get_font_name(void) |
| 7 | 8520 { |
| 8521 int id; | |
| 8522 char_u *s; | |
| 8523 | |
| 8524 id = syn_name2id((char_u *)"Normal"); | |
| 8525 if (id > 0) | |
| 8526 { | |
| 8527 s = HL_TABLE()[id - 1].sg_font_name; | |
| 8528 if (s != NULL) | |
| 8529 return s; | |
| 8530 } | |
| 8531 return (char_u *)""; | |
| 8532 } | |
| 8533 | |
| 8534 /* | |
| 8535 * Set font for "Normal" group. Called by gui_mch_init_font() when a font has | |
| 8536 * actually chosen to be used. | |
| 8537 */ | |
| 8538 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8539 hl_set_font_name(char_u *font_name) |
| 7 | 8540 { |
| 8541 int id; | |
| 8542 | |
| 8543 id = syn_name2id((char_u *)"Normal"); | |
| 8544 if (id > 0) | |
| 8545 { | |
| 8546 vim_free(HL_TABLE()[id - 1].sg_font_name); | |
| 8547 HL_TABLE()[id - 1].sg_font_name = vim_strsave(font_name); | |
| 8548 } | |
| 8549 } | |
| 8550 | |
| 8551 /* | |
| 8552 * Set background color for "Normal" group. Called by gui_set_bg_color() | |
| 8553 * when the color is known. | |
| 8554 */ | |
| 8555 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8556 hl_set_bg_color_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8557 char_u *name) /* must have been allocated */ |
| 7 | 8558 { |
| 8559 int id; | |
| 8560 | |
| 8561 if (name != NULL) | |
| 8562 { | |
| 8563 id = syn_name2id((char_u *)"Normal"); | |
| 8564 if (id > 0) | |
| 8565 { | |
| 8566 vim_free(HL_TABLE()[id - 1].sg_gui_bg_name); | |
| 8567 HL_TABLE()[id - 1].sg_gui_bg_name = name; | |
| 8568 } | |
| 8569 } | |
| 8570 } | |
| 8571 | |
| 8572 /* | |
| 8573 * Set foreground color for "Normal" group. Called by gui_set_fg_color() | |
| 8574 * when the color is known. | |
| 8575 */ | |
| 8576 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8577 hl_set_fg_color_name( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8578 char_u *name) /* must have been allocated */ |
| 7 | 8579 { |
| 8580 int id; | |
| 8581 | |
| 8582 if (name != NULL) | |
| 8583 { | |
| 8584 id = syn_name2id((char_u *)"Normal"); | |
| 8585 if (id > 0) | |
| 8586 { | |
| 8587 vim_free(HL_TABLE()[id - 1].sg_gui_fg_name); | |
| 8588 HL_TABLE()[id - 1].sg_gui_fg_name = name; | |
| 8589 } | |
| 8590 } | |
| 8591 } | |
| 8592 | |
| 8593 /* | |
| 8594 * Return the handle for a font name. | |
| 8595 * Returns NOFONT when failed. | |
| 8596 */ | |
| 8597 static GuiFont | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8598 font_name2handle(char_u *name) |
| 7 | 8599 { |
| 8600 if (STRCMP(name, "NONE") == 0) | |
| 8601 return NOFONT; | |
| 8602 | |
| 8603 return gui_mch_get_font(name, TRUE); | |
| 8604 } | |
| 8605 | |
| 8606 # ifdef FEAT_XFONTSET | |
| 8607 /* | |
| 8608 * Return the handle for a fontset name. | |
| 8609 * Returns NOFONTSET when failed. | |
| 8610 */ | |
| 8611 static GuiFontset | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8612 fontset_name2handle(char_u *name, int fixed_width) |
| 7 | 8613 { |
| 8614 if (STRCMP(name, "NONE") == 0) | |
| 8615 return NOFONTSET; | |
| 8616 | |
| 8617 return gui_mch_get_fontset(name, TRUE, fixed_width); | |
| 8618 } | |
| 8619 # endif | |
| 8620 | |
| 8621 /* | |
| 8622 * Get the font or fontset for one highlight group. | |
| 8623 */ | |
| 8624 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8625 hl_do_font( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8626 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8627 char_u *arg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8628 int do_normal, /* set normal font */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8629 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
|
8630 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
|
8631 int free_font) /* free current font/fontset */ |
| 7 | 8632 { |
| 8633 # ifdef FEAT_XFONTSET | |
| 8634 /* If 'guifontset' is not empty, first try using the name as a | |
| 8635 * fontset. If that doesn't work, use it as a font name. */ | |
| 8636 if (*p_guifontset != NUL | |
| 8637 # ifdef FONTSET_ALWAYS | |
| 8638 || do_menu | |
| 8639 # endif | |
| 8640 # ifdef FEAT_BEVAL_TIP | |
| 8641 /* In Athena & Motif, the Tooltip highlight group is always a fontset */ | |
| 8642 || do_tooltip | |
| 8643 # endif | |
| 8644 ) | |
| 4344 | 8645 { |
| 3900 | 8646 if (free_font) |
| 3881 | 8647 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); |
| 7 | 8648 HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0 |
| 8649 # ifdef FONTSET_ALWAYS | |
| 8650 || do_menu | |
| 8651 # endif | |
| 8652 # ifdef FEAT_BEVAL_TIP | |
| 8653 || do_tooltip | |
| 8654 # endif | |
| 8655 ); | |
| 4344 | 8656 } |
| 7 | 8657 if (HL_TABLE()[idx].sg_fontset != NOFONTSET) |
| 8658 { | |
| 3881 | 8659 /* If it worked and it's the Normal group, use it as the normal |
| 8660 * fontset. Same for the Menu group. */ | |
| 7 | 8661 if (do_normal) |
| 8662 gui_init_font(arg, TRUE); | |
| 8663 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU) | |
| 8664 if (do_menu) | |
| 8665 { | |
| 8666 # ifdef FONTSET_ALWAYS | |
| 8667 gui.menu_fontset = HL_TABLE()[idx].sg_fontset; | |
| 8668 # else | |
| 8669 /* YIKES! This is a bug waiting to crash the program */ | |
| 8670 gui.menu_font = HL_TABLE()[idx].sg_fontset; | |
| 8671 # endif | |
| 8672 gui_mch_new_menu_font(); | |
| 8673 } | |
|
12871
1a450ce6980c
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Christian Brabandt <cb@256bit.org>
parents:
12594
diff
changeset
|
8674 # ifdef FEAT_BEVAL_GUI |
| 7 | 8675 if (do_tooltip) |
| 8676 { | |
| 8677 /* The Athena widget set cannot currently handle switching between | |
| 8678 * displaying a single font and a fontset. | |
| 8679 * If the XtNinternational resource is set to True at widget | |
| 1222 | 8680 * creation, then a fontset is always used, otherwise an |
| 7 | 8681 * XFontStruct is used. |
| 8682 */ | |
| 8683 gui.tooltip_fontset = (XFontSet)HL_TABLE()[idx].sg_fontset; | |
| 8684 gui_mch_new_tooltip_font(); | |
| 8685 } | |
| 8686 # endif | |
| 8687 # endif | |
| 8688 } | |
| 8689 else | |
| 8690 # endif | |
| 8691 { | |
| 3881 | 8692 if (free_font) |
| 8693 gui_mch_free_font(HL_TABLE()[idx].sg_font); | |
| 7 | 8694 HL_TABLE()[idx].sg_font = font_name2handle(arg); |
| 8695 /* If it worked and it's the Normal group, use it as the | |
| 8696 * normal font. Same for the Menu group. */ | |
| 8697 if (HL_TABLE()[idx].sg_font != NOFONT) | |
| 8698 { | |
| 8699 if (do_normal) | |
| 8700 gui_init_font(arg, FALSE); | |
| 8701 #ifndef FONTSET_ALWAYS | |
| 8702 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU) | |
| 8703 if (do_menu) | |
| 8704 { | |
| 8705 gui.menu_font = HL_TABLE()[idx].sg_font; | |
| 8706 gui_mch_new_menu_font(); | |
| 8707 } | |
| 8708 # endif | |
| 8709 #endif | |
| 8710 } | |
| 8711 } | |
| 8712 } | |
| 8713 | |
| 8714 #endif /* FEAT_GUI */ | |
| 8715 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8716 #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
|
8717 /* |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8718 * 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
|
8719 * Returns INVALCOLOR when failed. |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8720 */ |
|
12082
504df4aa84c6
patch 8.0.0921: terminal window cursor shape not supported in the GUI
Christian Brabandt <cb@256bit.org>
parents:
12068
diff
changeset
|
8721 guicolor_T |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8722 color_name2handle(char_u *name) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8723 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8724 if (STRCMP(name, "NONE") == 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8725 return INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8726 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8727 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
|
8728 { |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8729 #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
|
8730 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8731 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8732 #ifdef FEAT_GUI |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8733 return gui.norm_pixel; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8734 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8735 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
8736 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
|
8737 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
|
8738 /* 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
|
8739 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
|
8740 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8741 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8742 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
|
8743 { |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8744 #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
|
8745 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8746 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8747 #ifdef FEAT_GUI |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8748 return gui.back_pixel; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8749 #endif |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8750 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
8751 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
|
8752 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
|
8753 /* 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
|
8754 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
|
8755 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8756 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8757 |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8758 return GUI_GET_COLOR(name); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8759 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8760 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8761 |
| 7 | 8762 /* |
| 8763 * Table with the specifications for an attribute number. | |
| 8764 * Note that this table is used by ALL buffers. This is required because the | |
| 8765 * GUI can redraw at any time for any buffer. | |
| 8766 */ | |
| 298 | 8767 static garray_T term_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8768 |
| 8769 #define TERM_ATTR_ENTRY(idx) ((attrentry_T *)term_attr_table.ga_data)[idx] | |
| 8770 | |
| 298 | 8771 static garray_T cterm_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8772 |
| 8773 #define CTERM_ATTR_ENTRY(idx) ((attrentry_T *)cterm_attr_table.ga_data)[idx] | |
| 8774 | |
| 8775 #ifdef FEAT_GUI | |
| 298 | 8776 static garray_T gui_attr_table = {0, 0, 0, 0, NULL}; |
| 7 | 8777 |
| 8778 #define GUI_ATTR_ENTRY(idx) ((attrentry_T *)gui_attr_table.ga_data)[idx] | |
| 8779 #endif | |
| 8780 | |
| 8781 /* | |
| 8782 * Return the attr number for a set of colors and font. | |
| 8783 * Add a new entry to the term_attr_table, cterm_attr_table or gui_attr_table | |
| 8784 * if the combination is new. | |
| 8785 * Return 0 for error (no more room). | |
| 8786 */ | |
| 8787 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8788 get_attr_entry(garray_T *table, attrentry_T *aep) |
| 7 | 8789 { |
| 8790 int i; | |
| 359 | 8791 attrentry_T *taep; |
| 7 | 8792 static int recursive = FALSE; |
| 8793 | |
| 8794 /* | |
| 8795 * Init the table, in case it wasn't done yet. | |
| 8796 */ | |
| 8797 table->ga_itemsize = sizeof(attrentry_T); | |
| 8798 table->ga_growsize = 7; | |
| 8799 | |
| 8800 /* | |
| 8801 * Try to find an entry with the same specifications. | |
| 8802 */ | |
| 8803 for (i = 0; i < table->ga_len; ++i) | |
| 8804 { | |
| 359 | 8805 taep = &(((attrentry_T *)table->ga_data)[i]); |
| 8806 if ( aep->ae_attr == taep->ae_attr | |
| 7 | 8807 && ( |
| 8808 #ifdef FEAT_GUI | |
| 8809 (table == &gui_attr_table | |
| 359 | 8810 && (aep->ae_u.gui.fg_color == taep->ae_u.gui.fg_color |
| 8811 && aep->ae_u.gui.bg_color | |
| 8812 == taep->ae_u.gui.bg_color | |
| 8813 && aep->ae_u.gui.sp_color | |
| 8814 == taep->ae_u.gui.sp_color | |
| 8815 && aep->ae_u.gui.font == taep->ae_u.gui.font | |
| 7 | 8816 # ifdef FEAT_XFONTSET |
| 359 | 8817 && aep->ae_u.gui.fontset == taep->ae_u.gui.fontset |
| 7 | 8818 # endif |
| 8819 )) | |
| 8820 || | |
| 8821 #endif | |
| 8822 (table == &term_attr_table | |
| 359 | 8823 && (aep->ae_u.term.start == NULL) |
| 8824 == (taep->ae_u.term.start == NULL) | |
| 7 | 8825 && (aep->ae_u.term.start == NULL |
| 8826 || STRCMP(aep->ae_u.term.start, | |
| 359 | 8827 taep->ae_u.term.start) == 0) |
| 8828 && (aep->ae_u.term.stop == NULL) | |
| 8829 == (taep->ae_u.term.stop == NULL) | |
| 7 | 8830 && (aep->ae_u.term.stop == NULL |
| 8831 || STRCMP(aep->ae_u.term.stop, | |
| 359 | 8832 taep->ae_u.term.stop) == 0)) |
| 7 | 8833 || (table == &cterm_attr_table |
| 359 | 8834 && aep->ae_u.cterm.fg_color |
| 8835 == taep->ae_u.cterm.fg_color | |
| 8836 && 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
|
8837 == 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
|
8838 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8839 && aep->ae_u.cterm.fg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8840 == taep->ae_u.cterm.fg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8841 && aep->ae_u.cterm.bg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8842 == taep->ae_u.cterm.bg_rgb |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8843 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8844 ))) |
| 7 | 8845 |
| 8846 return i + ATTR_OFF; | |
| 8847 } | |
| 8848 | |
| 271 | 8849 if (table->ga_len + ATTR_OFF > MAX_TYPENR) |
| 7 | 8850 { |
| 8851 /* | |
| 8852 * Running out of attribute entries! remove all attributes, and | |
| 8853 * compute new ones for all groups. | |
| 8854 * When called recursively, we are really out of numbers. | |
| 8855 */ | |
| 8856 if (recursive) | |
| 8857 { | |
| 8858 EMSG(_("E424: Too many different highlighting attributes in use")); | |
| 8859 return 0; | |
| 8860 } | |
| 8861 recursive = TRUE; | |
| 8862 | |
| 359 | 8863 clear_hl_tables(); |
| 8864 | |
| 7 | 8865 must_redraw = CLEAR; |
| 8866 | |
| 8867 for (i = 0; i < highlight_ga.ga_len; ++i) | |
| 8868 set_hl_attr(i); | |
| 8869 | |
| 8870 recursive = FALSE; | |
| 8871 } | |
| 8872 | |
| 8873 /* | |
| 8874 * This is a new combination of colors and font, add an entry. | |
| 8875 */ | |
| 8876 if (ga_grow(table, 1) == FAIL) | |
| 8877 return 0; | |
| 8878 | |
| 359 | 8879 taep = &(((attrentry_T *)table->ga_data)[table->ga_len]); |
| 8880 vim_memset(taep, 0, sizeof(attrentry_T)); | |
| 8881 taep->ae_attr = aep->ae_attr; | |
| 7 | 8882 #ifdef FEAT_GUI |
| 8883 if (table == &gui_attr_table) | |
| 8884 { | |
| 359 | 8885 taep->ae_u.gui.fg_color = aep->ae_u.gui.fg_color; |
| 8886 taep->ae_u.gui.bg_color = aep->ae_u.gui.bg_color; | |
| 8887 taep->ae_u.gui.sp_color = aep->ae_u.gui.sp_color; | |
| 8888 taep->ae_u.gui.font = aep->ae_u.gui.font; | |
| 7 | 8889 # ifdef FEAT_XFONTSET |
| 359 | 8890 taep->ae_u.gui.fontset = aep->ae_u.gui.fontset; |
| 7 | 8891 # endif |
| 8892 } | |
| 8893 #endif | |
| 8894 if (table == &term_attr_table) | |
| 8895 { | |
| 8896 if (aep->ae_u.term.start == NULL) | |
| 359 | 8897 taep->ae_u.term.start = NULL; |
| 7 | 8898 else |
| 359 | 8899 taep->ae_u.term.start = vim_strsave(aep->ae_u.term.start); |
| 7 | 8900 if (aep->ae_u.term.stop == NULL) |
| 359 | 8901 taep->ae_u.term.stop = NULL; |
| 7 | 8902 else |
| 359 | 8903 taep->ae_u.term.stop = vim_strsave(aep->ae_u.term.stop); |
| 7 | 8904 } |
| 8905 else if (table == &cterm_attr_table) | |
| 8906 { | |
| 359 | 8907 taep->ae_u.cterm.fg_color = aep->ae_u.cterm.fg_color; |
| 8908 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
|
8909 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
8910 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
|
8911 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
|
8912 #endif |
| 7 | 8913 } |
| 8914 ++table->ga_len; | |
| 8915 return (table->ga_len - 1 + ATTR_OFF); | |
| 8916 } | |
| 8917 | |
| 359 | 8918 /* |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8919 * 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
|
8920 * 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
|
8921 */ |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8922 int |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8923 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
|
8924 { |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8925 attrentry_T at_en; |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8926 |
|
11745
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8927 vim_memset(&at_en, 0, sizeof(attrentry_T)); |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
8928 #ifdef FEAT_TERMGUICOLORS |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
8929 at_en.ae_u.cterm.fg_rgb = INVALCOLOR; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
8930 at_en.ae_u.cterm.bg_rgb = INVALCOLOR; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
8931 #endif |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8932 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
|
8933 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
|
8934 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
|
8935 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
|
8936 } |
|
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8937 |
|
11755
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8938 #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
|
8939 /* |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8940 * 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
|
8941 * 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
|
8942 */ |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8943 int |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8944 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
|
8945 { |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8946 attrentry_T at_en; |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8947 |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8948 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
|
8949 at_en.ae_attr = attr; |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8950 if (fg == INVALCOLOR && bg == INVALCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8951 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8952 /* If both GUI colors are not set fall back to the cterm colors. Helps |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8953 * if the GUI only has an attribute, such as undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8954 at_en.ae_u.cterm.fg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8955 at_en.ae_u.cterm.bg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8956 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8957 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8958 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8959 at_en.ae_u.cterm.fg_rgb = fg; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8960 at_en.ae_u.cterm.bg_rgb = bg; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
8961 } |
|
11755
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8962 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
|
8963 } |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8964 #endif |
|
12fa6072977a
patch 8.0.0760: terminal window colors wrong with 'termguicolors'
Christian Brabandt <cb@256bit.org>
parents:
11745
diff
changeset
|
8965 |
|
11745
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8966 #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
|
8967 /* |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8968 * 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
|
8969 * 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
|
8970 */ |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8971 int |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8972 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
|
8973 { |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8974 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
|
8975 |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8976 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
|
8977 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
|
8978 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
|
8979 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
|
8980 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
|
8981 } |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8982 #endif |
|
5a5709918a98
patch 8.0.0755: terminal window does not have colors in the GUI
Christian Brabandt <cb@256bit.org>
parents:
11743
diff
changeset
|
8983 |
|
11743
6141a21dd232
patch 8.0.0754: terminal window does not support colors
Christian Brabandt <cb@256bit.org>
parents:
11581
diff
changeset
|
8984 /* |
| 359 | 8985 * Clear all highlight tables. |
| 8986 */ | |
| 8987 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
8988 clear_hl_tables(void) |
| 359 | 8989 { |
| 8990 int i; | |
| 8991 attrentry_T *taep; | |
| 8992 | |
| 8993 #ifdef FEAT_GUI | |
| 8994 ga_clear(&gui_attr_table); | |
| 8995 #endif | |
| 8996 for (i = 0; i < term_attr_table.ga_len; ++i) | |
| 8997 { | |
| 8998 taep = &(((attrentry_T *)term_attr_table.ga_data)[i]); | |
| 8999 vim_free(taep->ae_u.term.start); | |
| 9000 vim_free(taep->ae_u.term.stop); | |
| 9001 } | |
| 9002 ga_clear(&term_attr_table); | |
| 9003 ga_clear(&cterm_attr_table); | |
| 9004 } | |
| 9005 | |
| 745 | 9006 #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO) |
| 221 | 9007 /* |
| 348 | 9008 * Combine special attributes (e.g., for spelling) with other attributes |
| 9009 * (e.g., for syntax highlighting). | |
| 9010 * "prim_attr" overrules "char_attr". | |
| 221 | 9011 * This creates a new group when required. |
| 9012 * Since we expect there to be few spelling mistakes we don't cache the | |
| 9013 * result. | |
| 9014 * Return the resulting attributes. | |
| 9015 */ | |
| 9016 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9017 hl_combine_attr(int char_attr, int prim_attr) |
| 221 | 9018 { |
| 9019 attrentry_T *char_aep = NULL; | |
| 9020 attrentry_T *spell_aep; | |
| 9021 attrentry_T new_en; | |
| 9022 | |
| 9023 if (char_attr == 0) | |
| 348 | 9024 return prim_attr; |
| 9025 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
|
9026 return ATTR_COMBINE(char_attr, prim_attr); |
| 221 | 9027 #ifdef FEAT_GUI |
| 9028 if (gui.in_use) | |
| 9029 { | |
| 9030 if (char_attr > HL_ALL) | |
| 9031 char_aep = syn_gui_attr2entry(char_attr); | |
| 9032 if (char_aep != NULL) | |
| 9033 new_en = *char_aep; | |
| 9034 else | |
| 9035 { | |
| 9036 vim_memset(&new_en, 0, sizeof(new_en)); | |
| 548 | 9037 new_en.ae_u.gui.fg_color = INVALCOLOR; |
| 9038 new_en.ae_u.gui.bg_color = INVALCOLOR; | |
| 9039 new_en.ae_u.gui.sp_color = INVALCOLOR; | |
| 221 | 9040 if (char_attr <= HL_ALL) |
| 9041 new_en.ae_attr = char_attr; | |
| 9042 } | |
| 9043 | |
| 348 | 9044 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
|
9045 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 9046 else |
| 9047 { | |
| 348 | 9048 spell_aep = syn_gui_attr2entry(prim_attr); |
| 221 | 9049 if (spell_aep != NULL) |
| 9050 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9051 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
|
9052 spell_aep->ae_attr); |
| 221 | 9053 if (spell_aep->ae_u.gui.fg_color != INVALCOLOR) |
| 9054 new_en.ae_u.gui.fg_color = spell_aep->ae_u.gui.fg_color; | |
| 9055 if (spell_aep->ae_u.gui.bg_color != INVALCOLOR) | |
| 9056 new_en.ae_u.gui.bg_color = spell_aep->ae_u.gui.bg_color; | |
| 9057 if (spell_aep->ae_u.gui.sp_color != INVALCOLOR) | |
| 9058 new_en.ae_u.gui.sp_color = spell_aep->ae_u.gui.sp_color; | |
| 9059 if (spell_aep->ae_u.gui.font != NOFONT) | |
| 9060 new_en.ae_u.gui.font = spell_aep->ae_u.gui.font; | |
| 9061 # ifdef FEAT_XFONTSET | |
| 9062 if (spell_aep->ae_u.gui.fontset != NOFONTSET) | |
| 9063 new_en.ae_u.gui.fontset = spell_aep->ae_u.gui.fontset; | |
| 9064 # endif | |
| 9065 } | |
| 9066 } | |
| 9067 return get_attr_entry(&gui_attr_table, &new_en); | |
| 9068 } | |
| 9069 #endif | |
| 9070 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9071 if (IS_CTERM) |
| 221 | 9072 { |
| 9073 if (char_attr > HL_ALL) | |
| 9074 char_aep = syn_cterm_attr2entry(char_attr); | |
| 9075 if (char_aep != NULL) | |
| 9076 new_en = *char_aep; | |
| 9077 else | |
| 9078 { | |
| 9079 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
|
9080 #ifdef FEAT_TERMGUICOLORS |
|
e88ffb09ff38
commit https://github.com/vim/vim/commit/0cdb72aa38c4a0140c94d56bf8bc17cb30260ebf
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
9081 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
|
9082 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
|
9083 #endif |
| 221 | 9084 if (char_attr <= HL_ALL) |
| 9085 new_en.ae_attr = char_attr; | |
| 9086 } | |
| 9087 | |
| 348 | 9088 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
|
9089 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 9090 else |
| 9091 { | |
| 348 | 9092 spell_aep = syn_cterm_attr2entry(prim_attr); |
| 221 | 9093 if (spell_aep != NULL) |
| 9094 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9095 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
|
9096 spell_aep->ae_attr); |
| 221 | 9097 if (spell_aep->ae_u.cterm.fg_color > 0) |
| 9098 new_en.ae_u.cterm.fg_color = spell_aep->ae_u.cterm.fg_color; | |
| 9099 if (spell_aep->ae_u.cterm.bg_color > 0) | |
| 9100 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
|
9101 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9102 /* If both fg and bg are not set fall back to cterm colors. |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9103 * Helps for SpellBad which uses undercurl in the GUI. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9104 if (COLOR_INVALID(spell_aep->ae_u.cterm.fg_rgb) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9105 && COLOR_INVALID(spell_aep->ae_u.cterm.bg_rgb)) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9106 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9107 if (spell_aep->ae_u.cterm.fg_color > 0) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9108 new_en.ae_u.cterm.fg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9109 if (spell_aep->ae_u.cterm.bg_color > 0) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9110 new_en.ae_u.cterm.bg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9111 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9112 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9113 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9114 if (spell_aep->ae_u.cterm.fg_rgb != INVALCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9115 new_en.ae_u.cterm.fg_rgb = spell_aep->ae_u.cterm.fg_rgb; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9116 if (spell_aep->ae_u.cterm.bg_rgb != INVALCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9117 new_en.ae_u.cterm.bg_rgb = spell_aep->ae_u.cterm.bg_rgb; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9118 } |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9119 #endif |
| 221 | 9120 } |
| 9121 } | |
| 9122 return get_attr_entry(&cterm_attr_table, &new_en); | |
| 9123 } | |
| 9124 | |
| 9125 if (char_attr > HL_ALL) | |
| 9126 char_aep = syn_term_attr2entry(char_attr); | |
| 9127 if (char_aep != NULL) | |
| 9128 new_en = *char_aep; | |
| 9129 else | |
| 9130 { | |
| 9131 vim_memset(&new_en, 0, sizeof(new_en)); | |
| 9132 if (char_attr <= HL_ALL) | |
| 9133 new_en.ae_attr = char_attr; | |
| 9134 } | |
| 9135 | |
| 348 | 9136 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
|
9137 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, prim_attr); |
| 221 | 9138 else |
| 9139 { | |
| 607 | 9140 spell_aep = syn_term_attr2entry(prim_attr); |
| 221 | 9141 if (spell_aep != NULL) |
| 9142 { | |
|
12068
e1b34958f118
patch 8.0.0914: highlight attributes are always combined
Christian Brabandt <cb@256bit.org>
parents:
11902
diff
changeset
|
9143 new_en.ae_attr = ATTR_COMBINE(new_en.ae_attr, spell_aep->ae_attr); |
| 221 | 9144 if (spell_aep->ae_u.term.start != NULL) |
| 9145 { | |
| 9146 new_en.ae_u.term.start = spell_aep->ae_u.term.start; | |
| 9147 new_en.ae_u.term.stop = spell_aep->ae_u.term.stop; | |
| 9148 } | |
| 9149 } | |
| 9150 } | |
| 9151 return get_attr_entry(&term_attr_table, &new_en); | |
| 9152 } | |
| 9153 #endif | |
| 9154 | |
| 7 | 9155 #ifdef FEAT_GUI |
| 9156 | |
| 9157 attrentry_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9158 syn_gui_attr2entry(int attr) |
| 7 | 9159 { |
| 9160 attr -= ATTR_OFF; | |
| 9161 if (attr >= gui_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9162 return NULL; | |
| 9163 return &(GUI_ATTR_ENTRY(attr)); | |
| 9164 } | |
| 9165 #endif /* FEAT_GUI */ | |
| 9166 | |
| 745 | 9167 /* |
| 9168 * Get the highlight attributes (HL_BOLD etc.) from an attribute nr. | |
| 9169 * Only to be used when "attr" > HL_ALL. | |
| 9170 */ | |
| 9171 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9172 syn_attr2attr(int attr) |
| 745 | 9173 { |
| 9174 attrentry_T *aep; | |
| 9175 | |
| 9176 #ifdef FEAT_GUI | |
| 9177 if (gui.in_use) | |
| 9178 aep = syn_gui_attr2entry(attr); | |
| 9179 else | |
| 9180 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9181 if (IS_CTERM) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9182 aep = syn_cterm_attr2entry(attr); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9183 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9184 aep = syn_term_attr2entry(attr); |
| 745 | 9185 |
| 9186 if (aep == NULL) /* highlighting not set */ | |
| 9187 return 0; | |
| 9188 return aep->ae_attr; | |
| 9189 } | |
| 9190 | |
| 9191 | |
| 7 | 9192 attrentry_T * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9193 syn_term_attr2entry(int attr) |
| 7 | 9194 { |
| 9195 attr -= ATTR_OFF; | |
| 9196 if (attr >= term_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9197 return NULL; | |
| 9198 return &(TERM_ATTR_ENTRY(attr)); | |
| 9199 } | |
| 9200 | |
| 9201 attrentry_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9202 syn_cterm_attr2entry(int attr) |
| 7 | 9203 { |
| 9204 attr -= ATTR_OFF; | |
| 9205 if (attr >= cterm_attr_table.ga_len) /* did ":syntax clear" */ | |
| 9206 return NULL; | |
| 9207 return &(CTERM_ATTR_ENTRY(attr)); | |
| 9208 } | |
| 9209 | |
| 9210 #define LIST_ATTR 1 | |
| 9211 #define LIST_STRING 2 | |
| 9212 #define LIST_INT 3 | |
| 9213 | |
| 9214 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9215 highlight_list_one(int id) |
| 7 | 9216 { |
| 9217 struct hl_group *sgp; | |
| 9218 int didh = FALSE; | |
| 9219 | |
| 9220 sgp = &HL_TABLE()[id - 1]; /* index is ID minus one */ | |
| 9221 | |
| 9222 didh = highlight_list_arg(id, didh, LIST_ATTR, | |
| 9223 sgp->sg_term, NULL, "term"); | |
| 9224 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9225 0, sgp->sg_start, "start"); | |
| 9226 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9227 0, sgp->sg_stop, "stop"); | |
| 9228 | |
| 9229 didh = highlight_list_arg(id, didh, LIST_ATTR, | |
| 9230 sgp->sg_cterm, NULL, "cterm"); | |
| 9231 didh = highlight_list_arg(id, didh, LIST_INT, | |
| 9232 sgp->sg_cterm_fg, NULL, "ctermfg"); | |
| 9233 didh = highlight_list_arg(id, didh, LIST_INT, | |
| 9234 sgp->sg_cterm_bg, NULL, "ctermbg"); | |
| 9235 | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9236 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 9237 didh = highlight_list_arg(id, didh, LIST_ATTR, |
| 9238 sgp->sg_gui, NULL, "gui"); | |
| 9239 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9240 0, sgp->sg_gui_fg_name, "guifg"); | |
| 9241 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 9242 0, sgp->sg_gui_bg_name, "guibg"); | |
| 9243 didh = highlight_list_arg(id, didh, LIST_STRING, | |
| 301 | 9244 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
|
9245 #endif |
|
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9246 #ifdef FEAT_GUI |
| 301 | 9247 didh = highlight_list_arg(id, didh, LIST_STRING, |
| 7 | 9248 0, sgp->sg_font_name, "font"); |
| 9249 #endif | |
| 9250 | |
| 448 | 9251 if (sgp->sg_link && !got_int) |
| 7 | 9252 { |
| 9253 (void)syn_list_header(didh, 9999, id); | |
| 448 | 9254 didh = TRUE; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9255 msg_puts_attr((char_u *)"links to", HL_ATTR(HLF_D)); |
| 7 | 9256 msg_putchar(' '); |
| 9257 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name); | |
| 9258 } | |
| 448 | 9259 |
| 694 | 9260 if (!didh) |
| 9261 highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", ""); | |
| 448 | 9262 #ifdef FEAT_EVAL |
| 694 | 9263 if (p_verbose > 0) |
| 448 | 9264 last_set_msg(sgp->sg_scriptID); |
| 9265 #endif | |
| 7 | 9266 } |
| 9267 | |
| 9268 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9269 highlight_list_arg( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9270 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9271 int didh, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9272 int type, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9273 int iarg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9274 char_u *sarg, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9275 char *name) |
| 7 | 9276 { |
| 9277 char_u buf[100]; | |
| 9278 char_u *ts; | |
| 9279 int i; | |
| 9280 | |
| 448 | 9281 if (got_int) |
| 9282 return FALSE; | |
| 7 | 9283 if (type == LIST_STRING ? (sarg != NULL) : (iarg != 0)) |
| 9284 { | |
| 9285 ts = buf; | |
| 9286 if (type == LIST_INT) | |
| 9287 sprintf((char *)buf, "%d", iarg - 1); | |
| 9288 else if (type == LIST_STRING) | |
| 9289 ts = sarg; | |
| 9290 else /* type == LIST_ATTR */ | |
| 9291 { | |
| 9292 buf[0] = NUL; | |
| 9293 for (i = 0; hl_attr_table[i] != 0; ++i) | |
| 9294 { | |
| 9295 if (iarg & hl_attr_table[i]) | |
| 9296 { | |
| 9297 if (buf[0] != NUL) | |
| 2768 | 9298 vim_strcat(buf, (char_u *)",", 100); |
| 9299 vim_strcat(buf, (char_u *)hl_name_table[i], 100); | |
| 7 | 9300 iarg &= ~hl_attr_table[i]; /* don't want "inverse" */ |
| 9301 } | |
| 9302 } | |
| 9303 } | |
| 9304 | |
| 9305 (void)syn_list_header(didh, | |
| 9306 (int)(vim_strsize(ts) + STRLEN(name) + 1), id); | |
| 9307 didh = TRUE; | |
| 448 | 9308 if (!got_int) |
| 9309 { | |
| 694 | 9310 if (*name != NUL) |
| 9311 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
9312 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
|
9313 MSG_PUTS_ATTR("=", HL_ATTR(HLF_D)); |
| 694 | 9314 } |
| 448 | 9315 msg_outtrans(ts); |
| 9316 } | |
| 7 | 9317 } |
| 9318 return didh; | |
| 9319 } | |
| 9320 | |
| 9321 #if (((defined(FEAT_EVAL) || defined(FEAT_PRINTER))) && defined(FEAT_SYN_HL)) || defined(PROTO) | |
| 9322 /* | |
| 9323 * Return "1" if highlight group "id" has attribute "flag". | |
| 9324 * Return NULL otherwise. | |
| 9325 */ | |
| 9326 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9327 highlight_has_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9328 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9329 int flag, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9330 int modec) /* 'g' for GUI, 'c' for cterm, 't' for term */ |
| 7 | 9331 { |
| 9332 int attr; | |
| 9333 | |
| 9334 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9335 return NULL; | |
| 9336 | |
|
2318
9cf111138fb9
Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
9337 #if defined(FEAT_GUI) || defined(FEAT_EVAL) |
| 7 | 9338 if (modec == 'g') |
| 9339 attr = HL_TABLE()[id - 1].sg_gui; | |
| 9340 else | |
| 9341 #endif | |
| 9342 if (modec == 'c') | |
| 9343 attr = HL_TABLE()[id - 1].sg_cterm; | |
| 9344 else | |
| 9345 attr = HL_TABLE()[id - 1].sg_term; | |
| 9346 | |
| 9347 if (attr & flag) | |
| 9348 return (char_u *)"1"; | |
| 9349 return NULL; | |
| 9350 } | |
| 9351 #endif | |
| 9352 | |
| 9353 #if (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) || defined(PROTO) | |
| 9354 /* | |
| 9355 * Return color name of highlight group "id". | |
| 9356 */ | |
| 9357 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9358 highlight_color( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9359 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9360 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
|
9361 int modec) /* 'g' for GUI, 'c' for cterm, 't' for term */ |
| 7 | 9362 { |
| 9363 static char_u name[20]; | |
| 9364 int n; | |
| 205 | 9365 int fg = FALSE; |
| 9366 int sp = FALSE; | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9367 int font = FALSE; |
| 7 | 9368 |
| 9369 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9370 return NULL; | |
| 9371 | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9372 if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'g') |
| 7 | 9373 fg = TRUE; |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9374 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
|
9375 && 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
|
9376 font = TRUE; |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9377 else if (TOLOWER_ASC(what[0]) == 's' && TOLOWER_ASC(what[1]) == 'p') |
| 205 | 9378 sp = TRUE; |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9379 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
|
9380 return NULL; |
| 7 | 9381 if (modec == 'g') |
| 9382 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9383 # 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
|
9384 # ifdef FEAT_GUI |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9385 /* return font name */ |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9386 if (font) |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9387 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
|
9388 # endif |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9389 |
| 7 | 9390 /* 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
|
9391 if ((USE_24BIT) && what[2] == '#') |
| 7 | 9392 { |
| 9393 guicolor_T color; | |
| 9394 long_u rgb; | |
| 9395 static char_u buf[10]; | |
| 9396 | |
| 9397 if (fg) | |
| 9398 color = HL_TABLE()[id - 1].sg_gui_fg; | |
| 205 | 9399 else if (sp) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9400 # ifdef FEAT_GUI |
| 205 | 9401 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
|
9402 # else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9403 color = INVALCOLOR; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9404 # endif |
| 7 | 9405 else |
| 9406 color = HL_TABLE()[id - 1].sg_gui_bg; | |
| 9407 if (color == INVALCOLOR) | |
| 9408 return NULL; | |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
9409 rgb = (long_u)GUI_MCH_GET_RGB(color); |
| 7 | 9410 sprintf((char *)buf, "#%02x%02x%02x", |
| 9411 (unsigned)(rgb >> 16), | |
| 9412 (unsigned)(rgb >> 8) & 255, | |
| 9413 (unsigned)rgb & 255); | |
| 9414 return buf; | |
| 9415 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9416 # endif |
| 7 | 9417 if (fg) |
| 9418 return (HL_TABLE()[id - 1].sg_gui_fg_name); | |
| 205 | 9419 if (sp) |
| 9420 return (HL_TABLE()[id - 1].sg_gui_sp_name); | |
| 7 | 9421 return (HL_TABLE()[id - 1].sg_gui_bg_name); |
| 9422 } | |
|
2106
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9423 if (font || sp) |
|
15674e198164
updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents:
2100
diff
changeset
|
9424 return NULL; |
| 7 | 9425 if (modec == 'c') |
| 9426 { | |
| 9427 if (fg) | |
| 9428 n = HL_TABLE()[id - 1].sg_cterm_fg - 1; | |
| 9429 else | |
| 9430 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
|
9431 if (n < 0) |
|
260d01c1cd17
commit https://github.com/vim/vim/commit/385111bd86e0b38667879c3e89506ca1ae98e1df
Christian Brabandt <cb@256bit.org>
parents:
8362
diff
changeset
|
9432 return NULL; |
| 7 | 9433 sprintf((char *)name, "%d", n); |
| 9434 return name; | |
| 9435 } | |
| 9436 /* term doesn't have color */ | |
| 9437 return NULL; | |
| 9438 } | |
| 9439 #endif | |
| 9440 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9441 #if (defined(FEAT_SYN_HL) \ |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9442 && (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
|
9443 && defined(FEAT_PRINTER)) || defined(PROTO) |
| 7 | 9444 /* |
| 9445 * Return color name of highlight group "id" as RGB value. | |
| 9446 */ | |
| 9447 long_u | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9448 highlight_gui_color_rgb( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9449 int id, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9450 int fg) /* TRUE = fg, FALSE = bg */ |
| 7 | 9451 { |
| 9452 guicolor_T color; | |
| 9453 | |
| 9454 if (id <= 0 || id > highlight_ga.ga_len) | |
| 9455 return 0L; | |
| 9456 | |
| 9457 if (fg) | |
| 9458 color = HL_TABLE()[id - 1].sg_gui_fg; | |
| 9459 else | |
| 9460 color = HL_TABLE()[id - 1].sg_gui_bg; | |
| 9461 | |
| 9462 if (color == INVALCOLOR) | |
| 9463 return 0L; | |
| 9464 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9465 return GUI_MCH_GET_RGB(color); |
| 7 | 9466 } |
| 9467 #endif | |
| 9468 | |
| 9469 /* | |
| 9470 * Output the syntax list header. | |
| 9471 * Return TRUE when started a new line. | |
| 9472 */ | |
| 9473 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9474 syn_list_header( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9475 int did_header, /* did header already */ |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9476 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
|
9477 int id) /* highlight group id */ |
| 7 | 9478 { |
| 9479 int endcol = 19; | |
| 9480 int newline = TRUE; | |
| 9481 | |
| 9482 if (!did_header) | |
| 9483 { | |
| 9484 msg_putchar('\n'); | |
| 448 | 9485 if (got_int) |
| 9486 return TRUE; | |
| 7 | 9487 msg_outtrans(HL_TABLE()[id - 1].sg_name); |
| 9488 endcol = 15; | |
| 9489 } | |
| 9490 else if (msg_col + outlen + 1 >= Columns) | |
| 448 | 9491 { |
| 7 | 9492 msg_putchar('\n'); |
| 448 | 9493 if (got_int) |
| 9494 return TRUE; | |
| 9495 } | |
| 7 | 9496 else |
| 9497 { | |
| 9498 if (msg_col >= endcol) /* wrap around is like starting a new line */ | |
| 9499 newline = FALSE; | |
| 9500 } | |
| 9501 | |
| 9502 if (msg_col >= endcol) /* output at least one space */ | |
| 9503 endcol = msg_col + 1; | |
| 9504 if (Columns <= endcol) /* avoid hang for tiny window */ | |
| 9505 endcol = Columns - 1; | |
| 9506 | |
| 9507 msg_advance(endcol); | |
| 9508 | |
| 9509 /* Show "xxx" with the attributes. */ | |
| 9510 if (!did_header) | |
| 9511 { | |
| 9512 msg_puts_attr((char_u *)"xxx", syn_id2attr(id)); | |
| 9513 msg_putchar(' '); | |
| 9514 } | |
| 9515 | |
| 9516 return newline; | |
| 9517 } | |
| 9518 | |
| 9519 /* | |
| 9520 * Set the attribute numbers for a highlight group. | |
| 9521 * Called after one of the attributes has changed. | |
| 9522 */ | |
| 9523 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9524 set_hl_attr( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9525 int idx) /* index in array */ |
| 7 | 9526 { |
| 9527 attrentry_T at_en; | |
| 9528 struct hl_group *sgp = HL_TABLE() + idx; | |
| 9529 | |
| 9530 /* The "Normal" group doesn't need an attribute number */ | |
| 9531 if (sgp->sg_name_u != NULL && STRCMP(sgp->sg_name_u, "NORMAL") == 0) | |
| 9532 return; | |
| 9533 | |
| 9534 #ifdef FEAT_GUI | |
| 9535 /* | |
| 9536 * For the GUI mode: If there are other than "normal" highlighting | |
| 9537 * attributes, need to allocate an attr number. | |
| 9538 */ | |
| 9539 if (sgp->sg_gui_fg == INVALCOLOR | |
| 9540 && sgp->sg_gui_bg == INVALCOLOR | |
| 205 | 9541 && sgp->sg_gui_sp == INVALCOLOR |
| 7 | 9542 && sgp->sg_font == NOFONT |
| 9543 # ifdef FEAT_XFONTSET | |
| 9544 && sgp->sg_fontset == NOFONTSET | |
| 9545 # endif | |
| 9546 ) | |
| 9547 { | |
| 9548 sgp->sg_gui_attr = sgp->sg_gui; | |
| 9549 } | |
| 9550 else | |
| 9551 { | |
| 9552 at_en.ae_attr = sgp->sg_gui; | |
| 9553 at_en.ae_u.gui.fg_color = sgp->sg_gui_fg; | |
| 9554 at_en.ae_u.gui.bg_color = sgp->sg_gui_bg; | |
| 205 | 9555 at_en.ae_u.gui.sp_color = sgp->sg_gui_sp; |
| 7 | 9556 at_en.ae_u.gui.font = sgp->sg_font; |
| 9557 # ifdef FEAT_XFONTSET | |
| 9558 at_en.ae_u.gui.fontset = sgp->sg_fontset; | |
| 9559 # endif | |
| 9560 sgp->sg_gui_attr = get_attr_entry(&gui_attr_table, &at_en); | |
| 9561 } | |
| 9562 #endif | |
| 9563 /* | |
| 9564 * For the term mode: If there are other than "normal" highlighting | |
| 9565 * attributes, need to allocate an attr number. | |
| 9566 */ | |
| 9567 if (sgp->sg_start == NULL && sgp->sg_stop == NULL) | |
| 9568 sgp->sg_term_attr = sgp->sg_term; | |
| 9569 else | |
| 9570 { | |
| 9571 at_en.ae_attr = sgp->sg_term; | |
| 9572 at_en.ae_u.term.start = sgp->sg_start; | |
| 9573 at_en.ae_u.term.stop = sgp->sg_stop; | |
| 9574 sgp->sg_term_attr = get_attr_entry(&term_attr_table, &at_en); | |
| 9575 } | |
| 9576 | |
| 9577 /* | |
| 9578 * For the color term mode: If there are other than "normal" | |
| 9579 * highlighting attributes, need to allocate an attr number. | |
| 9580 */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9581 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
|
9582 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9583 && sgp->sg_gui_fg == INVALCOLOR |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9584 && sgp->sg_gui_bg == INVALCOLOR |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9585 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9586 ) |
| 7 | 9587 sgp->sg_cterm_attr = sgp->sg_cterm; |
| 9588 else | |
| 9589 { | |
| 9590 at_en.ae_attr = sgp->sg_cterm; | |
| 9591 at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg; | |
| 9592 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
|
9593 # ifdef FEAT_TERMGUICOLORS |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9594 # ifdef WIN3264 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9595 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9596 int id; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9597 guicolor_T fg, bg; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9598 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9599 id = syn_name2id((char_u *)"Normal"); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9600 if (id > 0) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9601 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9602 syn_id2colors(id, &fg, &bg); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9603 if (sgp->sg_gui_fg == INVALCOLOR) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9604 sgp->sg_gui_fg = fg; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9605 if (sgp->sg_gui_bg == INVALCOLOR) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9606 sgp->sg_gui_bg = bg; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9607 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9608 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9609 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
9610 # endif |
|
9054
f129fd3ebd98
commit https://github.com/vim/vim/commit/187147aedd588070d0676664d5076d046644094e
Christian Brabandt <cb@256bit.org>
parents:
9029
diff
changeset
|
9611 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
|
9612 at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9613 if (at_en.ae_u.cterm.fg_rgb == INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9614 && at_en.ae_u.cterm.bg_rgb == INVALCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9615 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9616 /* If both fg and bg are invalid fall back to the cterm colors. |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9617 * Helps when the GUI only uses an attribute, e.g. undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9618 at_en.ae_u.cterm.fg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9619 at_en.ae_u.cterm.bg_rgb = CTERMCOLOR; |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13337
diff
changeset
|
9620 } |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9621 # endif |
| 7 | 9622 sgp->sg_cterm_attr = get_attr_entry(&cterm_attr_table, &at_en); |
| 9623 } | |
| 9624 } | |
| 9625 | |
| 9626 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9627 * Lookup a highlight group name and return its ID. |
| 7 | 9628 * If it is not found, 0 is returned. |
| 9629 */ | |
| 9630 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9631 syn_name2id(char_u *name) |
| 7 | 9632 { |
| 9633 int i; | |
| 9634 char_u name_u[200]; | |
| 9635 | |
| 9636 /* Avoid using stricmp() too much, it's slow on some systems */ | |
| 9637 /* Avoid alloc()/free(), these are slow too. ID names over 200 chars | |
| 9638 * don't deserve to be found! */ | |
| 419 | 9639 vim_strncpy(name_u, name, 199); |
| 7 | 9640 vim_strup(name_u); |
| 9641 for (i = highlight_ga.ga_len; --i >= 0; ) | |
| 9642 if (HL_TABLE()[i].sg_name_u != NULL | |
| 9643 && STRCMP(name_u, HL_TABLE()[i].sg_name_u) == 0) | |
| 9644 break; | |
| 9645 return i + 1; | |
| 9646 } | |
| 9647 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9648 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9649 * 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
|
9650 * 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
|
9651 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9652 int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9653 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
|
9654 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9655 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
|
9656 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9657 if (id != 0) |
|
12511
b85c981b3a8e
patch 8.0.1134: superfluous call to syn_get_final_id()
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9658 return syn_id2attr(id); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9659 return 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9660 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
9661 |
| 7 | 9662 #if defined(FEAT_EVAL) || defined(PROTO) |
| 9663 /* | |
| 9664 * Return TRUE if highlight group "name" exists. | |
| 9665 */ | |
| 9666 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9667 highlight_exists(char_u *name) |
| 7 | 9668 { |
| 9669 return (syn_name2id(name) > 0); | |
| 9670 } | |
| 819 | 9671 |
| 9672 # if defined(FEAT_SEARCH_EXTRA) || defined(PROTO) | |
| 9673 /* | |
| 9674 * Return the name of highlight group "id". | |
| 9675 * When not a valid ID return an empty string. | |
| 9676 */ | |
| 9677 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9678 syn_id2name(int id) |
| 819 | 9679 { |
| 1326 | 9680 if (id <= 0 || id > highlight_ga.ga_len) |
| 819 | 9681 return (char_u *)""; |
| 9682 return HL_TABLE()[id - 1].sg_name; | |
| 9683 } | |
| 9684 # endif | |
| 7 | 9685 #endif |
| 9686 | |
| 9687 /* | |
| 9688 * Like syn_name2id(), but take a pointer + length argument. | |
| 9689 */ | |
| 9690 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9691 syn_namen2id(char_u *linep, int len) |
| 7 | 9692 { |
| 9693 char_u *name; | |
| 9694 int id = 0; | |
| 9695 | |
| 9696 name = vim_strnsave(linep, len); | |
| 9697 if (name != NULL) | |
| 9698 { | |
| 9699 id = syn_name2id(name); | |
| 9700 vim_free(name); | |
| 9701 } | |
| 9702 return id; | |
| 9703 } | |
| 9704 | |
| 9705 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9706 * Find highlight group name in the table and return its ID. |
| 7 | 9707 * The argument is a pointer to the name and the length of the name. |
| 9708 * If it doesn't exist yet, a new entry is created. | |
| 9709 * Return 0 for failure. | |
| 9710 */ | |
| 9711 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9712 syn_check_group(char_u *pp, int len) |
| 7 | 9713 { |
| 9714 int id; | |
| 9715 char_u *name; | |
| 9716 | |
| 9717 name = vim_strnsave(pp, len); | |
| 9718 if (name == NULL) | |
| 9719 return 0; | |
| 9720 | |
| 9721 id = syn_name2id(name); | |
| 9722 if (id == 0) /* doesn't exist yet */ | |
| 9723 id = syn_add_group(name); | |
| 9724 else | |
| 9725 vim_free(name); | |
| 9726 return id; | |
| 9727 } | |
| 9728 | |
| 9729 /* | |
|
11189
e74af2aca96e
patch 8.0.0481: unnecessary if statement
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
9730 * Add new highlight group and return its ID. |
| 7 | 9731 * "name" must be an allocated string, it will be consumed. |
| 9732 * Return 0 for failure. | |
| 9733 */ | |
| 9734 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9735 syn_add_group(char_u *name) |
| 7 | 9736 { |
| 9737 char_u *p; | |
| 9738 | |
| 9739 /* Check that the name is ASCII letters, digits and underscore. */ | |
| 9740 for (p = name; *p != NUL; ++p) | |
| 9741 { | |
| 9742 if (!vim_isprintc(*p)) | |
| 9743 { | |
| 9744 EMSG(_("E669: Unprintable character in group name")); | |
| 2020 | 9745 vim_free(name); |
| 7 | 9746 return 0; |
| 9747 } | |
| 9748 else if (!ASCII_ISALNUM(*p) && *p != '_') | |
| 9749 { | |
| 9750 /* This is an error, but since there previously was no check only | |
| 9751 * 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
|
9752 msg_source(HL_ATTR(HLF_W)); |
| 7 | 9753 MSG(_("W18: Invalid character in group name")); |
| 9754 break; | |
| 9755 } | |
| 9756 } | |
| 9757 | |
| 9758 /* | |
| 9759 * First call for this growarray: init growing array. | |
| 9760 */ | |
| 9761 if (highlight_ga.ga_data == NULL) | |
| 9762 { | |
| 9763 highlight_ga.ga_itemsize = sizeof(struct hl_group); | |
| 9764 highlight_ga.ga_growsize = 10; | |
| 9765 } | |
| 9766 | |
| 2756 | 9767 if (highlight_ga.ga_len >= MAX_HL_ID) |
| 9768 { | |
| 9769 EMSG(_("E849: Too many highlight and syntax groups")); | |
| 2743 | 9770 vim_free(name); |
| 9771 return 0; | |
| 9772 } | |
| 9773 | |
| 7 | 9774 /* |
| 9775 * Make room for at least one other syntax_highlight entry. | |
| 9776 */ | |
| 9777 if (ga_grow(&highlight_ga, 1) == FAIL) | |
| 9778 { | |
| 9779 vim_free(name); | |
| 9780 return 0; | |
| 9781 } | |
| 9782 | |
| 9783 vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(struct hl_group)); | |
| 9784 HL_TABLE()[highlight_ga.ga_len].sg_name = name; | |
| 9785 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
|
9786 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) |
| 7 | 9787 HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR; |
| 9788 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
|
9789 # ifdef FEAT_GUI |
| 205 | 9790 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
|
9791 # endif |
| 7 | 9792 #endif |
| 9793 ++highlight_ga.ga_len; | |
| 9794 | |
| 9795 return highlight_ga.ga_len; /* ID is index plus one */ | |
| 9796 } | |
| 9797 | |
| 9798 /* | |
| 9799 * When, just after calling syn_add_group(), an error is discovered, this | |
| 9800 * function deletes the new name. | |
| 9801 */ | |
| 9802 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9803 syn_unadd_group(void) |
| 7 | 9804 { |
| 9805 --highlight_ga.ga_len; | |
| 9806 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name); | |
| 9807 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name_u); | |
| 9808 } | |
| 9809 | |
| 9810 /* | |
| 9811 * Translate a group ID to highlight attributes. | |
| 9812 */ | |
| 9813 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9814 syn_id2attr(int hl_id) |
| 7 | 9815 { |
| 9816 int attr; | |
| 9817 struct hl_group *sgp; | |
| 9818 | |
| 9819 hl_id = syn_get_final_id(hl_id); | |
| 9820 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9821 | |
| 9822 #ifdef FEAT_GUI | |
| 9823 /* | |
| 9824 * Only use GUI attr when the GUI is being used. | |
| 9825 */ | |
| 9826 if (gui.in_use) | |
| 9827 attr = sgp->sg_gui_attr; | |
| 9828 else | |
| 9829 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9830 if (IS_CTERM) |
| 7 | 9831 attr = sgp->sg_cterm_attr; |
| 9832 else | |
| 9833 attr = sgp->sg_term_attr; | |
| 9834 | |
| 9835 return attr; | |
| 9836 } | |
| 9837 | |
|
12445
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9838 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
| 7 | 9839 /* |
| 9840 * Get the GUI colors and attributes for a group ID. | |
| 9841 * NOTE: the colors will be INVALCOLOR when not set, the color otherwise. | |
| 9842 */ | |
| 9843 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9844 syn_id2colors(int hl_id, guicolor_T *fgp, guicolor_T *bgp) |
| 7 | 9845 { |
| 9846 struct hl_group *sgp; | |
| 9847 | |
| 9848 hl_id = syn_get_final_id(hl_id); | |
| 9849 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9850 | |
| 9851 *fgp = sgp->sg_gui_fg; | |
| 9852 *bgp = sgp->sg_gui_bg; | |
| 9853 return sgp->sg_gui; | |
| 9854 } | |
| 9855 #endif | |
| 9856 | |
|
13976
115aed6c544c
patch 8.1.0006: syn_id2cterm_bg() may be undefined
Christian Brabandt <cb@256bit.org>
parents:
13810
diff
changeset
|
9857 #if (defined(WIN3264) \ |
|
115aed6c544c
patch 8.1.0006: syn_id2cterm_bg() may be undefined
Christian Brabandt <cb@256bit.org>
parents:
13810
diff
changeset
|
9858 && !defined(FEAT_GUI_W32) \ |
|
115aed6c544c
patch 8.1.0006: syn_id2cterm_bg() may be undefined
Christian Brabandt <cb@256bit.org>
parents:
13810
diff
changeset
|
9859 && defined(FEAT_TERMGUICOLORS)) || defined(PROTO) |
|
12445
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9860 void |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9861 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
|
9862 { |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9863 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
|
9864 |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9865 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
|
9866 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
|
9867 *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
|
9868 *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
|
9869 } |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9870 #endif |
|
65de672be458
patch 8.0.1102: terminal window does not use Normal colors
Christian Brabandt <cb@256bit.org>
parents:
12417
diff
changeset
|
9871 |
| 7 | 9872 /* |
| 9873 * Translate a group ID to the final group ID (following links). | |
| 9874 */ | |
| 9875 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9876 syn_get_final_id(int hl_id) |
| 7 | 9877 { |
| 9878 int count; | |
| 9879 struct hl_group *sgp; | |
| 9880 | |
| 9881 if (hl_id > highlight_ga.ga_len || hl_id < 1) | |
| 9882 return 0; /* Can be called from eval!! */ | |
| 9883 | |
| 9884 /* | |
| 9885 * Follow links until there is no more. | |
| 9886 * Look out for loops! Break after 100 links. | |
| 9887 */ | |
| 9888 for (count = 100; --count >= 0; ) | |
| 9889 { | |
| 9890 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */ | |
| 9891 if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len) | |
| 9892 break; | |
| 9893 hl_id = sgp->sg_link; | |
| 9894 } | |
| 9895 | |
| 9896 return hl_id; | |
| 9897 } | |
| 9898 | |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
9899 #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) || defined(PROTO) |
| 7 | 9900 /* |
| 9901 * Call this function just after the GUI has started. | |
|
13337
1b7522243dde
patch 8.0.1543: with 'termguicolors' Normal color doesn't work correctly
Christian Brabandt <cb@256bit.org>
parents:
13333
diff
changeset
|
9902 * Also called when 'termguicolors' was set, gui.in_use will be FALSE then. |
| 7 | 9903 * It finds the font and color handles for the highlighting groups. |
| 9904 */ | |
| 9905 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9906 highlight_gui_started(void) |
| 7 | 9907 { |
| 9908 int idx; | |
| 9909 | |
| 9910 /* First get the colors from the "Normal" and "Menu" group, if set */ | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9911 if (USE_24BIT) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9912 set_normal_colors(); |
| 7 | 9913 |
| 9914 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 9915 gui_do_one_color(idx, FALSE, FALSE); | |
| 9916 | |
| 9917 highlight_changed(); | |
| 9918 } | |
| 9919 | |
| 9920 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9921 gui_do_one_color( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
9922 int idx, |
|
8975
9c097bfad637
commit https://github.com/vim/vim/commit/380130f1e18da92a44372728fe044f56db58585b
Christian Brabandt <cb@256bit.org>
parents:
8969
diff
changeset
|
9923 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
|
9924 int do_tooltip UNUSED) /* TRUE: might set the tooltip font */ |
| 7 | 9925 { |
| 9926 int didit = FALSE; | |
| 9927 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9928 # ifdef FEAT_GUI |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9929 # ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9930 if (gui.in_use) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9931 # endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9932 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
|
9933 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9934 hl_do_font(idx, HL_TABLE()[idx].sg_font_name, FALSE, do_menu, |
| 3881 | 9935 do_tooltip, TRUE); |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9936 didit = TRUE; |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9937 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9938 # endif |
| 7 | 9939 if (HL_TABLE()[idx].sg_gui_fg_name != NULL) |
| 9940 { | |
| 9941 HL_TABLE()[idx].sg_gui_fg = | |
| 9942 color_name2handle(HL_TABLE()[idx].sg_gui_fg_name); | |
| 9943 didit = TRUE; | |
| 9944 } | |
| 9945 if (HL_TABLE()[idx].sg_gui_bg_name != NULL) | |
| 9946 { | |
| 9947 HL_TABLE()[idx].sg_gui_bg = | |
| 9948 color_name2handle(HL_TABLE()[idx].sg_gui_bg_name); | |
| 9949 didit = TRUE; | |
| 9950 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9951 # ifdef FEAT_GUI |
| 205 | 9952 if (HL_TABLE()[idx].sg_gui_sp_name != NULL) |
| 9953 { | |
| 9954 HL_TABLE()[idx].sg_gui_sp = | |
| 9955 color_name2handle(HL_TABLE()[idx].sg_gui_sp_name); | |
| 9956 didit = TRUE; | |
| 9957 } | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8815
diff
changeset
|
9958 # endif |
| 7 | 9959 if (didit) /* need to get a new attr number */ |
| 9960 set_hl_attr(idx); | |
| 9961 } | |
| 9962 #endif | |
| 9963 | |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9964 #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
|
9965 /* |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
9966 * 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
|
9967 */ |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9968 static void |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9969 combine_stl_hlt( |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9970 int id, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9971 int id_S, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9972 int id_alt, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9973 int hlcnt, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9974 int i, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9975 int hlf, |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9976 int *table) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9977 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9978 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
|
9979 |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9980 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
|
9981 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9982 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
|
9983 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
|
9984 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
|
9985 # 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
|
9986 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
|
9987 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9988 } |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9989 else |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9990 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
|
9991 &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
|
9992 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
|
9993 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
|
9994 |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
9995 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
|
9996 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
|
9997 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
|
9998 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
|
9999 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
|
10000 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
|
10001 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
|
10002 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
|
10003 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
|
10004 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
|
10005 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
|
10006 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
|
10007 # 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
|
10008 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
|
10009 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
|
10010 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10011 # ifdef FEAT_GUI |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10012 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
|
10013 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
|
10014 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
|
10015 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
|
10016 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
|
10017 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
|
10018 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
|
10019 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
|
10020 # ifdef FEAT_XFONTSET |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10021 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
|
10022 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
|
10023 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10024 # endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10025 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
|
10026 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
|
10027 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
|
10028 } |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10029 #endif |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10030 |
| 7 | 10031 /* |
| 10032 * Translate the 'highlight' option into attributes in highlight_attr[] and | |
| 10033 * set up the user highlights User1..9. If FEAT_STL_OPT is in use, a set of | |
| 10034 * corresponding highlights to use on top of HLF_SNC is computed. | |
| 10035 * Called only when the 'highlight' option has been changed and upon first | |
| 10036 * screen redraw after any :highlight command. | |
| 10037 * Return FAIL when an invalid flag is found in 'highlight'. OK otherwise. | |
| 10038 */ | |
| 10039 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10040 highlight_changed(void) |
| 7 | 10041 { |
| 10042 int hlf; | |
| 10043 int i; | |
| 10044 char_u *p; | |
| 10045 int attr; | |
| 10046 char_u *end; | |
| 10047 int id; | |
| 10048 #ifdef USER_HIGHLIGHT | |
| 10049 char_u userhl[10]; | |
| 10050 # ifdef FEAT_STL_OPT | |
| 10051 int id_S = -1; | |
|
13495
459c4b29b6c1
patch 8.0.1621: using invalid default value for highlight attribute
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
10052 int id_SNC = 0; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10053 # ifdef FEAT_TERMINAL |
|
13495
459c4b29b6c1
patch 8.0.1621: using invalid default value for highlight attribute
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
10054 int id_ST = 0; |
|
459c4b29b6c1
patch 8.0.1621: using invalid default value for highlight attribute
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
10055 int id_STNC = 0; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10056 # endif |
| 7 | 10057 int hlcnt; |
| 10058 # endif | |
| 10059 #endif | |
| 10060 static int hl_flags[HLF_COUNT] = HL_FLAGS; | |
| 10061 | |
| 10062 need_highlight_changed = FALSE; | |
| 10063 | |
| 10064 /* | |
| 10065 * Clear all attributes. | |
| 10066 */ | |
| 10067 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf) | |
| 10068 highlight_attr[hlf] = 0; | |
| 10069 | |
| 10070 /* | |
| 10071 * First set all attributes to their default value. | |
| 10072 * Then use the attributes from the 'highlight' option. | |
| 10073 */ | |
| 10074 for (i = 0; i < 2; ++i) | |
| 10075 { | |
| 10076 if (i) | |
| 10077 p = p_hl; | |
| 10078 else | |
| 10079 p = get_highlight_default(); | |
| 10080 if (p == NULL) /* just in case */ | |
| 10081 continue; | |
| 10082 | |
| 10083 while (*p) | |
| 10084 { | |
| 10085 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf) | |
| 10086 if (hl_flags[hlf] == *p) | |
| 10087 break; | |
| 10088 ++p; | |
| 10089 if (hlf == (int)HLF_COUNT || *p == NUL) | |
| 10090 return FAIL; | |
| 10091 | |
| 10092 /* | |
| 10093 * Allow several hl_flags to be combined, like "bu" for | |
| 10094 * bold-underlined. | |
| 10095 */ | |
| 10096 attr = 0; | |
| 10097 for ( ; *p && *p != ','; ++p) /* parse upto comma */ | |
| 10098 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
10099 if (VIM_ISWHITE(*p)) /* ignore white space */ |
| 7 | 10100 continue; |
| 10101 | |
| 10102 if (attr > HL_ALL) /* Combination with ':' is not allowed. */ | |
| 10103 return FAIL; | |
| 10104 | |
| 10105 switch (*p) | |
| 10106 { | |
| 10107 case 'b': attr |= HL_BOLD; | |
| 10108 break; | |
| 10109 case 'i': attr |= HL_ITALIC; | |
| 10110 break; | |
| 10111 case '-': | |
| 10112 case 'n': /* no highlighting */ | |
| 10113 break; | |
| 10114 case 'r': attr |= HL_INVERSE; | |
| 10115 break; | |
| 10116 case 's': attr |= HL_STANDOUT; | |
| 10117 break; | |
| 10118 case 'u': attr |= HL_UNDERLINE; | |
| 10119 break; | |
| 205 | 10120 case 'c': attr |= HL_UNDERCURL; |
| 10121 break; | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
10122 case 't': attr |= HL_STRIKETHROUGH; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12180
diff
changeset
|
10123 break; |
| 7 | 10124 case ':': ++p; /* highlight group name */ |
| 10125 if (attr || *p == NUL) /* no combinations */ | |
| 10126 return FAIL; | |
| 10127 end = vim_strchr(p, ','); | |
| 10128 if (end == NULL) | |
| 10129 end = p + STRLEN(p); | |
| 10130 id = syn_check_group(p, (int)(end - p)); | |
| 10131 if (id == 0) | |
| 10132 return FAIL; | |
| 10133 attr = syn_id2attr(id); | |
| 10134 p = end - 1; | |
| 10135 #if defined(FEAT_STL_OPT) && defined(USER_HIGHLIGHT) | |
| 10136 if (hlf == (int)HLF_SNC) | |
| 10137 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
|
10138 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10139 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
|
10140 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
|
10141 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
|
10142 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
|
10143 # endif |
| 7 | 10144 else if (hlf == (int)HLF_S) |
| 10145 id_S = syn_get_final_id(id); | |
| 10146 #endif | |
| 10147 break; | |
| 10148 default: return FAIL; | |
| 10149 } | |
| 10150 } | |
| 10151 highlight_attr[hlf] = attr; | |
| 10152 | |
| 10153 p = skip_to_option_part(p); /* skip comma and spaces */ | |
| 10154 } | |
| 10155 } | |
| 10156 | |
| 10157 #ifdef USER_HIGHLIGHT | |
| 10158 /* Setup the user highlights | |
| 10159 * | |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10160 * 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
|
10161 * 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
|
10162 * 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
|
10163 * 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
|
10164 * 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
|
10165 * 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
|
10166 * get_attr_entry() |
| 7 | 10167 */ |
| 10168 # 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
|
10169 if (ga_grow(&highlight_ga, 28) == FAIL) |
| 7 | 10170 return FAIL; |
| 10171 hlcnt = highlight_ga.ga_len; | |
|
12180
88ca0110abd5
patch 8.0.0970: passing invalid highlight id
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10172 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
|
10173 { |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10174 /* 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
|
10175 * entry. */ |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10176 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
|
10177 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
|
10178 id_S = hlcnt + 19; |
| 7 | 10179 } |
| 10180 # endif | |
| 10181 for (i = 0; i < 9; i++) | |
| 10182 { | |
| 10183 sprintf((char *)userhl, "User%d", i + 1); | |
| 10184 id = syn_name2id(userhl); | |
| 10185 if (id == 0) | |
| 10186 { | |
| 10187 highlight_user[i] = 0; | |
| 10188 # ifdef FEAT_STL_OPT | |
| 10189 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
|
10190 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10191 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
|
10192 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
|
10193 # endif |
| 7 | 10194 # endif |
| 10195 } | |
| 10196 else | |
| 10197 { | |
| 10198 highlight_user[i] = syn_id2attr(id); | |
| 10199 # 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
|
10200 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
|
10201 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
|
10202 # ifdef FEAT_TERMINAL |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
12082
diff
changeset
|
10203 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
|
10204 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
|
10205 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
|
10206 HLF_STNC, highlight_stltermnc); |
| 7 | 10207 # endif |
| 10208 # endif | |
| 10209 } | |
| 10210 } | |
| 10211 # ifdef FEAT_STL_OPT | |
| 10212 highlight_ga.ga_len = hlcnt; | |
| 10213 # endif | |
| 10214 | |
| 10215 #endif /* USER_HIGHLIGHT */ | |
| 10216 | |
| 10217 return OK; | |
| 10218 } | |
| 10219 | |
| 1322 | 10220 #if defined(FEAT_CMDL_COMPL) || defined(PROTO) |
| 7 | 10221 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
10222 static void highlight_list(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7687
diff
changeset
|
10223 static void highlight_list_two(int cnt, int attr); |
| 7 | 10224 |
| 10225 /* | |
| 10226 * Handle command line completion for :highlight command. | |
| 10227 */ | |
| 10228 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10229 set_context_in_highlight_cmd(expand_T *xp, char_u *arg) |
| 7 | 10230 { |
| 10231 char_u *p; | |
| 10232 | |
| 10233 /* Default: expand group names */ | |
| 10234 xp->xp_context = EXPAND_HIGHLIGHT; | |
| 10235 xp->xp_pattern = arg; | |
| 1322 | 10236 include_link = 2; |
| 10237 include_default = 1; | |
| 7 | 10238 |
| 10239 /* (part of) subcommand already typed */ | |
| 10240 if (*arg != NUL) | |
| 10241 { | |
| 10242 p = skiptowhite(arg); | |
| 10243 if (*p != NUL) /* past "default" or group name */ | |
| 10244 { | |
| 1322 | 10245 include_default = 0; |
| 7 | 10246 if (STRNCMP("default", arg, p - arg) == 0) |
| 10247 { | |
| 10248 arg = skipwhite(p); | |
| 10249 xp->xp_pattern = arg; | |
| 10250 p = skiptowhite(arg); | |
| 10251 } | |
| 10252 if (*p != NUL) /* past group name */ | |
| 10253 { | |
| 1322 | 10254 include_link = 0; |
| 7 | 10255 if (arg[1] == 'i' && arg[0] == 'N') |
| 10256 highlight_list(); | |
| 10257 if (STRNCMP("link", arg, p - arg) == 0 | |
| 10258 || STRNCMP("clear", arg, p - arg) == 0) | |
| 10259 { | |
| 10260 xp->xp_pattern = skipwhite(p); | |
| 10261 p = skiptowhite(xp->xp_pattern); | |
| 10262 if (*p != NUL) /* past first group name */ | |
| 10263 { | |
| 10264 xp->xp_pattern = skipwhite(p); | |
| 10265 p = skiptowhite(xp->xp_pattern); | |
| 10266 } | |
| 10267 } | |
| 10268 if (*p != NUL) /* past group name(s) */ | |
| 10269 xp->xp_context = EXPAND_NOTHING; | |
| 10270 } | |
| 10271 } | |
| 10272 } | |
| 10273 } | |
| 10274 | |
| 10275 /* | |
| 10276 * List highlighting matches in a nice way. | |
| 10277 */ | |
| 10278 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10279 highlight_list(void) |
| 7 | 10280 { |
| 10281 int i; | |
| 10282 | |
| 10283 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
|
10284 highlight_list_two(i, HL_ATTR(HLF_D)); |
| 7 | 10285 for (i = 40; --i >= 0; ) |
| 10286 highlight_list_two(99, 0); | |
| 10287 } | |
| 10288 | |
| 10289 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10290 highlight_list_two(int cnt, int attr) |
| 7 | 10291 { |
| 3543 | 10292 msg_puts_attr((char_u *)&("N \bI \b! \b"[cnt / 11]), attr); |
| 7 | 10293 msg_clr_eos(); |
| 10294 out_flush(); | |
| 10295 ui_delay(cnt == 99 ? 40L : (long)cnt * 50L, FALSE); | |
| 10296 } | |
| 10297 | |
| 10298 #endif /* FEAT_CMDL_COMPL */ | |
| 10299 | |
| 10300 #if defined(FEAT_CMDL_COMPL) || (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) \ | |
| 10301 || defined(FEAT_SIGNS) || defined(PROTO) | |
| 10302 /* | |
| 10303 * Function given to ExpandGeneric() to obtain the list of group names. | |
| 10304 */ | |
| 10305 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10306 get_highlight_name(expand_T *xp UNUSED, int idx) |
| 7 | 10307 { |
|
11254
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10308 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
|
10309 } |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10310 |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10311 /* |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10312 * 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
|
10313 * 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
|
10314 */ |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10315 char_u * |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10316 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
|
10317 { |
|
10660
715836a72361
patch 8.0.0220: completion of highlight names misses a few values
Christian Brabandt <cb@256bit.org>
parents:
10648
diff
changeset
|
10318 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
|
10319 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
|
10320 |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10321 /* 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
|
10322 * cleared. */ |
|
918942a3b0ef
patch 8.0.0513: getting name of cleared highlight group is wrong
Christian Brabandt <cb@256bit.org>
parents:
11189
diff
changeset
|
10323 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
|
10324 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
|
10325 |
| 7 | 10326 #ifdef FEAT_CMDL_COMPL |
| 1322 | 10327 if (idx == highlight_ga.ga_len && include_none != 0) |
| 10328 return (char_u *)"none"; | |
| 10329 if (idx == highlight_ga.ga_len + include_none && include_default != 0) | |
| 10330 return (char_u *)"default"; | |
| 10331 if (idx == highlight_ga.ga_len + include_none + include_default | |
| 10332 && include_link != 0) | |
| 7 | 10333 return (char_u *)"link"; |
| 1322 | 10334 if (idx == highlight_ga.ga_len + include_none + include_default + 1 |
| 10335 && include_link != 0) | |
| 7 | 10336 return (char_u *)"clear"; |
| 10337 #endif | |
|
10624
5ac9d7920f11
patch 8.0.0201: completion of highlight groups includes cleared names
Christian Brabandt <cb@256bit.org>
parents:
10618
diff
changeset
|
10338 if (idx >= highlight_ga.ga_len) |
| 7 | 10339 return NULL; |
| 10340 return HL_TABLE()[idx].sg_name; | |
| 10341 } | |
| 10342 #endif | |
| 10343 | |
| 1322 | 10344 #if defined(FEAT_GUI) || defined(PROTO) |
| 7 | 10345 /* |
| 10346 * Free all the highlight group fonts. | |
| 10347 * Used when quitting for systems which need it. | |
| 10348 */ | |
| 10349 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
10350 free_highlight_fonts(void) |
| 7 | 10351 { |
| 10352 int idx; | |
| 10353 | |
| 10354 for (idx = 0; idx < highlight_ga.ga_len; ++idx) | |
| 10355 { | |
| 10356 gui_mch_free_font(HL_TABLE()[idx].sg_font); | |
| 10357 HL_TABLE()[idx].sg_font = NOFONT; | |
| 10358 # ifdef FEAT_XFONTSET | |
| 10359 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset); | |
| 10360 HL_TABLE()[idx].sg_fontset = NOFONTSET; | |
| 10361 # endif | |
| 10362 } | |
| 10363 | |
| 10364 gui_mch_free_font(gui.norm_font); | |
| 10365 # ifdef FEAT_XFONTSET | |
| 10366 gui_mch_free_fontset(gui.fontset); | |
| 10367 # endif | |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2256
diff
changeset
|
10368 # ifndef FEAT_GUI_GTK |
| 7 | 10369 gui_mch_free_font(gui.bold_font); |
| 10370 gui_mch_free_font(gui.ital_font); | |
| 10371 gui_mch_free_font(gui.boldital_font); | |
| 10372 # endif | |
| 10373 } | |
| 10374 #endif | |
| 10375 | |
| 10376 /************************************** | |
| 10377 * End of Highlighting stuff * | |
| 10378 **************************************/ |