annotate src/syntax.c @ 2756:d72d709f0e18 v7.3.154

updated for version 7.3.154 Problem: Can't compile with tiny features. (Tony Mechelynck) Solution: Move #define outside of #ifdef.
author Bram Moolenaar <bram@vim.org>
date Sat, 02 Apr 2011 15:12:50 +0200
parents d67916de812a
children c5e47b752f07
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 /* vi:set ts=8 sts=4 sw=4:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 * syntax.c: code for syntax highlighting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 * Structure that stores information about a highlight group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 * The ID of a highlight group is also called group ID. It is the index in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 * the highlight_ga array PLUS ONE.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 struct hl_group
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 char_u *sg_name; /* highlight group name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 char_u *sg_name_u; /* uppercase of sg_name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 /* for normal terminals */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 int sg_term; /* "term=" highlighting attributes */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 char_u *sg_start; /* terminal string for start highl */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 char_u *sg_stop; /* terminal string for stop highl */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 int sg_term_attr; /* Screen attr for term mode */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 /* for color terminals */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 int sg_cterm; /* "cterm=" highlighting attr */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 int sg_cterm_bold; /* bold attr was set for light color */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 int sg_cterm_fg; /* terminal fg color number + 1 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 int sg_cterm_bg; /* terminal bg color number + 1 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 int sg_cterm_attr; /* Screen attr for color term mode */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 /* for when using the GUI */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 guicolor_T sg_gui_fg; /* GUI foreground color handle */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 guicolor_T sg_gui_bg; /* GUI background color handle */
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
40 guicolor_T sg_gui_sp; /* GUI special color handle */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 GuiFont sg_font; /* GUI font handle */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 #ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 GuiFontset sg_fontset; /* GUI fontset handle */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 char_u *sg_font_name; /* GUI font or fontset name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 int sg_gui_attr; /* Screen attr for GUI mode */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 #endif
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
48 #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
49 /* 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
50 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
51 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
52 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
53 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
54 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 int sg_link; /* link to this highlight group ID */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 int sg_set; /* combination of SG_* flags */
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
57 #ifdef FEAT_EVAL
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
58 scid_T sg_scriptID; /* script in which the group was last set */
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
59 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 #define SG_TERM 1 /* term has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63 #define SG_CTERM 2 /* cterm has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 #define SG_GUI 4 /* gui has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65 #define SG_LINK 8 /* link has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
66
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
67 static garray_T highlight_ga; /* highlight groups for 'highlight' option */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69 #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
70
2756
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
71 #define MAX_HL_ID 20000 /* maximum value for a highlight ID. */
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
72
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
73 #ifdef FEAT_CMDL_COMPL
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
74 /* Flags to indicate an additional string for highlight name completion. */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
75 static int include_none = 0; /* when 1 include "None" */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
76 static int include_default = 0; /* when 1 include "default" */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
77 static int include_link = 0; /* when 2 include "link" and "clear" */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81 * The "term", "cterm" and "gui" arguments can be any combination of the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82 * following names, separated by commas (but no spaces!).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
84 static char *(hl_name_table[]) =
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
85 {"bold", "standout", "underline", "undercurl",
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
86 "italic", "reverse", "inverse", "NONE"};
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
87 static int hl_attr_table[] =
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
88 {HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE, HL_INVERSE, 0};
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
90 static int get_attr_entry __ARGS((garray_T *table, attrentry_T *aep));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
91 static void syn_unadd_group __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92 static void set_hl_attr __ARGS((int idx));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93 static void highlight_list_one __ARGS((int id));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 static int highlight_list_arg __ARGS((int id, int didh, int type, int iarg, char_u *sarg, char *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 static int syn_add_group __ARGS((char_u *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 static int syn_list_header __ARGS((int did_header, int outlen, int id));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97 static int hl_has_settings __ARGS((int idx, int check_link));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 static void highlight_clear __ARGS((int idx));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
101 static void gui_do_one_color __ARGS((int idx, int do_menu, int do_tooltip));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 static int set_group_colors __ARGS((char_u *name, guicolor_T *fgp, guicolor_T *bgp, int do_menu, int use_norm, int do_tooltip));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
103 static guicolor_T color_name2handle __ARGS((char_u *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
104 static GuiFont font_name2handle __ARGS((char_u *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
105 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
106 static GuiFontset fontset_name2handle __ARGS((char_u *name, int fixed_width));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
107 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
108 static void hl_do_font __ARGS((int idx, char_u *arg, int do_normal, int do_menu, int do_tooltip));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
109 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
110
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
112 * An attribute number is the index in attr_table plus ATTR_OFF.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 #define ATTR_OFF (HL_ALL + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 #if defined(FEAT_SYN_HL) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
117
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
118 #define SYN_NAMELEN 50 /* maximum length of a syntax name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
119
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 /* different types of offsets that are possible */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 #define SPO_MS_OFF 0 /* match start offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 #define SPO_ME_OFF 1 /* match end offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 #define SPO_HS_OFF 2 /* highl. start offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 #define SPO_HE_OFF 3 /* highl. end offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125 #define SPO_RS_OFF 4 /* region start offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 #define SPO_RE_OFF 5 /* region end offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 #define SPO_LC_OFF 6 /* leading context offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 #define SPO_COUNT 7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 static char *(spo_name_tab[SPO_COUNT]) =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
131 {"ms=", "me=", "hs=", "he=", "rs=", "re=", "lc="};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
133 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 * The patterns that are being searched for are stored in a syn_pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135 * A match item consists of one pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
136 * A start/end item consists of n start patterns and m end patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
137 * A start/skip/end item consists of n start patterns, one skip pattern and m
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138 * end patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
139 * For the latter two, the patterns are always consecutive: start-skip-end.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
140 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
141 * A character offset can be given for the matched text (_m_start and _m_end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
142 * and for the actually highlighted text (_h_start and _h_end).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 typedef struct syn_pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
145 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146 char sp_type; /* see SPTYPE_ defines below */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 char sp_syncing; /* this item used for syncing */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
148 int sp_flags; /* see HL_ defines below */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
149 #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
150 int sp_cchar; /* conceal substitute character */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
151 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
152 struct sp_syn sp_syn; /* struct passed to in_id_list() */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
153 short sp_syn_match_id; /* highlight group ID of pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 char_u *sp_pattern; /* regexp to match, pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
155 regprog_T *sp_prog; /* regexp to match, program */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
156 int sp_ic; /* ignore-case flag for sp_prog */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157 short sp_off_flags; /* see below */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
158 int sp_offsets[SPO_COUNT]; /* offsets */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
159 short *sp_cont_list; /* cont. group IDs, if non-zero */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
160 short *sp_next_list; /* next group IDs, if non-zero */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
161 int sp_sync_idx; /* sync item index (syncing only) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
162 int sp_line_id; /* ID of last line where tried */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
163 int sp_startcol; /* next match in sp_line_id line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
164 } synpat_T;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
165
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
166 /* The sp_off_flags are computed like this:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
167 * offset from the start of the matched text: (1 << SPO_XX_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
168 * offset from the end of the matched text: (1 << (SPO_XX_OFF + SPO_COUNT))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
169 * When both are present, only one is used.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
170 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
171
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
172 #define SPTYPE_MATCH 1 /* match keyword with this group ID */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
173 #define SPTYPE_START 2 /* match a regexp, start of item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 #define SPTYPE_END 3 /* match a regexp, end of item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 #define SPTYPE_SKIP 4 /* match a regexp, skip within item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
176
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
178 #define SYN_ITEMS(buf) ((synpat_T *)((buf)->b_syn_patterns.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
179
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
180 #define NONE_IDX -2 /* value of sp_sync_idx for "NONE" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
181
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
182 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
183 * Flags for b_syn_sync_flags:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
184 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
185 #define SF_CCOMMENT 0x01 /* sync on a C-style comment */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
186 #define SF_MATCH 0x02 /* sync by matching a pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
187
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
188 #define SYN_STATE_P(ssp) ((bufstate_T *)((ssp)->ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
189
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
190 #define MAXKEYWLEN 80 /* maximum length of a keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
191
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
192 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
193 * The attributes of the syntax item that has been recognized.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
194 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
195 static int current_attr = 0; /* attr of current syntax word */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
196 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
197 static int current_id = 0; /* ID of current char for syn_get_id() */
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
198 static int current_trans_id = 0; /* idem, transparency removed */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
199 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
200 #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
201 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
202 static int current_seqnr = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
203 static int current_sub_char = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
204 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
205
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
206 typedef struct syn_cluster_S
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
207 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
208 char_u *scl_name; /* syntax cluster name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
209 char_u *scl_name_u; /* uppercase of scl_name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
210 short *scl_list; /* IDs in this syntax cluster */
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
211 } syn_cluster_T;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
212
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
213 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
214 * Methods of combining two clusters
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
215 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
216 #define CLUSTER_REPLACE 1 /* replace first list with second */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
217 #define CLUSTER_ADD 2 /* add second list to first */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
218 #define CLUSTER_SUBTRACT 3 /* subtract second list from first */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
219
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
220 #define SYN_CLSTR(buf) ((syn_cluster_T *)((buf)->b_syn_clusters.ga_data))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
221
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
222 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
223 * Syntax group IDs have different types:
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
224 * 0 - 19999 normal syntax groups
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
225 * 20000 - 20999 ALLBUT indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
226 * 21000 - 21999 TOP indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
227 * 22000 - 22999 CONTAINED indicator (current_syn_inc_tag added)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
228 * 23000 - 32767 cluster IDs (subtract SYNID_CLUSTER for the cluster ID)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
229 */
2756
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
230 #define SYNID_ALLBUT MAX_HL_ID /* syntax group ID for contains=ALLBUT */
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
231 #define SYNID_TOP 21000 /* syntax group ID for contains=TOP */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
232 #define SYNID_CONTAINED 22000 /* syntax group ID for contains=CONTAINED */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
233 #define SYNID_CLUSTER 23000 /* first syntax group ID for clusters */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
234
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
235 #define MAX_SYN_INC_TAG 999 /* maximum before the above overflow */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
236 #define MAX_CLUSTER_ID (32767 - SYNID_CLUSTER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
237
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
238 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
239 * Annoying Hack(TM): ":syn include" needs this pointer to pass to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240 * expand_filename(). Most of the other syntax commands don't need it, so
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 * instead of passing it to them, we stow it here.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243 static char_u **syn_cmdlinep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
245 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 * 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
247 * files from leaking into ALLBUT lists, we assign a unique ID to the
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
248 * rules in each ":syn include"'d file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
249 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
250 static int current_syn_inc_tag = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
251 static int running_syn_inc_tag = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 /*
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
254 * In a hashtable item "hi_key" points to "keyword" in a keyentry.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
255 * This avoids adding a pointer to the hashtable item.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
256 * KE2HIKEY() converts a var pointer to a hashitem key pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
257 * HIKEY2KE() converts a hashitem key pointer to a var pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
258 * HI2KE() converts a hashitem pointer to a var pointer.
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
259 */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
260 static keyentry_T dumkey;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
261 #define KE2HIKEY(kp) ((kp)->keyword)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
262 #define HIKEY2KE(p) ((keyentry_T *)((p) - (dumkey.keyword - (char_u *)&dumkey)))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
263 #define HI2KE(hi) HIKEY2KE((hi)->hi_key)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
264
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
265 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
266 * To reduce the time spent in keepend(), remember at which level in the state
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
267 * stack the first item with "keepend" is present. When "-1", there is no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
268 * "keepend" on the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
269 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
270 static int keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
271
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
272 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
273 * For the current state we need to remember more than just the idx.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
274 * When si_m_endpos.lnum is 0, the items other than si_idx are unknown.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
275 * (The end positions have the column number of the next char)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
276 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
277 typedef struct state_item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
278 {
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
279 int si_idx; /* index of syntax pattern or
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
280 KEYWORD_IDX */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
281 int si_id; /* highlight group ID for keywords */
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
282 int si_trans_id; /* idem, transparency removed */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
283 int si_m_lnum; /* lnum of the match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 int si_m_startcol; /* starting column of the match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 lpos_T si_m_endpos; /* just after end posn of the match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286 lpos_T si_h_startpos; /* start position of the highlighting */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
287 lpos_T si_h_endpos; /* end position of the highlighting */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
288 lpos_T si_eoe_pos; /* end position of end pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
289 int si_end_idx; /* group ID for end pattern or zero */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
290 int si_ends; /* if match ends before si_m_endpos */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
291 int si_attr; /* attributes in this state */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
292 long si_flags; /* HL_HAS_EOL flag in this state, and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
293 * HL_SKIP* for si_next_list */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
294 #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
295 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
296 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
297 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
298 short *si_cont_list; /* list of contained groups */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
299 short *si_next_list; /* nextgroup IDs after this item ends */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
300 reg_extmatch_T *si_extmatch; /* \z(...\) matches from start
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
301 * pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
302 } stateitem_T;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
303
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
304 #define KEYWORD_IDX -1 /* value of si_idx for keywords */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
305 #define ID_LIST_ALL (short *)-1 /* valid of si_cont_list for containing all
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306 but contained groups */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307
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
308 #ifdef FEAT_CONCEAL
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
309 static int next_seqnr = 0; /* value to use for si_seqnr */
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
310 #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
311
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
312 /*
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
313 * Struct to reduce the number of arguments to get_syn_options(), it's used
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
314 * very often.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
315 */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
316 typedef struct
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
317 {
1222
756bed568f5d updated for version 7.1b
vimboss
parents: 1161
diff changeset
318 int flags; /* flags for contained and transparent */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
319 int keyword; /* TRUE for ":syn keyword" */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
320 int *sync_idx; /* syntax item for "grouphere" argument, NULL
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
321 if not allowed */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
322 char has_cont_list; /* TRUE if "cont_list" can be used */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
323 short *cont_list; /* group IDs for "contains" argument */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
324 short *cont_in_list; /* group IDs for "containedin" argument */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
325 short *next_list; /* group IDs for "nextgroup" argument */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
326 } syn_opt_arg_T;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
327
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
328 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
329 * The next possible match in the current line for any pattern is remembered,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
330 * to avoid having to try for a match in each column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331 * If next_match_idx == -1, not tried (in this line) yet.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
332 * If next_match_col == MAXCOL, no match found in this line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 * (All end positions have the column of the char after the end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
334 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
335 static int next_match_col; /* column for start of next match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
336 static lpos_T next_match_m_endpos; /* position for end of next match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 static lpos_T next_match_h_startpos; /* pos. for highl. start of next match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 static lpos_T next_match_h_endpos; /* pos. for highl. end of next match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339 static int next_match_idx; /* index of matched item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
340 static long next_match_flags; /* flags for next match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
341 static lpos_T next_match_eos_pos; /* end of start pattn (start region) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
342 static lpos_T next_match_eoe_pos; /* pos. for end of end pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
343 static int next_match_end_idx; /* ID of group for end pattn or zero */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
344 static reg_extmatch_T *next_match_extmatch = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
345
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
346 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
347 * A state stack is an array of integers or stateitem_T, stored in a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
348 * garray_T. A state stack is invalid if it's itemsize entry is zero.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
350 #define INVALID_STATE(ssp) ((ssp)->ga_itemsize == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 #define VALID_STATE(ssp) ((ssp)->ga_itemsize != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
352
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 * The current state (within the line) of the recognition engine.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
355 * When current_state.ga_itemsize is 0 the current state is invalid.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
356 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 static win_T *syn_win; /* current window for highlighting */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 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
359 static synblock_T *syn_block; /* current buffer for highlighting */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 static linenr_T current_lnum = 0; /* lnum of current state */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 static colnr_T current_col = 0; /* column of current state */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 static int current_state_stored = 0; /* TRUE if stored current state
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 * after setting current_finished */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
364 static int current_finished = 0; /* current line has been finished */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
365 static garray_T current_state /* current stack of state_items */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
366 = {0, 0, 0, 0, NULL};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 static short *current_next_list = NULL; /* when non-zero, nextgroup list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 static int current_next_flags = 0; /* flags for current_next_list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 static int current_line_id = 0; /* unique number for current line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 #define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373 static void syn_sync __ARGS((win_T *wp, linenr_T lnum, synstate_T *last_valid));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 static int syn_match_linecont __ARGS((linenr_T lnum));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
375 static void syn_start_line __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 static void syn_update_ends __ARGS((int startofline));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 static void syn_stack_alloc __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 static int syn_stack_cleanup __ARGS((void));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
379 static void syn_stack_free_entry __ARGS((synblock_T *block, synstate_T *p));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
380 static synstate_T *syn_stack_find_entry __ARGS((linenr_T lnum));
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
381 static synstate_T *store_current_state __ARGS((void));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 static void load_current_state __ARGS((synstate_T *from));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 static void invalidate_current_state __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
384 static int syn_stack_equal __ARGS((synstate_T *sp));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385 static void validate_current_state __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
386 static int syn_finish_line __ARGS((int syncing));
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
387 static int syn_current_attr __ARGS((int syncing, int displaying, int *can_spell, int keep_state));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
388 static int did_match_already __ARGS((int idx, garray_T *gap));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
389 static stateitem_T *push_next_match __ARGS((stateitem_T *cur_si));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 static void check_state_ends __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 static void update_si_attr __ARGS((int idx));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
392 static void check_keepend __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
393 static void update_si_end __ARGS((stateitem_T *sip, int startcol, int force));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
394 static short *copy_id_list __ARGS((short *list));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
395 static int in_id_list __ARGS((stateitem_T *item, short *cont_list, struct sp_syn *ssp, int contained));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396 static int push_current_state __ARGS((int idx));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
397 static void pop_current_state __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
399 static void syn_stack_apply_changes_block __ARGS((synblock_T *block, buf_T *buf));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 static void find_endpos __ARGS((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));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
401 static void clear_syn_state __ARGS((synstate_T *p));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 static void clear_current_state __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 static void limit_pos __ARGS((lpos_T *pos, lpos_T *limit));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405 static void limit_pos_zero __ARGS((lpos_T *pos, lpos_T *limit));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 static void syn_add_end_off __ARGS((lpos_T *result, regmmatch_T *regmatch, synpat_T *spp, int idx, int extra));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 static void syn_add_start_off __ARGS((lpos_T *result, regmmatch_T *regmatch, synpat_T *spp, int idx, int extra));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408 static char_u *syn_getcurline __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 static int syn_regexec __ARGS((regmmatch_T *rmp, linenr_T lnum, colnr_T col));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
410 static int check_keyword_id __ARGS((char_u *line, int startcol, int *endcol, long *flags, short **next_list, stateitem_T *cur_si, int *ccharp));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
411 static void syn_cmd_case __ARGS((exarg_T *eap, int syncing));
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
412 static void syn_cmd_spell __ARGS((exarg_T *eap, int syncing));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413 static void syntax_sync_clear __ARGS((void));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
414 static void syn_remove_pattern __ARGS((synblock_T *block, int idx));
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
415 static void syn_clear_pattern __ARGS((synblock_T *block, int i));
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
416 static void syn_clear_cluster __ARGS((synblock_T *block, int i));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
417 static void syn_cmd_clear __ARGS((exarg_T *eap, int syncing));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
418 static void syn_cmd_conceal __ARGS((exarg_T *eap, int syncing));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
419 static void syn_clear_one __ARGS((int id, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420 static void syn_cmd_on __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 static void syn_cmd_enable __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 static void syn_cmd_reset __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 static void syn_cmd_manual __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 static void syn_cmd_off __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
425 static void syn_cmd_onoff __ARGS((exarg_T *eap, char *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
426 static void syn_cmd_list __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 static void syn_lines_msg __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 static void syn_match_msg __ARGS((void));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
429 static void syn_stack_free_block __ARGS((synblock_T *block));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 static void syn_list_one __ARGS((int id, int syncing, int link_only));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 static void syn_list_cluster __ARGS((int id));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432 static void put_id_list __ARGS((char_u *name, short *list, int attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 static void put_pattern __ARGS((char *s, int c, synpat_T *spp, int attr));
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
434 static int syn_list_keywords __ARGS((int id, hashtab_T *ht, int did_header, int attr));
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
435 static void syn_clear_keyword __ARGS((int id, hashtab_T *ht));
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
436 static void clear_keywtab __ARGS((hashtab_T *ht));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
437 static void add_keyword __ARGS((char_u *name, int id, int flags, short *cont_in_list, short *next_list, int conceal_char));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438 static char_u *get_group_name __ARGS((char_u *arg, char_u **name_end));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
439 static char_u *get_syn_options __ARGS((char_u *arg, syn_opt_arg_T *opt, int *conceal_char));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 static void syn_cmd_include __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
441 static void syn_cmd_keyword __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
442 static void syn_cmd_match __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
443 static void syn_cmd_region __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 #ifdef __BORLANDC__
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
445 static int _RTLENTRYF syn_compare_stub __ARGS((const void *v1, const void *v2));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
446 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
447 static int syn_compare_stub __ARGS((const void *v1, const void *v2));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
448 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 static void syn_cmd_cluster __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 static int syn_scl_name2id __ARGS((char_u *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 static int syn_scl_namen2id __ARGS((char_u *linep, int len));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 static int syn_check_cluster __ARGS((char_u *pp, int len));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 static int syn_add_cluster __ARGS((char_u *name));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 static void init_syn_patterns __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 static char_u *get_syn_pattern __ARGS((char_u *arg, synpat_T *ci));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 static void syn_cmd_sync __ARGS((exarg_T *eap, int syncing));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457 static int get_id_list __ARGS((char_u **arg, int keylen, short **list));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 static void syn_combine_list __ARGS((short **clstr1, short **clstr2, int list_op));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
459 static void syn_incl_toplevel __ARGS((int id, int *flagsp));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
462 * Start the syntax recognition for a line. This function is normally called
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 * from the screen updating, once for each displayed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
464 * The buffer is remembered in syn_buf, because get_syntax_attr() doesn't get
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 * it. Careful: curbuf and curwin are likely to point to another buffer and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
466 * window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
467 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
468 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
469 syntax_start(wp, lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
471 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
472 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
473 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
474 synstate_T *last_valid = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
475 synstate_T *last_min_valid = NULL;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
476 synstate_T *sp, *prev = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
477 linenr_T parsed_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478 linenr_T first_stored;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 int dist;
26
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
480 static int changedtick = 0; /* remember the last change ID */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481
2401
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
482 #ifdef FEAT_CONCEAL
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
483 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
484 #endif
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
485
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
486 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 * After switching buffers, invalidate current_state.
26
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
488 * Also do this when a change was made, the current state may be invalid
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
489 * then.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
491 if (syn_block != wp->w_s || changedtick != syn_buf->b_changedtick)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
494 syn_buf = wp->w_buffer;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
495 syn_block = wp->w_s;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 }
26
404aac550f35 updated for version 7.0017
vimboss
parents: 24
diff changeset
497 changedtick = syn_buf->b_changedtick;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
498 syn_win = wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 * Allocate syntax stack when needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
502 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 syn_stack_alloc();
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
504 if (syn_block->b_sst_array == NULL)
410
c60ba877860b updated for version 7.0107
vimboss
parents: 386
diff changeset
505 return; /* out of memory */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
506 syn_block->b_sst_lasttick = display_tick;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
508 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
509 * If the state of the end of the previous line is useful, store it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 if (VALID_STATE(&current_state)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 && current_lnum < lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513 && current_lnum < syn_buf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 if (!current_state_stored)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518 ++current_lnum;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
519 (void)store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
520 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
521
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 * If the current_lnum is now the same as "lnum", keep the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 * state (this happens very often!). Otherwise invalidate
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525 * current_state and figure it out below.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
526 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
527 if (current_lnum != lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
528 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
529 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 * Try to synchronize from a saved state in b_sst_array[].
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
535 * Only do this if lnum is not before and not to far beyond a saved state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
536 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
537 if (INVALID_STATE(&current_state) && syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539 /* 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
540 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
541 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
542 if (p->sst_lnum > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544 if (p->sst_lnum <= lnum && p->sst_change_lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
545 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 last_valid = p;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
547 if (p->sst_lnum >= lnum - syn_block->b_syn_sync_minlines)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 last_min_valid = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551 if (last_min_valid != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 load_current_state(last_min_valid);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
554
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 * If "lnum" is before or far beyond a line with a saved state, need to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
557 * re-synchronize.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559 if (INVALID_STATE(&current_state))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 syn_sync(wp, lnum, last_valid);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
562 first_stored = current_lnum + syn_block->b_syn_sync_minlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 first_stored = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 * Advance from the sync point or saved state until the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 * Save some entries for syncing with later on.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
571 if (syn_block->b_sst_len <= Rows)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
572 dist = 999999;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
573 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
574 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575 while (current_lnum < lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
577 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
579 ++current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 /* If we parsed at least "minlines" lines or started at a valid
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 * state, the current state is considered valid. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 if (current_lnum >= first_stored)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
584 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
585 /* Check if the saved state entry is for the current line and is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 * equal to the current state. If so, then validate all saved
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587 * states that depended on a change before the parsed line. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 if (prev == NULL)
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
589 prev = syn_stack_find_entry(current_lnum - 1);
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
590 if (prev == NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
591 sp = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
592 else
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
593 sp = prev;
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
594 while (sp != NULL && sp->sst_lnum < current_lnum)
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
595 sp = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 if (sp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
597 && sp->sst_lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
598 && syn_stack_equal(sp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
599 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
600 parsed_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
601 prev = sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 while (sp != NULL && sp->sst_change_lnum <= parsed_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
603 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
604 if (sp->sst_lnum <= lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
605 /* valid state before desired line, use this one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606 prev = sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
607 else if (sp->sst_change_lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608 /* past saved states depending on change, break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
609 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
610 sp->sst_change_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
611 sp = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613 load_current_state(prev);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
615 /* Store the state at this line when it's the first one, the line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
616 * where we start parsing, or some distance from the previously
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 * saved state. But only when parsed at least 'minlines'. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 else if (prev == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
619 || current_lnum == lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620 || current_lnum >= prev->sst_lnum + dist)
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
621 prev = store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
622 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 /* This can take a long time: break when CTRL-C pressed. The current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625 * state will be wrong then. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626 line_breakcheck();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
627 if (got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
628 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
629 current_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
630 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
631 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
633
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
634 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
636
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
638 * We cannot simply discard growarrays full of state_items or buf_states; we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
639 * have to manually release their extmatch pointers first.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
640 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
641 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 clear_syn_state(p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
643 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
644 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
645 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
646 garray_T *gap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
647
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
648 if (p->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
649 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
650 gap = &(p->sst_union.sst_ga);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 for (i = 0; i < gap->ga_len; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 unref_extmatch(SYN_STATE_P(gap)[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653 ga_clear(gap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
654 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
655 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
657 for (i = 0; i < p->sst_stacksize; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
658 unref_extmatch(p->sst_union.sst_stack[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
659 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
660 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
661
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
662 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
663 * Cleanup the current_state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
665 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
666 clear_current_state()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
667 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
669 stateitem_T *sip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
670
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
671 sip = (stateitem_T *)(current_state.ga_data);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
672 for (i = 0; i < current_state.ga_len; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
673 unref_extmatch(sip[i].si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 ga_clear(&current_state);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
675 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
676
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
677 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
678 * Try to find a synchronisation point for line "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
679 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
680 * This sets current_lnum and the current state. One of three methods is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
681 * used:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
682 * 1. Search backwards for the end of a C-comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
683 * 2. Search backwards for given sync patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
684 * 3. Simply start on a given number of lines above "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
685 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
686 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
687 syn_sync(wp, start_lnum, last_valid)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
688 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
689 linenr_T start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
690 synstate_T *last_valid;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
691 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
692 buf_T *curbuf_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
693 win_T *curwin_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
694 pos_T cursor_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
695 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
696 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
697 linenr_T end_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
698 linenr_T break_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
699 int had_sync_point;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
700 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
701 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
703 int found_flags = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
704 int found_match_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
705 linenr_T found_current_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
706 int found_current_col= 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
707 lpos_T found_m_endpos;
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
708 colnr_T prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
709
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
710 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
711 * Clear any current state that might be hanging around.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
712 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
713 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
714
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
715 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
716 * Start at least "minlines" back. Default starting point for parsing is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
717 * there.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
718 * Start further back, to avoid that scrolling backwards will result in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
719 * resyncing for every line. Now it resyncs only one out of N lines,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
720 * where N is minlines * 1.5, or minlines * 2 if minlines is small.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
721 * Watch out for overflow when minlines is MAXLNUM.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
722 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
723 if (syn_block->b_syn_sync_minlines > start_lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
724 start_lnum = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
725 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
726 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
727 if (syn_block->b_syn_sync_minlines == 1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
728 lnum = 1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
729 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
730 lnum = syn_block->b_syn_sync_minlines * 2;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
731 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
732 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
733 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
734 && lnum > syn_block->b_syn_sync_maxlines)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
735 lnum = syn_block->b_syn_sync_maxlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
736 if (lnum >= start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
737 start_lnum = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
738 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
739 start_lnum -= lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
740 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
741 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
742
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
743 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
744 * 1. Search backwards for the end of a C-style comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
746 if (syn_block->b_syn_sync_flags & SF_CCOMMENT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
747 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
748 /* Need to make syn_buf the current buffer for a moment, to be able to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
749 * use find_start_comment(). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
750 curwin_save = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
751 curwin = wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
752 curbuf_save = curbuf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
753 curbuf = syn_buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
754
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
755 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
756 * Skip lines that end in a backslash.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
757 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
758 for ( ; start_lnum > 1; --start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
759 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
760 line = ml_get(start_lnum - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
761 if (*line == NUL || *(line + STRLEN(line) - 1) != '\\')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
762 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
763 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
764 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
765
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
766 /* set cursor to start of search */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
767 cursor_save = wp->w_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
768 wp->w_cursor.lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
769 wp->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
770
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
771 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
772 * If the line is inside a comment, need to find the syntax item that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
773 * defines the comment.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
774 * Restrict the search for the end of a comment to b_syn_sync_maxlines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
775 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
776 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
777 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
778 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
779 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
780 == syn_block->b_syn_sync_id
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
781 && SYN_ITEMS(syn_block)[idx].sp_type == SPTYPE_START)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
782 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
783 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
784 if (push_current_state(idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
785 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
787 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
789
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
790 /* restore cursor and buffer */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
791 wp->w_cursor = cursor_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
792 curwin = curwin_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793 curbuf = curbuf_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
794 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
797 * 2. Search backwards for given sync patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
799 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
800 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
801 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
802 && 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
803 break_lnum = start_lnum - syn_block->b_syn_sync_maxlines;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
804 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
805 break_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
806
699
2af8de31a3a8 updated for version 7.0211
vimboss
parents: 697
diff changeset
807 found_m_endpos.lnum = 0;
2af8de31a3a8 updated for version 7.0211
vimboss
parents: 697
diff changeset
808 found_m_endpos.col = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
809 end_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
810 lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 while (--lnum > break_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
812 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
813 /* This can take a long time: break when CTRL-C pressed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
814 line_breakcheck();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815 if (got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
817 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
818 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
819 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
820 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
821
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
822 /* Check if we have run into a valid saved state stack now. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
823 if (last_valid != NULL && lnum == last_valid->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
825 load_current_state(last_valid);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
826 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
827 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
828
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
829 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830 * Check if the previous line has the line-continuation pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
832 if (lnum > 1 && syn_match_linecont(lnum - 1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
834
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
835 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
836 * Start with nothing on the state stack
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
838 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
839
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
840 for (current_lnum = lnum; current_lnum < end_lnum; ++current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
841 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
842 syn_start_line();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
843 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
844 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
845 had_sync_point = syn_finish_line(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
846 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847 * When a sync point has been found, remember where, and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
848 * continue to look for another one, further on in the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
850 if (had_sync_point && current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853 if (cur_si->si_m_endpos.lnum > start_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 /* ignore match that goes to after where started */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
856 current_lnum = end_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
857 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
858 }
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
859 if (cur_si->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
860 {
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
861 /* Cannot happen? */
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
862 found_flags = 0;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
863 found_match_idx = KEYWORD_IDX;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
864 }
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
865 else
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
866 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
867 spp = &(SYN_ITEMS(syn_block)[cur_si->si_idx]);
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
868 found_flags = spp->sp_flags;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
869 found_match_idx = spp->sp_sync_idx;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
870 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871 found_current_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
872 found_current_col = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
873 found_m_endpos = cur_si->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
874 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
875 * Continue after the match (be aware of a zero-length
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
876 * match).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
877 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
878 if (found_m_endpos.lnum > current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
879 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
880 current_lnum = found_m_endpos.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
881 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
882 if (current_lnum >= end_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
883 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
884 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
885 else if (found_m_endpos.col > current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
886 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
887 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
888 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
889
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 /* syn_current_attr() will have skipped the check for
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
891 * an item that ends here, need to do that now. Be
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
892 * careful not to go past the NUL. */
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
893 prev_current_col = current_col;
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
894 if (syn_getcurline()[current_col] != NUL)
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
895 ++current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
896 check_state_ends();
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
897 current_col = prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
901 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
903
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
904 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
905 * If a sync point was encountered, break here.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
906 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
907 if (found_flags)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
908 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
909 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
910 * Put the item that was specified by the sync point on the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 * state stack. If there was no item specified, make the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
912 * state stack empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914 clear_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915 if (found_match_idx >= 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
916 && push_current_state(found_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
918
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 * When using "grouphere", continue from the sync point
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
921 * match, until the end of the line. Parsing starts at
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922 * the next line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
923 * For "groupthere" the parsing starts at start_lnum.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
925 if (found_flags & HL_SYNC_HERE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
926 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
928 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
929 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
930 cur_si->si_h_startpos.lnum = found_current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
931 cur_si->si_h_startpos.col = found_current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
932 update_si_end(cur_si, (int)current_col, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
933 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
935 current_col = found_m_endpos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
936 current_lnum = found_m_endpos.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
937 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
938 ++current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
939 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
940 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 current_lnum = start_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
942
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
943 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
945
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
946 end_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
947 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
948 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
949
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
950 /* Ran into start of the file or exceeded maximum number of lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
951 if (lnum <= break_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 invalidate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954 current_lnum = break_lnum + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
955 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
956 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
960
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
961 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 * Return TRUE if the line-continuation pattern matches in line "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
963 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
964 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 syn_match_linecont(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 regmmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
969
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
970 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
971 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
972 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
973 regmatch.regprog = syn_block->b_syn_linecont_prog;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
974 return syn_regexec(&regmatch, lnum, (colnr_T)0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
975 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
976 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
977 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
978
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
979 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
980 * Prepare the current state for the start of a line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
981 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
982 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
983 syn_start_line()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
984 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
985 current_finished = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986 current_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
988 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
989 * Need to update the end of a start/skip/end that continues from the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
990 * previous line and regions that have "keepend".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
991 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 if (current_state.ga_len > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 syn_update_ends(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 ++current_line_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
997 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
998
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
999 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1000 * Check for items in the stack that need their end updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1001 * When "startofline" is TRUE the last item is always updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1002 * When "startofline" is FALSE the item with "keepend" is forcefully updated.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1003 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1004 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1005 syn_update_ends(startofline)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1006 int startofline;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1007 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1008 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1009 int i;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1010 int seen_keepend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1011
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1012 if (startofline)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1013 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1014 /* Check for a match carried over from a previous line with a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015 * contained region. The match ends as soon as the region ends. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 for (i = 0; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1017 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1018 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1019 if (cur_si->si_idx >= 0
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1020 && (SYN_ITEMS(syn_block)[cur_si->si_idx]).sp_type
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1021 == SPTYPE_MATCH
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1022 && cur_si->si_m_endpos.lnum < current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1024 cur_si->si_flags |= HL_MATCHCONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1025 cur_si->si_m_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1026 cur_si->si_m_endpos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1027 cur_si->si_h_endpos = cur_si->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1029 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1030 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1031 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1032
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1033 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1034 * Need to update the end of a start/skip/end that continues from the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1035 * previous line. And regions that have "keepend", because they may
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1036 * influence contained items. If we've just removed "extend"
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1037 * (startofline == 0) then we should update ends of normal regions
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1038 * contained inside "keepend" because "extend" could have extended
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1039 * these "keepend" regions as well as contained normal regions.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1040 * Then check for items ending in column 0.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 i = current_state.ga_len - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043 if (keepend_level >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1044 for ( ; i > keepend_level; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1045 if (CUR_STATE(i).si_flags & HL_EXTEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1046 break;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1047
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1048 seen_keepend = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1049 for ( ; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1050 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1052 if ((cur_si->si_flags & HL_KEEPEND)
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1053 || (seen_keepend && !startofline)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1054 || (i == current_state.ga_len - 1 && startofline))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1055 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1056 cur_si->si_h_startpos.col = 0; /* start highl. in col 0 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1057 cur_si->si_h_startpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1058
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1059 if (!(cur_si->si_flags & HL_MATCHCONT))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1060 update_si_end(cur_si, (int)current_col, !startofline);
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1061
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1062 if (!startofline && (cur_si->si_flags & HL_KEEPEND))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
1063 seen_keepend = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1064 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1065 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1066 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1067 check_state_ends();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1068 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1069
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1070 /****************************************
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1071 * Handling of the state stack cache.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1072 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1073
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1074 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1075 * EXPLANATION OF THE SYNTAX STATE STACK CACHE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1076 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1077 * To speed up syntax highlighting, the state stack for the start of some
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1078 * lines is cached. These entries can be used to start parsing at that point.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1079 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1080 * The stack is kept in b_sst_array[] for each buffer. There is a list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081 * valid entries. b_sst_first points to the first one, then follow sst_next.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1082 * The entries are sorted on line number. The first entry is often for line 2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1083 * (line 1 always starts with an empty stack).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1084 * There is also a list for free entries. This construction is used to avoid
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1085 * having to allocate and free memory blocks too often.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1086 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087 * When making changes to the buffer, this is logged in b_mod_*. When calling
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 * update_screen() to update the display, it will call
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1089 * syn_stack_apply_changes() for each displayed buffer to adjust the cached
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1090 * entries. The entries which are inside the changed area are removed,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1091 * because they must be recomputed. Entries below the changed have their line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1092 * number adjusted for deleted/inserted lines, and have their sst_change_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1093 * set to indicate that a check must be made if the changed lines would change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1094 * the cached entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1096 * When later displaying lines, an entry is stored for each line. Displayed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1097 * lines are likely to be displayed again, in which case the state at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1098 * start of the line is needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1099 * For not displayed lines, an entry is stored for every so many lines. These
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1100 * entries will be used e.g., when scrolling backwards. The distance between
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1101 * entries depends on the number of lines in the buffer. For small buffers
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1102 * the distance is fixed at SST_DIST, for large buffers there is a fixed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1103 * number of entries SST_MAX_ENTRIES, and the distance is computed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1104 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1105
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1106 static void
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1107 syn_stack_free_block(block)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1108 synblock_T *block;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1109 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1110 synstate_T *p;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1111
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1112 if (block->b_sst_array != NULL)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1113 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1114 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
1115 clear_syn_state(p);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1116 vim_free(block->b_sst_array);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1117 block->b_sst_array = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1118 block->b_sst_len = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1119 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1120 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1121 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1122 * Free b_sst_array[] for buffer "buf".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1123 * Used when syntax items changed to force resyncing everywhere.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1124 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1125 void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1126 syn_stack_free_all(block)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1127 synblock_T *block;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1128 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1129 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1130
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1131 syn_stack_free_block(block);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1132
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1133
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1134 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1135 /* When using "syntax" fold method, must update all folds. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1136 FOR_ALL_WINDOWS(wp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1137 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1138 if (wp->w_s == block && foldmethodIsSyntax(wp))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1139 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1140 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1141 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1142 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1143
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1144 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1145 * Allocate the syntax state stack for syn_buf when needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1146 * If the number of entries in b_sst_array[] is much too big or a bit too
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1147 * small, reallocate it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1148 * Also used to allocate b_sst_array[] for the first time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1149 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1150 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1151 syn_stack_alloc()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1152 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1153 long len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1154 synstate_T *to, *from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1155 synstate_T *sstp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1156
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1157 len = syn_buf->b_ml.ml_line_count / SST_DIST + Rows * 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158 if (len < SST_MIN_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 len = SST_MIN_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160 else if (len > SST_MAX_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161 len = SST_MAX_ENTRIES;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1162 if (syn_block->b_sst_len > len * 2 || syn_block->b_sst_len < len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1163 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1164 /* Allocate 50% too much, to avoid reallocating too often. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1165 len = syn_buf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1166 len = (len + len / 2) / SST_DIST + Rows * 2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1167 if (len < SST_MIN_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1168 len = SST_MIN_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1169 else if (len > SST_MAX_ENTRIES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1170 len = SST_MAX_ENTRIES;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1171
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1172 if (syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1173 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1174 /* When shrinking the array, cleanup the existing stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1175 * 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
1176 while (syn_block->b_sst_len - syn_block->b_sst_freecount + 2 > len
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1177 && syn_stack_cleanup())
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1178 ;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1179 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
1180 len = syn_block->b_sst_len - syn_block->b_sst_freecount + 2;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1181 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1182
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1183 sstp = (synstate_T *)alloc_clear((unsigned)(len * sizeof(synstate_T)));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 if (sstp == NULL) /* out of memory! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1187 to = sstp - 1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1188 if (syn_block->b_sst_array != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1189 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1190 /* 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
1191 for (from = syn_block->b_sst_first; from != NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1192 from = from->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1193 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1194 ++to;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1195 *to = *from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1196 to->sst_next = to + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1197 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1199 if (to != sstp - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1200 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1201 to->sst_next = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1202 syn_block->b_sst_first = sstp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1203 syn_block->b_sst_freecount = len - (int)(to - sstp) - 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1204 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1205 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1206 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1207 syn_block->b_sst_first = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1208 syn_block->b_sst_freecount = len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1209 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1210
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1211 /* Create the list of free entries. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1212 syn_block->b_sst_firstfree = to + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1213 while (++to < sstp + len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1214 to->sst_next = to + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1215 (sstp + len - 1)->sst_next = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1216
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1217 vim_free(syn_block->b_sst_array);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1218 syn_block->b_sst_array = sstp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1219 syn_block->b_sst_len = len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1220 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1221 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1223 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1224 * Check for changes in a buffer to affect stored syntax states. Uses the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225 * b_mod_* fields.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1226 * Called from update_screen(), before screen is being updated, once for each
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227 * displayed buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1228 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1229 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1230 syn_stack_apply_changes(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1231 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1232 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1233 win_T *wp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1234
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1235 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
1236
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1237 FOR_ALL_WINDOWS(wp)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1238 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1239 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
1240 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
1241 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1242 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1243
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1244 static void
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1245 syn_stack_apply_changes_block(block, buf)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1246 synblock_T *block;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1247 buf_T *buf;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1248 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1249 synstate_T *p, *prev, *np;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1250 linenr_T n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1251
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1252 if (block->b_sst_array == NULL) /* nothing to do */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1253 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1254
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1255 prev = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1256 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
1257 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1258 if (p->sst_lnum + block->b_syn_sync_linebreaks > buf->b_mod_top)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1259 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1260 n = p->sst_lnum + buf->b_mod_xlines;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1261 if (n <= buf->b_mod_bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1262 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1263 /* this state is inside the changed area, remove it */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1264 np = p->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1265 if (prev == NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1266 block->b_sst_first = np;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 prev->sst_next = np;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1269 syn_stack_free_entry(block, p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270 p = np;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273 /* This state is below the changed area. Remember the line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 * that needs to be parsed before this entry can be made valid
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1275 * again. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276 if (p->sst_change_lnum != 0 && p->sst_change_lnum > buf->b_mod_top)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278 if (p->sst_change_lnum + buf->b_mod_xlines > buf->b_mod_top)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1279 p->sst_change_lnum += buf->b_mod_xlines;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1280 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1281 p->sst_change_lnum = buf->b_mod_top;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1282 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283 if (p->sst_change_lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284 || p->sst_change_lnum < buf->b_mod_bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1285 p->sst_change_lnum = buf->b_mod_bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1286
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1287 p->sst_lnum = n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1288 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289 prev = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1290 p = p->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1292 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1294 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1295 * Reduce the number of entries in the state stack for syn_buf.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1296 * Returns TRUE if at least one entry was freed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1299 syn_stack_cleanup()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 synstate_T *p, *prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302 disptick_T tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 int above;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 int dist;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1305 int retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1306
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1307 if (syn_block->b_sst_array == NULL || syn_block->b_sst_first == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1308 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 /* 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
1311 if (syn_block->b_sst_len <= Rows)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
1312 dist = 999999;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
1313 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1314 dist = syn_buf->b_ml.ml_line_count / (syn_block->b_sst_len - Rows) + 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1316 /*
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
1317 * Go through the list to find the "tick" for the oldest entry that can
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 * be removed. Set "above" when the "tick" for the oldest entry is above
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319 * "b_sst_lasttick" (the display tick wraps around).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1321 tick = syn_block->b_sst_lasttick;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322 above = FALSE;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1323 prev = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1326 if (prev->sst_lnum + dist > p->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1327 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1328 if (p->sst_tick > syn_block->b_sst_lasttick)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 if (!above || p->sst_tick < tick)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331 tick = p->sst_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332 above = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1334 else if (!above && p->sst_tick < tick)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335 tick = p->sst_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1339 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1340 * Go through the list to make the entries for the oldest tick at an
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1341 * interval of several lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1342 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1343 prev = syn_block->b_sst_first;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1344 for (p = prev->sst_next; p != NULL; prev = p, p = p->sst_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 if (p->sst_tick == tick && prev->sst_lnum + dist > p->sst_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 /* Move this entry from used list to free list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 prev->sst_next = p->sst_next;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1350 syn_stack_free_entry(syn_block, p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 p = prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1355 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1356 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1357
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1358 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359 * Free the allocated memory for a syn_state item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1360 * Move the entry into the free list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1361 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 static void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1363 syn_stack_free_entry(block, p)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1364 synblock_T *block;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1365 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1366 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1367 clear_syn_state(p);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1368 p->sst_next = block->b_sst_firstfree;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1369 block->b_sst_firstfree = p;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1370 ++block->b_sst_freecount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 * Find an entry in the list of state stacks at or before "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1375 * Returns NULL when there is no entry or the first entry is after "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1376 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377 static synstate_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 syn_stack_find_entry(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1380 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 synstate_T *p, *prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1383 prev = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1384 for (p = syn_block->b_sst_first; p != NULL; prev = p, p = p->sst_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1385 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1386 if (p->sst_lnum == lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1387 return p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1388 if (p->sst_lnum > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1389 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1390 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1391 return prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1392 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1393
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1394 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1395 * Try saving the current state in b_sst_array[].
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1396 * The current state must be valid for the start of the current_lnum line!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1397 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1398 static synstate_T *
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
1399 store_current_state()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1400 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1401 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1402 synstate_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 stateitem_T *cur_si;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
1405 synstate_T *sp = syn_stack_find_entry(current_lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1408 * If the current state contains a start or end pattern that continues
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1409 * from the previous line, we can't use it. Don't store it then.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1410 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1411 for (i = current_state.ga_len - 1; i >= 0; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1412 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1413 cur_si = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1414 if (cur_si->si_h_startpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1415 || cur_si->si_m_endpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1416 || cur_si->si_h_endpos.lnum >= current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1417 || (cur_si->si_end_idx
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1418 && cur_si->si_eoe_pos.lnum >= current_lnum))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1419 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1420 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1421 if (i >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423 if (sp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1425 /* 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
1426 if (syn_block->b_sst_first == sp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427 /* it's the first entry */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1428 syn_block->b_sst_first = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1430 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1431 /* 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
1432 for (p = syn_block->b_sst_first; p != NULL; p = p->sst_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1433 if (p->sst_next == sp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1434 break;
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 838
diff changeset
1435 if (p != NULL) /* just in case */
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 838
diff changeset
1436 p->sst_next = sp->sst_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1438 syn_stack_free_entry(syn_block, sp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 sp = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1441 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 else if (sp == NULL || sp->sst_lnum != current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1445 * Add a new entry
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447 /* 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
1448 if (syn_block->b_sst_freecount == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1450 (void)syn_stack_cleanup();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1451 /* "sp" may have been moved to the freelist now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452 sp = syn_stack_find_entry(current_lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 /* 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
1455 if (syn_block->b_sst_freecount == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1456 sp = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1457 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1458 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1459 /* Take the first item from the free list and put it in the used
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1460 * list, after *sp */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1461 p = syn_block->b_sst_firstfree;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1462 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
1463 --syn_block->b_sst_freecount;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464 if (sp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1465 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466 /* Insert in front of the list */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1467 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
1468 syn_block->b_sst_first = p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1470 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1471 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1472 /* insert in list after *sp */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1473 p->sst_next = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474 sp->sst_next = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1476 sp = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1477 sp->sst_stacksize = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1478 sp->sst_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1481 if (sp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 /* When overwriting an existing state stack, clear it first */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 clear_syn_state(sp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 sp->sst_stacksize = current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1486 if (current_state.ga_len > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488 /* Need to clear it, might be something remaining from when the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1489 * length was less than SST_FIX_STATES. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 ga_init2(&sp->sst_union.sst_ga, (int)sizeof(bufstate_T), 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1491 if (ga_grow(&sp->sst_union.sst_ga, current_state.ga_len) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1492 sp->sst_stacksize = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1493 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 sp->sst_union.sst_ga.ga_len = current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495 bp = SYN_STATE_P(&(sp->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1498 bp = sp->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1499 for (i = 0; i < sp->sst_stacksize; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1501 bp[i].bs_idx = CUR_STATE(i).si_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 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
1503 #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
1504 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
1505 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
1506 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507 bp[i].bs_extmatch = ref_extmatch(CUR_STATE(i).si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1508 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 sp->sst_next_flags = current_next_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1510 sp->sst_next_list = current_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1511 sp->sst_tick = display_tick;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1512 sp->sst_change_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1513 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 current_state_stored = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1515 return sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1516 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1517
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1519 * Copy a state stack from "from" in b_sst_array[] to current_state;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1520 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1521 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1522 load_current_state(from)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1523 synstate_T *from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1524 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1525 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1526 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1527
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1528 clear_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1529 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1530 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1531 if (from->sst_stacksize
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1532 && ga_grow(&current_state, from->sst_stacksize) != FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1533 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534 if (from->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 bp = SYN_STATE_P(&(from->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1536 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1537 bp = from->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1538 for (i = 0; i < from->sst_stacksize; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1539 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1540 CUR_STATE(i).si_idx = bp[i].bs_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541 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
1542 #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
1543 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
1544 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
1545 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1546 CUR_STATE(i).si_extmatch = ref_extmatch(bp[i].bs_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1547 if (keepend_level < 0 && (CUR_STATE(i).si_flags & HL_KEEPEND))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1548 keepend_level = i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1549 CUR_STATE(i).si_ends = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1550 CUR_STATE(i).si_m_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1551 if (CUR_STATE(i).si_idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1552 CUR_STATE(i).si_next_list =
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1553 (SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_next_list;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1554 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1555 CUR_STATE(i).si_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1556 update_si_attr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558 current_state.ga_len = from->sst_stacksize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1559 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1560 current_next_list = from->sst_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1561 current_next_flags = from->sst_next_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1562 current_lnum = from->sst_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1563 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1565 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1566 * Compare saved state stack "*sp" with the current state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1567 * Return TRUE when they are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1568 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1570 syn_stack_equal(sp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1571 synstate_T *sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573 int i, j;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 bufstate_T *bp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575 reg_extmatch_T *six, *bsx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1577 /* First a quick check if the stacks have the same size end nextlist. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1578 if (sp->sst_stacksize == current_state.ga_len
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1579 && sp->sst_next_list == current_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1580 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1581 /* Need to compare all states on both stacks. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1582 if (sp->sst_stacksize > SST_FIX_STATES)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1583 bp = SYN_STATE_P(&(sp->sst_union.sst_ga));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1584 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585 bp = sp->sst_union.sst_stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1587 for (i = current_state.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589 /* If the item has another index the state is different. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1590 if (bp[i].bs_idx != CUR_STATE(i).si_idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1591 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 if (bp[i].bs_extmatch != CUR_STATE(i).si_extmatch)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594 /* When the extmatch pointers are different, the strings in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 * them can still be the same. Check if the extmatch
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596 * references are equal. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 bsx = bp[i].bs_extmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 six = CUR_STATE(i).si_extmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1599 /* If one of the extmatch pointers is NULL the states are
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 * different. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601 if (bsx == NULL || six == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1603 for (j = 0; j < NSUBEXP; ++j)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 /* Check each referenced match string. They must all be
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 * equal. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1607 if (bsx->matches[j] != six->matches[j])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1608 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1609 /* If the pointer is different it can still be the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 * same text. Compare the strings, ignore case when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1611 * the start item has the sp_ic flag set. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1612 if (bsx->matches[j] == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 || six->matches[j] == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1614 break;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1615 if ((SYN_ITEMS(syn_block)[CUR_STATE(i).si_idx]).sp_ic
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1616 ? MB_STRICMP(bsx->matches[j],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1617 six->matches[j]) != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 : STRCMP(bsx->matches[j], six->matches[j]) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1619 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1621 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1622 if (j != NSUBEXP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633 * We stop parsing syntax above line "lnum". If the stored state at or below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 * this line depended on a change before it, it now depends on the line below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635 * the last parsed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 * The window looks like this:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1637 * line which changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638 * displayed line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 * displayed line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 * lnum -> line below window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1642 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1643 syntax_end_parsing(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1646 synstate_T *sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1647
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1648 sp = syn_stack_find_entry(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1649 if (sp != NULL && sp->sst_lnum < lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1650 sp = sp->sst_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 if (sp != NULL && sp->sst_change_lnum != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653 sp->sst_change_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 * End of handling of the state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 ****************************************/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661 invalidate_current_state()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1662 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1663 clear_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 current_state.ga_itemsize = 0; /* mark current_state invalid */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1665 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1669 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1670 validate_current_state()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1671 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1672 current_state.ga_itemsize = sizeof(stateitem_T);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1673 current_state.ga_growsize = 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1675
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677 * Return TRUE if the syntax at start of lnum changed since last time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1678 * This will only be called just after get_syntax_attr() for the previous
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1679 * line, to check if the next line needs to be redrawn too.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1682 syntax_check_changed(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1683 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1684 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1685 int retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686 synstate_T *sp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1687
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1688 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 * Check the state stack when:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 * - lnum is just below the previously syntaxed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 * - lnum is not before the lines with saved states.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692 * - lnum is not past the lines with saved states.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 * - lnum is at or before the last changed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 if (VALID_STATE(&current_state) && lnum == current_lnum + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1696 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1697 sp = syn_stack_find_entry(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 if (sp != NULL && sp->sst_lnum == lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701 * finish the previous line (needed when not all of the line was
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1702 * drawn)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1703 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1704 (void)syn_finish_line(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1705
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1706 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1707 * Compare the current state with the previously saved state of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1708 * the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1709 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1710 if (syn_stack_equal(sp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1711 retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1712
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1713 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1714 * Store the current state in b_sst_array[] for later use.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1715 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1716 ++current_lnum;
1512
aa7c51f81f46 updated for version 7.1-227
vimboss
parents: 1504
diff changeset
1717 (void)store_current_state();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1718 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1719 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1720
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1721 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1722 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1723
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1724 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1725 * Finish the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1726 * This doesn't return any attributes, it only gets the state at the end of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1727 * the line. It can start anywhere in the line, as long as the current state
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1728 * is valid.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1729 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1730 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1731 syn_finish_line(syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1732 int syncing; /* called for syncing */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1733 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1734 stateitem_T *cur_si;
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1735 colnr_T prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1736
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1737 if (!current_finished)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1738 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1739 while (!current_finished)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1740 {
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1741 (void)syn_current_attr(syncing, FALSE, NULL, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1742 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1743 * When syncing, and found some item, need to check the item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1744 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1745 if (syncing && current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1746 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1747 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1748 * Check for match with sync item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1749 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1750 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1751 if (cur_si->si_idx >= 0
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1752 && (SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1753 & (HL_SYNC_HERE|HL_SYNC_THERE)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1754 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756 /* syn_current_attr() will have skipped the check for an item
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1757 * that ends here, need to do that now. Be careful not to go
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1758 * past the NUL. */
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1759 prev_current_col = current_col;
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1760 if (syn_getcurline()[current_col] != NUL)
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1761 ++current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 check_state_ends();
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
1763 current_col = prev_current_col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1764 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1765 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1766 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1767 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1768 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1769 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1772 * Return highlight attributes for next character.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 * Must first call syntax_start() once for the line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 * "col" is normally 0 for the first use in a line, and increments by one each
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1775 * time. It's allowed to skip characters and to stop before the end of the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1776 * line. But only a "col" after a previously used column is allowed.
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1777 * When "can_spell" is not NULL set it to TRUE when spell-checking should be
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1778 * done.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1779 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1780 int
2375
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
1781 get_syntax_attr(col, can_spell, keep_state)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1782 colnr_T col;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1783 int *can_spell;
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1784 int keep_state; /* keep state of char at "col" */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1785 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1786 int attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1787
1363
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1788 if (can_spell != NULL)
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1789 /* Default: Only do spelling when there is no @Spell cluster or when
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1790 * ":syn spell toplevel" was used. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1791 *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
1792 ? (syn_block->b_spell_cluster_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1793 : (syn_block->b_syn_spell == SYNSPL_TOP);
1363
3328b87305ef updated for version 7.1-077
vimboss
parents: 1326
diff changeset
1794
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1795 /* check for out of memory situation */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1796 if (syn_block->b_sst_array == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1799 /* After 'synmaxcol' the attribute is always zero. */
431
8b77f61b399b updated for version 7.0111
vimboss
parents: 419
diff changeset
1800 if (syn_buf->b_p_smc > 0 && col >= (colnr_T)syn_buf->b_p_smc)
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1801 {
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1802 clear_current_state();
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1803 #ifdef FEAT_EVAL
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1804 current_id = 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1805 current_trans_id = 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1806 #endif
2401
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
1807 #ifdef FEAT_CONCEAL
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
1808 current_flags = 0;
e7751177126b Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
Bram Moolenaar <bram@vim.org>
parents: 2392
diff changeset
1809 #endif
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1810 return 0;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1811 }
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
1812
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1813 /* Make sure current_state is valid */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 if (INVALID_STATE(&current_state))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 validate_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1818 * Skip from the current column to "col", get the attributes for "col".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1819 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1820 while (current_col <= col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1821 {
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1822 attr = syn_current_attr(FALSE, TRUE, can_spell,
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1823 current_col == col ? keep_state : FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1824 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1825 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1826
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1827 return attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1828 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1829
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1830 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1831 * Get syntax attributes for current_lnum, current_col.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1832 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1833 static int
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1834 syn_current_attr(syncing, displaying, can_spell, keep_state)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1835 int syncing; /* When 1: called for syncing */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1836 int displaying; /* result will be displayed */
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1837 int *can_spell; /* return: do spell checking */
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
1838 int keep_state; /* keep syntax stack afterwards */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1839 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1840 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1841 lpos_T endpos; /* was: char_u *endp; */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1842 lpos_T hl_startpos; /* was: int hl_startcol; */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1843 lpos_T hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1844 lpos_T eos_pos; /* end-of-start match (start region) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1845 lpos_T eoe_pos; /* end-of-end pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1846 int end_idx; /* group ID for end pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1847 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1848 synpat_T *spp;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
1849 stateitem_T *cur_si, *sip = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1850 int startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1851 int endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1852 long flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1853 int cchar;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1854 short *next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1855 int found_match; /* found usable match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1856 static int try_next_column = FALSE; /* must try in next col */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1857 int do_keywords;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1858 regmmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1859 lpos_T pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1860 int lc_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1861 reg_extmatch_T *cur_extmatch = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1862 char_u *line; /* current line. NOTE: becomes invalid after
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1863 looking for a pattern match! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1864
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1865 /* variables for zero-width matches that have a "nextgroup" argument */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1866 int keep_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1867 int zero_width_next_list = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1868 garray_T zero_width_next_ga;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1869
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1870 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1871 * No character, no attributes! Past end of line?
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1872 * Do try matching with an empty line (could be the start of a region).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1873 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1874 line = syn_getcurline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1875 if (line[current_col] == NUL && current_col != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1876 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1877 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 * If we found a match after the last column, use it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1879 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1880 if (next_match_idx >= 0 && next_match_col >= (int)current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1881 && next_match_col != MAXCOL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1882 (void)push_next_match(NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1883
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1884 current_finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1885 current_state_stored = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1886 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1887 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1888
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 /* if the current or next character is NUL, we will finish the line now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1890 if (line[current_col] == NUL || line[current_col + 1] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1891 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1892 current_finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1893 current_state_stored = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1894 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1895
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1897 * When in the previous column there was a match but it could not be used
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1898 * (empty match or already matched in this column) need to try again in
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1899 * the next column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1900 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1901 if (try_next_column)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1902 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1903 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1904 try_next_column = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1905 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1906
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1907 /* Only check for keywords when not syncing and there are some. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1908 do_keywords = !syncing
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1909 && (syn_block->b_keywtab.ht_used > 0
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1910 || syn_block->b_keywtab_ic.ht_used > 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1911
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1912 /* Init the list of zero-width matches with a nextlist. This is used to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1913 * avoid matching the same item in the same position twice. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1914 ga_init2(&zero_width_next_ga, (int)sizeof(int), 10);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1915
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1916 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1917 * Repeat matching keywords and patterns, to find contained items at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1918 * same column. This stops when there are no extra matches at the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1919 * column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1920 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1921 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1922 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1923 found_match = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1924 keep_next_list = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1925 syn_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1926
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1927 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1928 * 1. Check for a current state.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1929 * Only when there is no current state, or if the current state may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1930 * contain other things, we need to check for keywords and patterns.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1931 * Always need to check for contained items if some item has the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1932 * "containedin" argument (takes extra time!).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1933 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1934 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1935 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1936 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1937 cur_si = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1938
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1939 if (syn_block->b_syn_containedin || cur_si == NULL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1940 || cur_si->si_cont_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1941 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1942 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1943 * 2. Check for keywords, if on a keyword char after a non-keyword
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1944 * char. Don't do this when syncing.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1945 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1946 if (do_keywords)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1947 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1948 line = syn_getcurline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1949 if (vim_iswordc_buf(line + current_col, syn_buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1950 && (current_col == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1951 || !vim_iswordc_buf(line + current_col - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1952 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1953 - (has_mbyte
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1954 ? (*mb_head_off)(line, line + current_col - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1955 : 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1956 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1957 , syn_buf)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1958 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1959 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
1960 &endcol, &flags, &next_list, cur_si,
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1961 &cchar);
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
1962 if (syn_id != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1963 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1964 if (push_current_state(KEYWORD_IDX) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1965 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1966 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1967 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1968 cur_si->si_h_startpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1969 cur_si->si_h_startpos.col = 0; /* starts right away */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1970 cur_si->si_m_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1971 cur_si->si_m_endpos.col = endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1972 cur_si->si_h_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1973 cur_si->si_h_endpos.col = endcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1974 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1975 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1976 cur_si->si_flags = flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1977 #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
1978 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
1979 cur_si->si_cchar = cchar;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1980 if (current_state.ga_len > 1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1981 cur_si->si_flags |=
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1982 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
1983 & HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
1984 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1985 cur_si->si_id = syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1986 cur_si->si_trans_id = syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1987 if (flags & HL_TRANSP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1988 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1989 if (current_state.ga_len < 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1990 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1991 cur_si->si_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1992 cur_si->si_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1993 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1994 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1995 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1996 cur_si->si_attr = CUR_STATE(
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1997 current_state.ga_len - 2).si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1998 cur_si->si_trans_id = CUR_STATE(
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1999 current_state.ga_len - 2).si_trans_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2000 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2001 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2002 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2003 cur_si->si_attr = syn_id2attr(syn_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2004 cur_si->si_cont_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2005 cur_si->si_next_list = next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2006 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2007 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2008 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2009 vim_free(next_list);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2010 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2011 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2012 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2013
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2014 /*
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
2015 * 3. Check for patterns (only if no keyword found).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2016 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2017 if (syn_id == 0 && syn_block->b_syn_patterns.ga_len)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2018 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2019 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2020 * If we didn't check for a match yet, or we are past it, check
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2021 * for any match with a pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2022 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2023 if (next_match_idx < 0 || next_match_col < (int)current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2024 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2025 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2026 * Check all relevant patterns for a match at this
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2027 * position. This is complicated, because matching with a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2028 * pattern takes quite a bit of time, thus we want to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2029 * avoid doing it when it's not needed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2030 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2031 next_match_idx = 0; /* no match in this line yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2032 next_match_col = MAXCOL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2033 for (idx = syn_block->b_syn_patterns.ga_len; --idx >= 0; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2034 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2035 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2036 if ( spp->sp_syncing == syncing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2037 && (displaying || !(spp->sp_flags & HL_DISPLAY))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2038 && (spp->sp_type == SPTYPE_MATCH
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2039 || spp->sp_type == SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2040 && (current_next_list != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2041 ? in_id_list(NULL, current_next_list,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2042 &spp->sp_syn, 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2043 : (cur_si == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2044 ? !(spp->sp_flags & HL_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2045 : in_id_list(cur_si,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2046 cur_si->si_cont_list, &spp->sp_syn,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2047 spp->sp_flags & HL_CONTAINED))))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2048 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2049 /* If we already tried matching in this line, and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2050 * there isn't a match before next_match_col, skip
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2051 * this item. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2052 if (spp->sp_line_id == current_line_id
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2053 && spp->sp_startcol >= next_match_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2054 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2055 spp->sp_line_id = current_line_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2056
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2057 lc_col = current_col - spp->sp_offsets[SPO_LC_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2058 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2059 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2060
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2061 regmatch.rmm_ic = spp->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2062 regmatch.regprog = spp->sp_prog;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2063 if (!syn_regexec(&regmatch, current_lnum,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2064 (colnr_T)lc_col))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2065 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2066 /* no match in this line, try another one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2067 spp->sp_startcol = MAXCOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2068 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2069 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2070
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2071 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2072 * Compute the first column of the match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2073 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2074 syn_add_start_off(&pos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2075 spp, SPO_MS_OFF, -1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2076 if (pos.lnum > current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2077 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2078 /* must have used end of match in a next line,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2079 * we can't handle that */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2080 spp->sp_startcol = MAXCOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2081 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2082 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2083 startcol = pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2084
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2085 /* remember the next column where this pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2086 * matches in the current line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2087 spp->sp_startcol = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2088
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2089 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2090 * If a previously found match starts at a lower
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2091 * column number, don't use this one.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2092 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2093 if (startcol >= next_match_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2095
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2096 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2097 * If we matched this pattern at this position
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2098 * before, skip it. Must retry in the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2099 * column, because it may match from there.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2100 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2101 if (did_match_already(idx, &zero_width_next_ga))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2102 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2103 try_next_column = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2104 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2105 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2106
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2107 endpos.lnum = regmatch.endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2108 endpos.col = regmatch.endpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2109
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2110 /* Compute the highlight start. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2111 syn_add_start_off(&hl_startpos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2112 spp, SPO_HS_OFF, -1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2113
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2114 /* Compute the region start. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2115 /* Default is to use the end of the match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2116 syn_add_end_off(&eos_pos, &regmatch,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2117 spp, SPO_RS_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2119 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2120 * Grab the external submatches before they get
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2121 * overwritten. Reference count doesn't change.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2122 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2123 unref_extmatch(cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2124 cur_extmatch = re_extmatch_out;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2125 re_extmatch_out = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2126
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2127 flags = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2128 eoe_pos.lnum = 0; /* avoid warning */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129 eoe_pos.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131 hl_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2133 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 * For a "oneline" the end must be found in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 * same line too. Search for it after the end of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 * the match with the start pattern. Set the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137 * resulting end positions at the same time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2138 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2139 if (spp->sp_type == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2140 && (spp->sp_flags & HL_ONELINE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2141 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2142 lpos_T startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2143
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2144 startpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2145 find_endpos(idx, &startpos, &endpos, &hl_endpos,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2146 &flags, &eoe_pos, &end_idx, cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2147 if (endpos.lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2148 continue; /* not found */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2149 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2151 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2152 * For a "match" the size must be > 0 after the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2153 * end offset needs has been added. Except when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2154 * syncing.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2155 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2156 else if (spp->sp_type == SPTYPE_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158 syn_add_end_off(&hl_endpos, &regmatch, spp,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 SPO_HE_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2160 syn_add_end_off(&endpos, &regmatch, spp,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2161 SPO_ME_OFF, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2162 if (endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2163 && (int)endpos.col + syncing < startcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2165 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2166 * If an empty string is matched, may need
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2167 * to try matching again at next column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2168 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169 if (regmatch.startpos[0].col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 == regmatch.endpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 try_next_column = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2174 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2175
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2177 * keep the best match so far in next_match_*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179 /* Highlighting must start after startpos and end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 * before endpos. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2181 if (hl_startpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 && (int)hl_startpos.col < startcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2183 hl_startpos.col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2184 limit_pos_zero(&hl_endpos, &endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2185
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2186 next_match_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2187 next_match_col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2188 next_match_m_endpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 next_match_h_endpos = hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 next_match_h_startpos = hl_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2191 next_match_flags = flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2192 next_match_eos_pos = eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2193 next_match_eoe_pos = eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2194 next_match_end_idx = end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2195 unref_extmatch(next_match_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2196 next_match_extmatch = cur_extmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2197 cur_extmatch = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2199 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2200 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2201
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2202 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2203 * If we found a match at the current column, use it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2204 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2205 if (next_match_idx >= 0 && next_match_col == (int)current_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2206 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2207 synpat_T *lspp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2208
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2209 /* When a zero-width item matched which has a nextgroup,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2210 * 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
2211 lspp = &(SYN_ITEMS(syn_block)[next_match_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2212 if (next_match_m_endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2213 && next_match_m_endpos.col == current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2214 && lspp->sp_next_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2215 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2216 current_next_list = lspp->sp_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2217 current_next_flags = lspp->sp_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2218 keep_next_list = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2219 zero_width_next_list = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2220
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2221 /* Add the index to a list, so that we can check
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2222 * later that we don't match it again (and cause an
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2223 * endless loop). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2224 if (ga_grow(&zero_width_next_ga, 1) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2225 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2226 ((int *)(zero_width_next_ga.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2227 [zero_width_next_ga.ga_len++] = next_match_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2228 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2229 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2230 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2231 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2232 cur_si = push_next_match(cur_si);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2233 found_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2234 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2235 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2236 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2237
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2238 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2239 * Handle searching for nextgroup match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2240 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2241 if (current_next_list != NULL && !keep_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2242 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2243 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2244 * If a nextgroup was not found, continue looking for one if:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2245 * - this is an empty line and the "skipempty" option was given
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2246 * - we are on white space and the "skipwhite" option was given
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2247 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2248 if (!found_match)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2249 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2250 line = syn_getcurline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2251 if (((current_next_flags & HL_SKIPWHITE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2252 && vim_iswhite(line[current_col]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2253 || ((current_next_flags & HL_SKIPEMPTY)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2254 && *line == NUL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2255 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2256 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2257
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2258 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2259 * If a nextgroup was found: Use it, and continue looking for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2260 * contained matches.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2261 * If a nextgroup was not found: Continue looking for a normal
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2262 * match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2263 * When did set current_next_list for a zero-width item and no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2264 * match was found don't loop (would get stuck).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2265 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2266 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2267 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2268 if (!zero_width_next_list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2269 found_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2270 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2271
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2272 } while (found_match);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2273
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2274 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2275 * Use attributes from the current state, if within its highlighting.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2276 * If not, use attributes from the current-but-one state, etc.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2277 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2278 current_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2279 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2280 current_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2281 current_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2282 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2283 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2284 current_flags = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2285 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2286 if (cur_si != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2287 {
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2288 #ifndef FEAT_EVAL
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2289 int current_trans_id = 0;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2290 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2291 for (idx = current_state.ga_len - 1; idx >= 0; --idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2292 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2293 sip = &CUR_STATE(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2294 if ((current_lnum > sip->si_h_startpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2295 || (current_lnum == sip->si_h_startpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2296 && current_col >= sip->si_h_startpos.col))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2297 && (sip->si_h_endpos.lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2298 || current_lnum < sip->si_h_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2299 || (current_lnum == sip->si_h_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2300 && current_col < sip->si_h_endpos.col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2301 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2302 current_attr = sip->si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2303 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2304 current_id = sip->si_id;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2305 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2306 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
2307 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2308 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
2309 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
2310 current_sub_char = sip->si_cchar;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2311 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2312 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2313 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2314 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2315
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2316 if (can_spell != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2317 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2318 struct sp_syn sps;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2319
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2320 /*
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2321 * set "can_spell" to TRUE if spell checking is supposed to be
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2322 * done in the current item.
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2323 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2324 if (syn_block->b_spell_cluster_id == 0)
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2325 {
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2326 /* There is no @Spell cluster: Do spelling for items without
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2327 * @NoSpell cluster. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2328 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
2329 || current_trans_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2330 *can_spell = (syn_block->b_syn_spell != SYNSPL_NOTOP);
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2331 else
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2332 {
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2333 sps.inc_tag = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2334 sps.id = syn_block->b_nospell_cluster_id;
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2335 sps.cont_in_list = NULL;
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2336 *can_spell = !in_id_list(sip, sip->si_cont_list, &sps, 0);
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2337 }
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
2338 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2339 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2340 {
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2341 /* The @Spell cluster is defined: Do spelling in items with
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
2342 * the @Spell cluster. But not when @NoSpell is also there.
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
2343 * At the toplevel only spell check when ":syn spell toplevel"
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
2344 * was used. */
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2345 if (current_trans_id == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2346 *can_spell = (syn_block->b_syn_spell == SYNSPL_TOP);
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2347 else
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2348 {
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2349 sps.inc_tag = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2350 sps.id = syn_block->b_spell_cluster_id;
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2351 sps.cont_in_list = NULL;
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2352 *can_spell = in_id_list(sip, sip->si_cont_list, &sps, 0);
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2353
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2354 if (syn_block->b_nospell_cluster_id != 0)
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2355 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2356 sps.id = syn_block->b_nospell_cluster_id;
320
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2357 if (in_id_list(sip, sip->si_cont_list, &sps, 0))
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2358 *can_spell = FALSE;
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2359 }
bb9041b0ad81 updated for version 7.0083
vimboss
parents: 308
diff changeset
2360 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2361 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2362 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2363
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2364
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2365 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2366 * Check for end of current state (and the states before it) at the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2367 * next column. Don't do this for syncing, because we would miss a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2368 * single character match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2369 * First check if the current state ends at the current column. It
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2370 * may be for an empty match and a containing item might end in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2371 * current column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2372 */
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
2373 if (!syncing && !keep_state)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2374 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2375 check_state_ends();
442
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
2376 if (current_state.ga_len > 0
c36697964844 updated for version 7.0115
vimboss
parents: 431
diff changeset
2377 && syn_getcurline()[current_col] != NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2378 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2379 ++current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2380 check_state_ends();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2381 --current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2382 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2383 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2384 }
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
2385 else if (can_spell != NULL)
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
2386 /* Default: Only do spelling when there is no @Spell cluster or when
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
2387 * ":syn spell toplevel" was used. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2388 *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
2389 ? (syn_block->b_spell_cluster_id == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2390 : (syn_block->b_syn_spell == SYNSPL_TOP);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2391
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
2392 /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2393 if (current_next_list != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2394 && syn_getcurline()[current_col + 1] == NUL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2395 && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2396 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2397
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2398 if (zero_width_next_ga.ga_len > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2399 ga_clear(&zero_width_next_ga);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2400
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2401 /* No longer need external matches. But keep next_match_extmatch. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2402 unref_extmatch(re_extmatch_out);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2403 re_extmatch_out = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2404 unref_extmatch(cur_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2405
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2406 return current_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2407 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2408
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2409
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2410 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2411 * Check if we already matched pattern "idx" at the current column.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2412 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2413 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2414 did_match_already(idx, gap)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2415 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2416 garray_T *gap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2417 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2418 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2419
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2420 for (i = current_state.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2421 if (CUR_STATE(i).si_m_startcol == (int)current_col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2422 && CUR_STATE(i).si_m_lnum == (int)current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2423 && CUR_STATE(i).si_idx == idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2424 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2425
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2426 /* Zero-width matches with a nextgroup argument are not put on the syntax
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2427 * stack, and can only be matched once anyway. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2428 for (i = gap->ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2429 if (((int *)(gap->ga_data))[i] == idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2430 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2431
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2432 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2433 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2434
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2435 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2436 * Push the next match onto the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2437 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2438 static stateitem_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439 push_next_match(cur_si)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2440 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2441 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2442 synpat_T *spp;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2443 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2444 int save_flags;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2445 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2446
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2447 spp = &(SYN_ITEMS(syn_block)[next_match_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2448
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2449 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2450 * Push the item in current_state stack;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2451 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2452 if (push_current_state(next_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2453 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2454 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2455 * If it's a start-skip-end type that crosses lines, figure out how
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2456 * much it continues in this line. Otherwise just fill in the length.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2457 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2458 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2459 cur_si->si_h_startpos = next_match_h_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2460 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2461 cur_si->si_m_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2462 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
2463 #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
2464 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
2465 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
2466 if (current_state.ga_len > 1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2467 cur_si->si_flags |=
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2468 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
2469 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2470 cur_si->si_next_list = spp->sp_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471 cur_si->si_extmatch = ref_extmatch(next_match_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2472 if (spp->sp_type == SPTYPE_START && !(spp->sp_flags & HL_ONELINE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2473 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2474 /* Try to find the end pattern in the current line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2475 update_si_end(cur_si, (int)(next_match_m_endpos.col), TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2476 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2477 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2478 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2479 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2480 cur_si->si_m_endpos = next_match_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2481 cur_si->si_h_endpos = next_match_h_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2482 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2483 cur_si->si_flags |= next_match_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2484 cur_si->si_eoe_pos = next_match_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2485 cur_si->si_end_idx = next_match_end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2486 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2487 if (keepend_level < 0 && (cur_si->si_flags & HL_KEEPEND))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2488 keepend_level = current_state.ga_len - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2489 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2490 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2491
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2492 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2493 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
2494 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2495 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2496 * If the start pattern has another highlight group, push another item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2497 * on the stack for the start pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2498 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2499 if ( spp->sp_type == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2500 && spp->sp_syn_match_id != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2501 && push_current_state(next_match_idx) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2502 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2503 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2504 cur_si->si_h_startpos = next_match_h_startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2505 cur_si->si_m_startcol = current_col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2506 cur_si->si_m_lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2507 cur_si->si_m_endpos = next_match_eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2508 cur_si->si_h_endpos = next_match_eos_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2509 cur_si->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2510 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2511 cur_si->si_flags = HL_MATCH;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2512 #ifdef FEAT_CONCEAL
2418
da067045878f Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents: 2401
diff changeset
2513 cur_si->si_seqnr = next_seqnr++;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2514 cur_si->si_flags |= save_flags;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2515 if (cur_si->si_flags & HL_CONCEALENDS)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2516 cur_si->si_flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2517 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2518 cur_si->si_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2519 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2520 update_si_attr(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2521 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2522 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2523
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2524 next_match_idx = -1; /* try other match next time */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2525
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2526 return cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2527 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2528
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2529 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2530 * Check for end of current state (and the states before it).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2531 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2532 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2533 check_state_ends()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2534 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2535 stateitem_T *cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2536 int had_extend = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2537
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2538 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2539 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2540 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2541 if (cur_si->si_ends
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2542 && (cur_si->si_m_endpos.lnum < current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2543 || (cur_si->si_m_endpos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2544 && cur_si->si_m_endpos.col <= current_col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2545 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2546 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2547 * If there is an end pattern group ID, highlight the end pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2548 * now. No need to pop the current item from the stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2549 * Only do this if the end pattern continues beyond the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2550 * position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2551 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2552 if (cur_si->si_end_idx
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2553 && (cur_si->si_eoe_pos.lnum > current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2554 || (cur_si->si_eoe_pos.lnum == current_lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2555 && cur_si->si_eoe_pos.col > current_col)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2556 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2557 cur_si->si_idx = cur_si->si_end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2558 cur_si->si_end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2559 cur_si->si_m_endpos = cur_si->si_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2560 cur_si->si_h_endpos = cur_si->si_eoe_pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2561 cur_si->si_flags |= HL_MATCH;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2562 #ifdef FEAT_CONCEAL
2418
da067045878f Fix for "concealends". (Vince Negri)
Bram Moolenaar <bram@vim.org>
parents: 2401
diff changeset
2563 cur_si->si_seqnr = next_seqnr++;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2564 if (cur_si->si_flags & HL_CONCEALENDS)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2565 cur_si->si_flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2566 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2567 update_si_attr(current_state.ga_len - 1);
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2568
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2569 /* what matches next may be different now, clear it */
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2570 next_match_idx = 0;
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2571 next_match_col = MAXCOL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2572 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2573 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2574 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2575 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2576 /* handle next_list, unless at end of line and no "skipnl" or
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2577 * "skipempty" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2578 current_next_list = cur_si->si_next_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2579 current_next_flags = cur_si->si_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2580 if (!(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2581 && syn_getcurline()[current_col] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2582 current_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2583
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2584 /* When the ended item has "extend", another item with
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2585 * "keepend" now needs to check for its end. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2586 if (cur_si->si_flags & HL_EXTEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2587 had_extend = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2588
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2589 pop_current_state();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2590
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2591 if (current_state.ga_len == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2592 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2593
1503
995536cad50e updated for version 7.1-218
vimboss
parents: 1500
diff changeset
2594 if (had_extend && keepend_level >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2595 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2596 syn_update_ends(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2597 if (current_state.ga_len == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2598 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2599 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2600
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2601 cur_si = &CUR_STATE(current_state.ga_len - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2602
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2603 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2604 * Only for a region the search for the end continues after
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2605 * the end of the contained item. If the contained match
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2606 * included the end-of-line, break here, the region continues.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2607 * Don't do this when:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2608 * - "keepend" is used for the contained item
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2609 * - not at the end of the line (could be end="x$"me=e-1).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2610 * - "excludenl" is used (HL_HAS_EOL won't be set)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2611 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2612 if (cur_si->si_idx >= 0
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2613 && SYN_ITEMS(syn_block)[cur_si->si_idx].sp_type
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2614 == SPTYPE_START
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2615 && !(cur_si->si_flags & (HL_MATCH | HL_KEEPEND)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2616 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2617 update_si_end(cur_si, (int)current_col, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2618 check_keepend();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2619 if ((current_next_flags & HL_HAS_EOL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2620 && keepend_level < 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2621 && syn_getcurline()[current_col] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2622 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2623 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2624 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2625 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2626 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2627 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2628 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2629 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2630
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2631 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2632 * Update an entry in the current_state stack for a match or region. This
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2633 * fills in si_attr, si_next_list and si_cont_list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2634 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2635 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2636 update_si_attr(idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2637 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2638 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2639 stateitem_T *sip = &CUR_STATE(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2640 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2641
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2642 /* This should not happen... */
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2643 if (sip->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2644 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2645
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2646 spp = &(SYN_ITEMS(syn_block)[sip->si_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2647 if (sip->si_flags & HL_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2648 sip->si_id = spp->sp_syn_match_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2649 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2650 sip->si_id = spp->sp_syn.id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2651 sip->si_attr = syn_id2attr(sip->si_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2652 sip->si_trans_id = sip->si_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2653 if (sip->si_flags & HL_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2654 sip->si_cont_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2655 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2656 sip->si_cont_list = spp->sp_cont_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2657
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2658 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2659 * For transparent items, take attr from outer item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2660 * Also take cont_list, if there is none.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2661 * Don't do this for the matchgroup of a start or end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2662 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2663 if ((spp->sp_flags & HL_TRANSP) && !(sip->si_flags & HL_MATCH))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2664 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2665 if (idx == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2666 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2667 sip->si_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2668 sip->si_trans_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2669 if (sip->si_cont_list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2670 sip->si_cont_list = ID_LIST_ALL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2671 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2672 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2673 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2674 sip->si_attr = CUR_STATE(idx - 1).si_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2675 sip->si_trans_id = CUR_STATE(idx - 1).si_trans_id;
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2676 sip->si_h_startpos = CUR_STATE(idx - 1).si_h_startpos;
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
2677 sip->si_h_endpos = CUR_STATE(idx - 1).si_h_endpos;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2678 if (sip->si_cont_list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2679 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2680 sip->si_flags |= HL_TRANS_CONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2681 sip->si_cont_list = CUR_STATE(idx - 1).si_cont_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2682 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2683 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2684 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2685 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2686
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2687 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2688 * Check the current stack for patterns with "keepend" flag.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2689 * Propagate the match-end to contained items, until a "skipend" item is found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2690 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2691 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2692 check_keepend()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2693 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2694 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2695 lpos_T maxpos;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2696 lpos_T maxpos_h;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2697 stateitem_T *sip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2698
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2699 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2700 * This check can consume a lot of time; only do it from the level where
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2701 * there really is a keepend.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2702 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2703 if (keepend_level < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2704 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2705
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2706 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2707 * Find the last index of an "extend" item. "keepend" items before that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2708 * won't do anything. If there is no "extend" item "i" will be
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2709 * "keepend_level" and all "keepend" items will work normally.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2710 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2711 for (i = current_state.ga_len - 1; i > keepend_level; --i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2712 if (CUR_STATE(i).si_flags & HL_EXTEND)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2713 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2714
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2715 maxpos.lnum = 0;
1702
5232b9862f23 updated for version 7.2-000
vimboss
parents: 1697
diff changeset
2716 maxpos.col = 0;
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2717 maxpos_h.lnum = 0;
1702
5232b9862f23 updated for version 7.2-000
vimboss
parents: 1697
diff changeset
2718 maxpos_h.col = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2719 for ( ; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2720 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2721 sip = &CUR_STATE(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2722 if (maxpos.lnum != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2723 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2724 limit_pos_zero(&sip->si_m_endpos, &maxpos);
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2725 limit_pos_zero(&sip->si_h_endpos, &maxpos_h);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2726 limit_pos_zero(&sip->si_eoe_pos, &maxpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2727 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2728 }
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2729 if (sip->si_ends && (sip->si_flags & HL_KEEPEND))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2730 {
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2731 if (maxpos.lnum == 0
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2732 || maxpos.lnum > sip->si_m_endpos.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2733 || (maxpos.lnum == sip->si_m_endpos.lnum
991
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2734 && maxpos.col > sip->si_m_endpos.col))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2735 maxpos = sip->si_m_endpos;
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2736 if (maxpos_h.lnum == 0
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2737 || maxpos_h.lnum > sip->si_h_endpos.lnum
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2738 || (maxpos_h.lnum == sip->si_h_endpos.lnum
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2739 && maxpos_h.col > sip->si_h_endpos.col))
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2740 maxpos_h = sip->si_h_endpos;
ddafd2ba3a86 updated for version 7.0-117
vimboss
parents: 844
diff changeset
2741 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2742 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2743 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2744
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2745 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2746 * Update an entry in the current_state stack for a start-skip-end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2747 * This finds the end of the current item, if it's in the current line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2748 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2749 * Return the flags for the matched END.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2750 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2751 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2752 update_si_end(sip, startcol, force)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2753 stateitem_T *sip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2754 int startcol; /* where to start searching for the end */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2755 int force; /* when TRUE overrule a previous end */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2756 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2757 lpos_T startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2758 lpos_T endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2759 lpos_T hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2760 lpos_T end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2761 int end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2762
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2763 /* return quickly for a keyword */
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2764 if (sip->si_idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2765 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2766
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2767 /* Don't update when it's already done. Can be a match of an end pattern
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2768 * that started in a previous line. Watch out: can also be a "keepend"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2769 * from a containing item. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2770 if (!force && sip->si_m_endpos.lnum >= current_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2771 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2772
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2773 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2774 * We need to find the end of the region. It may continue in the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2775 * line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2776 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2777 end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2778 startpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2779 startpos.col = startcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2780 find_endpos(sip->si_idx, &startpos, &endpos, &hl_endpos,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2781 &(sip->si_flags), &end_endpos, &end_idx, sip->si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2782
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2783 if (endpos.lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2784 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2785 /* No end pattern matched. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2786 if (SYN_ITEMS(syn_block)[sip->si_idx].sp_flags & HL_ONELINE)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2787 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2788 /* a "oneline" never continues in the next line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2789 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2790 sip->si_m_endpos.lnum = current_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2791 sip->si_m_endpos.col = (colnr_T)STRLEN(syn_getcurline());
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2792 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2793 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2794 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2795 /* continues in the next line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2796 sip->si_ends = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2797 sip->si_m_endpos.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2798 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2799 sip->si_h_endpos = sip->si_m_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2800 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2801 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2802 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2803 /* match within this line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2804 sip->si_m_endpos = endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2805 sip->si_h_endpos = hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2806 sip->si_eoe_pos = end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2807 sip->si_ends = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2808 sip->si_end_idx = end_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2809 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2810 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2811
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2812 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2813 * Add a new state to the current state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2814 * It is cleared and the index set to "idx".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2815 * Return FAIL if it's not possible (out of memory).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2816 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2817 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2818 push_current_state(idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2819 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2820 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2821 if (ga_grow(&current_state, 1) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2822 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2823 vim_memset(&CUR_STATE(current_state.ga_len), 0, sizeof(stateitem_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2824 CUR_STATE(current_state.ga_len).si_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2825 ++current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2826 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2827 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2828
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2829 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2830 * Remove a state from the current_state stack.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2831 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2832 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2833 pop_current_state()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2834 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2835 if (current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2836 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2837 unref_extmatch(CUR_STATE(current_state.ga_len - 1).si_extmatch);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2838 --current_state.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2839 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2840 /* after the end of a pattern, try matching a keyword or pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2841 next_match_idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2842
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2843 /* if first state with "keepend" is popped, reset keepend_level */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2844 if (keepend_level >= current_state.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2845 keepend_level = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2846 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2847
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2848 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2849 * Find the end of a start/skip/end syntax region after "startpos".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2850 * Only checks one line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2851 * Also handles a match item that continued from a previous line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2852 * If not found, the syntax item continues in the next line. m_endpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2853 * will be 0.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2854 * If found, the end of the region and the end of the highlighting is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2855 * computed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2856 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2857 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2858 find_endpos(idx, startpos, m_endpos, hl_endpos, flagsp, end_endpos,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2859 end_idx, start_ext)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2860 int idx; /* index of the pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2861 lpos_T *startpos; /* where to start looking for an END match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2862 lpos_T *m_endpos; /* return: end of match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2863 lpos_T *hl_endpos; /* return: end of highlighting */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2864 long *flagsp; /* return: flags of matching END */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2865 lpos_T *end_endpos; /* return: end of end pattern match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2866 int *end_idx; /* return: group ID for end pat. match, or 0 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2867 reg_extmatch_T *start_ext; /* submatches from the start pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2868 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2869 colnr_T matchcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2870 synpat_T *spp, *spp_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2871 int start_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2872 int best_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2873 regmmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2874 regmmatch_T best_regmatch; /* startpos/endpos of best match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2875 lpos_T pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2876 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2877 int had_match = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2878
1371
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2879 /* just in case we are invoked for a keyword */
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2880 if (idx < 0)
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2881 return;
e8450dbf6f03 updated for version 7.1-086
vimboss
parents: 1363
diff changeset
2882
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2883 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2884 * Check for being called with a START pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2885 * Can happen with a match that continues to the next line, because it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2886 * contained a region.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2887 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2888 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2889 if (spp->sp_type != SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2890 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2891 *hl_endpos = *startpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2892 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2893 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2894
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2895 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2896 * Find the SKIP or first END pattern after the last START pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2897 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2898 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2899 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2900 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2901 if (spp->sp_type != SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2902 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2903 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2904 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2905
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2906 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2907 * Lookup the SKIP pattern (if present)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2908 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2909 if (spp->sp_type == SPTYPE_SKIP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2910 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2911 spp_skip = spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2912 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2913 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2914 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2915 spp_skip = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2917 /* Setup external matches for syn_regexec(). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2918 unref_extmatch(re_extmatch_in);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2919 re_extmatch_in = ref_extmatch(start_ext);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2920
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2921 matchcol = startpos->col; /* start looking for a match at sstart */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2922 start_idx = idx; /* remember the first END pattern. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2923 best_regmatch.startpos[0].col = 0; /* avoid compiler warning */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2924 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2925 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2926 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2927 * Find end pattern that matches first after "matchcol".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2928 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2929 best_idx = -1;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2930 for (idx = start_idx; idx < syn_block->b_syn_patterns.ga_len; ++idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2931 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2932 int lc_col = matchcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2933
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
2934 spp = &(SYN_ITEMS(syn_block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2935 if (spp->sp_type != SPTYPE_END) /* past last END pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2936 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2937 lc_col -= spp->sp_offsets[SPO_LC_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2938 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2939 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2940
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2941 regmatch.rmm_ic = spp->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2942 regmatch.regprog = spp->sp_prog;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2943 if (syn_regexec(&regmatch, startpos->lnum, lc_col))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2944 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2945 if (best_idx == -1 || regmatch.startpos[0].col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2946 < best_regmatch.startpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2947 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2948 best_idx = idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2949 best_regmatch.startpos[0] = regmatch.startpos[0];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2950 best_regmatch.endpos[0] = regmatch.endpos[0];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2951 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2953 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2954
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2955 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2956 * If all end patterns have been tried, and there is no match, the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2957 * item continues until end-of-line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2958 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2959 if (best_idx == -1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2960 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2961
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2962 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2963 * If the skip pattern matches before the end pattern,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2964 * continue searching after the skip pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2965 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2966 if (spp_skip != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2967 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2968 int lc_col = matchcol - spp_skip->sp_offsets[SPO_LC_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2969
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2970 if (lc_col < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2971 lc_col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2972 regmatch.rmm_ic = spp_skip->sp_ic;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2973 regmatch.regprog = spp_skip->sp_prog;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2974 if (syn_regexec(&regmatch, startpos->lnum, lc_col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2975 && regmatch.startpos[0].col
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2976 <= best_regmatch.startpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2977 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2978 /* Add offset to skip pattern match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2979 syn_add_end_off(&pos, &regmatch, spp_skip, SPO_ME_OFF, 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2980
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2981 /* If the skip pattern goes on to the next line, there is no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2982 * match with an end pattern in this line. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2983 if (pos.lnum > startpos->lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2984 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2985
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2986 line = ml_get_buf(syn_buf, startpos->lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2987
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2988 /* take care of an empty match or negative offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2989 if (pos.col <= matchcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2990 ++matchcol;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2991 else if (pos.col <= regmatch.endpos[0].col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2992 matchcol = pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2993 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2994 /* Be careful not to jump over the NUL at the end-of-line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2995 for (matchcol = regmatch.endpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2996 line[matchcol] != NUL && matchcol < pos.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2997 ++matchcol)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2998 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2999
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3000 /* if the skip pattern includes end-of-line, break here */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3001 if (line[matchcol] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3002 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3003
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3004 continue; /* start with first end pattern again */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3005 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3006 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3007
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3008 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3009 * Match from start pattern to end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3010 * Correct for match and highlight offset of end pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3011 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3012 spp = &(SYN_ITEMS(syn_block)[best_idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3013 syn_add_end_off(m_endpos, &best_regmatch, spp, SPO_ME_OFF, 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3014 /* can't end before the start */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3015 if (m_endpos->lnum == startpos->lnum && m_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3016 m_endpos->col = startpos->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3017
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3018 syn_add_end_off(end_endpos, &best_regmatch, spp, SPO_HE_OFF, 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3019 /* can't end before the start */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3020 if (end_endpos->lnum == startpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3021 && end_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3022 end_endpos->col = startpos->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3023 /* can't end after the match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3024 limit_pos(end_endpos, m_endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3025
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3026 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3027 * If the end group is highlighted differently, adjust the pointers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3028 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3029 if (spp->sp_syn_match_id != spp->sp_syn.id && spp->sp_syn_match_id != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3030 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3031 *end_idx = best_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3032 if (spp->sp_off_flags & (1 << (SPO_RE_OFF + SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3033 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3034 hl_endpos->lnum = best_regmatch.endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3035 hl_endpos->col = best_regmatch.endpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3036 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3037 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3038 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3039 hl_endpos->lnum = best_regmatch.startpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3040 hl_endpos->col = best_regmatch.startpos[0].col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3041 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3042 hl_endpos->col += spp->sp_offsets[SPO_RE_OFF];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3043
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3044 /* can't end before the start */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3045 if (hl_endpos->lnum == startpos->lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3046 && hl_endpos->col < startpos->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3047 hl_endpos->col = startpos->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3048 limit_pos(hl_endpos, m_endpos);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3049
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3050 /* now the match ends where the highlighting ends, it is turned
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3051 * into the matchgroup for the end */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3052 *m_endpos = *hl_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3053 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3054 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3055 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3056 *end_idx = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3057 *hl_endpos = *end_endpos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3058 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3059
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3060 *flagsp = spp->sp_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3061
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3062 had_match = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3063 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3064 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3065
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3066 /* no match for an END pattern in this line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3067 if (!had_match)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3068 m_endpos->lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3069
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3070 /* Remove external matches. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3071 unref_extmatch(re_extmatch_in);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3072 re_extmatch_in = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3073 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3074
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3075 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3076 * Limit "pos" not to be after "limit".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3077 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3078 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3079 limit_pos(pos, limit)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3080 lpos_T *pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3081 lpos_T *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3082 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3083 if (pos->lnum > limit->lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3084 *pos = *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3085 else if (pos->lnum == limit->lnum && pos->col > limit->col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3086 pos->col = limit->col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3087 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3088
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3089 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3090 * Limit "pos" not to be after "limit", unless pos->lnum is zero.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3091 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3092 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3093 limit_pos_zero(pos, limit)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3094 lpos_T *pos;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3095 lpos_T *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3096 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3097 if (pos->lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3098 *pos = *limit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3099 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3100 limit_pos(pos, limit);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3101 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3102
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3103 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3104 * Add offset to matched text for end of match or highlight.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3105 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3106 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3107 syn_add_end_off(result, regmatch, spp, idx, extra)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3108 lpos_T *result; /* returned position */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3109 regmmatch_T *regmatch; /* start/end of match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3110 synpat_T *spp; /* matched pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3111 int idx; /* index of offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3112 int extra; /* extra chars for offset to start */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3113 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3114 int col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3115 int off;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3116 char_u *base;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3117 char_u *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3119 if (spp->sp_off_flags & (1 << idx))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3120 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3121 result->lnum = regmatch->startpos[0].lnum;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3122 col = regmatch->startpos[0].col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3123 off = spp->sp_offsets[idx] + extra;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3124 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3125 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3126 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3127 result->lnum = regmatch->endpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3128 col = regmatch->endpos[0].col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3129 off = spp->sp_offsets[idx];
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3130 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3131 /* Don't go past the end of the line. Matters for "rs=e+2" when there
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3132 * is a matchgroup. Watch out for match with last NL in the buffer. */
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3133 if (result->lnum > syn_buf->b_ml.ml_line_count)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3134 col = 0;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3135 else if (off != 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3136 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3137 base = ml_get_buf(syn_buf, result->lnum, FALSE);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3138 p = base + col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3139 if (off > 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3140 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3141 while (off-- > 0 && *p != NUL)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3142 mb_ptr_adv(p);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3143 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3144 else if (off < 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3145 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3146 while (off++ < 0 && base < p)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3147 mb_ptr_back(base, p);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3148 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3149 col = (int)(p - base);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3150 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3151 result->col = col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3152 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3153
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3154 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3155 * Add offset to matched text for start of match or highlight.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3156 * Avoid resulting column to become negative.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3157 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3158 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3159 syn_add_start_off(result, regmatch, spp, idx, extra)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3160 lpos_T *result; /* returned position */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3161 regmmatch_T *regmatch; /* start/end of match */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3162 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3163 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3164 int extra; /* extra chars for offset to end */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3165 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3166 int col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3167 int off;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3168 char_u *base;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3169 char_u *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3170
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3171 if (spp->sp_off_flags & (1 << (idx + SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3172 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3173 result->lnum = regmatch->endpos[0].lnum;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3174 col = regmatch->endpos[0].col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3175 off = spp->sp_offsets[idx] + extra;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3176 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3177 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3178 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3179 result->lnum = regmatch->startpos[0].lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3180 col = regmatch->startpos[0].col;
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3181 off = spp->sp_offsets[idx];
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3182 }
2092
98cc757f7e3d updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents: 2047
diff changeset
3183 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
3184 {
98cc757f7e3d updated for version 7.2.376
Bram Moolenaar <bram@zimbu.org>
parents: 2047
diff changeset
3185 /* 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
3186 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
3187 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
3188 }
1624
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3189 if (off != 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3190 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3191 base = ml_get_buf(syn_buf, result->lnum, FALSE);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3192 p = base + col;
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3193 if (off > 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3194 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3195 while (off-- && *p != NUL)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3196 mb_ptr_adv(p);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3197 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3198 else if (off < 0)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3199 {
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3200 while (off++ && base < p)
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3201 mb_ptr_back(base, p);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3202 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3203 col = (int)(p - base);
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3204 }
18ee39301b82 updated for version 7.2a
vimboss
parents: 1521
diff changeset
3205 result->col = col;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3206 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3207
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3208 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3209 * Get current line in syntax buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3210 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3211 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3212 syn_getcurline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3213 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3214 return ml_get_buf(syn_buf, current_lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3215 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3216
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3217 /*
410
c60ba877860b updated for version 7.0107
vimboss
parents: 386
diff changeset
3218 * Call vim_regexec() to find a match with "rmp" in "syn_buf".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3219 * Returns TRUE when there is a match.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3220 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3221 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3222 syn_regexec(rmp, lnum, col)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3223 regmmatch_T *rmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3224 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3225 colnr_T col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3226 {
410
c60ba877860b updated for version 7.0107
vimboss
parents: 386
diff changeset
3227 rmp->rmm_maxcol = syn_buf->b_p_smc;
1521
cc4fe241baa3 updated for version 7.1-236
vimboss
parents: 1512
diff changeset
3228 if (vim_regexec_multi(rmp, syn_win, syn_buf, lnum, col, NULL) > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3229 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3230 rmp->startpos[0].lnum += lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3231 rmp->endpos[0].lnum += lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3232 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3233 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3234 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3235 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3236
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3237 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3238 * Check one position in a line for a matching keyword.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3239 * The caller must check if a keyword can start at startcol.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3240 * Return it's ID if found, 0 otherwise.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3241 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3242 static int
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3243 check_keyword_id(line, startcol, endcolp, flagsp, next_listp, cur_si, ccharp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3244 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3245 int startcol; /* position in line to check for keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3246 int *endcolp; /* return: character after found keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3247 long *flagsp; /* return: flags of matching keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3248 short **next_listp; /* return: next_list of matching keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3249 stateitem_T *cur_si; /* item at the top of the stack */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3250 int *ccharp UNUSED; /* conceal substitution char */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3251 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3252 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3253 char_u *kwp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3254 int round;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3255 int kwlen;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3256 char_u keyword[MAXKEYWLEN + 1]; /* assume max. keyword len is 80 */
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3257 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3258 hashitem_T *hi;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3259
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3260 /* Find first character after the keyword. First character was already
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3261 * checked. */
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3262 kwp = line + startcol;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3263 kwlen = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3264 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3265 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3266 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3267 if (has_mbyte)
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 448
diff changeset
3268 kwlen += (*mb_ptr2len)(kwp + kwlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3269 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3270 #endif
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3271 ++kwlen;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3272 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3273 while (vim_iswordc_buf(kwp + kwlen, syn_buf));
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3274
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3275 if (kwlen > MAXKEYWLEN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3276 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3277
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3278 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3279 * Must make a copy of the keyword, so we can add a NUL and make it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3280 * lowercase.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3281 */
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3282 vim_strncpy(keyword, kwp, kwlen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3283
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3284 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3285 * Try twice:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3286 * 1. matching case
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3287 * 2. ignoring case
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3288 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3289 for (round = 1; round <= 2; ++round)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3290 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3291 ht = round == 1 ? &syn_block->b_keywtab : &syn_block->b_keywtab_ic;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3292 if (ht->ht_used == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3293 continue;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3294 if (round == 2) /* ignore case */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3295 (void)str_foldcase(kwp, kwlen, keyword, MAXKEYWLEN + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3296
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3297 /*
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3298 * Find keywords that match. There can be several with different
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3299 * attributes.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3300 * When current_next_list is non-zero accept only that group, otherwise:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3301 * Accept a not-contained keyword at toplevel.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3302 * Accept a keyword at other levels only if it is in the contains list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3303 */
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3304 hi = hash_find(ht, keyword);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3305 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3306 for (kp = HI2KE(hi); kp != NULL; kp = kp->ke_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3307 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3308 if (current_next_list != 0
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3309 ? in_id_list(NULL, current_next_list, &kp->k_syn, 0)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3310 : (cur_si == NULL
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3311 ? !(kp->flags & HL_CONTAINED)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3312 : in_id_list(cur_si, cur_si->si_cont_list,
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3313 &kp->k_syn, kp->flags & HL_CONTAINED)))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3314 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3315 *endcolp = startcol + kwlen;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3316 *flagsp = kp->flags;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3317 *next_listp = kp->next_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3318 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3319 *ccharp = kp->k_char;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3320 #endif
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3321 return kp->k_syn.id;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
3322 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3323 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3324 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3325 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3326 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3327
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3328 /*
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3329 * Handle ":syntax conceal" command.
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3330 */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3331 static void
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3332 syn_cmd_conceal(eap, syncing)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3333 exarg_T *eap UNUSED;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3334 int syncing UNUSED;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3335 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3336 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3337 char_u *arg = eap->arg;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3338 char_u *next;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3339
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3340 eap->nextcmd = find_nextcmd(arg);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3341 if (eap->skip)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3342 return;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3343
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3344 next = skiptowhite(arg);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3345 if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3346 curwin->w_s->b_syn_conceal = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3347 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
3348 curwin->w_s->b_syn_conceal = FALSE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3349 else
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3350 EMSG2(_("E390: Illegal argument: %s"), arg);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3351 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3352 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3353
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3354 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3355 * Handle ":syntax case" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3356 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3357 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3358 syn_cmd_case(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3359 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3360 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3361 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3362 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3363 char_u *next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3364
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3365 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3366 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3367 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3368
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3369 next = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3370 if (STRNICMP(arg, "match", 5) == 0 && next - arg == 5)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3371 curwin->w_s->b_syn_ic = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3372 else if (STRNICMP(arg, "ignore", 6) == 0 && next - arg == 6)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3373 curwin->w_s->b_syn_ic = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3374 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3375 EMSG2(_("E390: Illegal argument: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3376 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3377
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3378 /*
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3379 * Handle ":syntax spell" command.
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3380 */
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3381 static void
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3382 syn_cmd_spell(eap, syncing)
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3383 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3384 int syncing UNUSED;
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3385 {
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3386 char_u *arg = eap->arg;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3387 char_u *next;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3388
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3389 eap->nextcmd = find_nextcmd(arg);
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3390 if (eap->skip)
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3391 return;
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3392
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3393 next = skiptowhite(arg);
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3394 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
3395 curwin->w_s->b_syn_spell = SYNSPL_TOP;
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3396 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
3397 curwin->w_s->b_syn_spell = SYNSPL_NOTOP;
1064
a8bcc7553263 updated for version 7.0-190
vimboss
parents: 1028
diff changeset
3398 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
3399 curwin->w_s->b_syn_spell = SYNSPL_DEFAULT;
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3400 else
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3401 EMSG2(_("E390: Illegal argument: %s"), arg);
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3402 }
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3403
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
3404 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3405 * Clear all syntax info for one buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3406 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3407 void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3408 syntax_clear(block)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3409 synblock_T *block;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3410 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3411 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3412
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3413 block->b_syn_error = FALSE; /* clear previous error */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3414 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
3415 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
3416 block->b_syn_containedin = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3417
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3418 /* free the keywords */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3419 clear_keywtab(&block->b_keywtab);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3420 clear_keywtab(&block->b_keywtab_ic);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3421
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3422 /* free the syntax patterns */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3423 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
3424 syn_clear_pattern(block, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3425 ga_clear(&block->b_syn_patterns);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3426
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3427 /* free the syntax clusters */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3428 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
3429 syn_clear_cluster(block, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3430 ga_clear(&block->b_syn_clusters);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3431 block->b_spell_cluster_id = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3432 block->b_nospell_cluster_id = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3433
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3434 block->b_syn_sync_flags = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3435 block->b_syn_sync_minlines = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3436 block->b_syn_sync_maxlines = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3437 block->b_syn_sync_linebreaks = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3438
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3439 vim_free(block->b_syn_linecont_prog);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3440 block->b_syn_linecont_prog = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3441 vim_free(block->b_syn_linecont_pat);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3442 block->b_syn_linecont_pat = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3443 #ifdef FEAT_FOLDING
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3444 block->b_syn_folditems = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3445 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3446
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3447 /* free the stored states */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3448 syn_stack_free_all(block);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3449 invalidate_current_state();
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
3450
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
3451 /* Reset the counter for ":syn include" */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
3452 running_syn_inc_tag = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3454
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3455 /*
2253
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3456 * 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
3457 */
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3458 void
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3459 reset_synblock(wp)
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3460 win_T *wp;
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3461 {
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3462 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
3463 {
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3464 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
3465 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
3466 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
3467 }
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3468 }
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3469
12ebd6f6dfce Fixed: after ":ownsyntax perl" and ":e" syntax was cleared in other window.
Bram Moolenaar <bram@vim.org>
parents: 2252
diff changeset
3470 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3471 * Clear syncing info for one buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3472 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3473 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3474 syntax_sync_clear()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3475 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3476 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3477
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3478 /* free the syntax patterns */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3479 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
3480 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
3481 syn_remove_pattern(curwin->w_s, i);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3482
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3483 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
3484 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
3485 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
3486 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
3487
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3488 vim_free(curwin->w_s->b_syn_linecont_prog);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3489 curwin->w_s->b_syn_linecont_prog = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3490 vim_free(curwin->w_s->b_syn_linecont_pat);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3491 curwin->w_s->b_syn_linecont_pat = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3492
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3493 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3494 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3495
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3496 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3497 * Remove one pattern from the buffer's pattern list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3498 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3499 static void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3500 syn_remove_pattern(block, idx)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3501 synblock_T *block;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3502 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3503 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3504 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3505
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3506 spp = &(SYN_ITEMS(block)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3507 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3508 if (spp->sp_flags & HL_FOLD)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3509 --block->b_syn_folditems;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3510 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3511 syn_clear_pattern(block, idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3512 mch_memmove(spp, spp + 1,
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3513 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
3514 --block->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3515 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3516
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3517 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3518 * Clear and free one syntax pattern. When clearing all, must be called from
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3519 * last to first!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3520 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3521 static void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3522 syn_clear_pattern(block, i)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3523 synblock_T *block;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3524 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3525 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3526 vim_free(SYN_ITEMS(block)[i].sp_pattern);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3527 vim_free(SYN_ITEMS(block)[i].sp_prog);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3528 /* 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
3529 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
3530 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3531 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
3532 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
3533 vim_free(SYN_ITEMS(block)[i].sp_syn.cont_in_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3534 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3535 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3536
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3537 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3538 * Clear and free one syntax cluster.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3539 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3540 static void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3541 syn_clear_cluster(block, i)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3542 synblock_T *block;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3543 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3544 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3545 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
3546 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
3547 vim_free(SYN_CLSTR(block)[i].scl_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3548 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3549
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3550 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3551 * Handle ":syntax clear" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3552 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3553 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3554 syn_cmd_clear(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3555 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3556 int syncing;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3557 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3558 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3559 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3560 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3561
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3562 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3563 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3564 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3565
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3566 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3567 * We have to disable this within ":syn include @group filename",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3568 * because otherwise @group would get deleted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3569 * Only required for Vim 5.x syntax files, 6.0 ones don't contain ":syn
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3570 * clear".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3571 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3572 if (curwin->w_s->b_syn_topgrp != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3573 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3574
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3575 if (ends_excmd(*arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3576 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3577 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3578 * No argument: Clear all syntax items.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3579 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3580 if (syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3581 syntax_sync_clear();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3582 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3583 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3584 syntax_clear(curwin->w_s);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3585 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
3586 do_unlet((char_u *)"b:current_syntax", TRUE);
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
3587 do_unlet((char_u *)"w:current_syntax", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3588 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3589 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3590 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3591 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3592 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3593 * Clear the group IDs that are in the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3594 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3595 while (!ends_excmd(*arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3596 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3597 arg_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3598 if (*arg == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3599 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3600 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3601 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3602 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3603 EMSG2(_("E391: No such syntax cluster: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3604 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3605 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3606 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3607 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3608 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3609 * We can't physically delete a cluster without changing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3610 * the IDs of other clusters, so we do the next best thing
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3611 * and make it empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3612 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3613 short scl_id = id - SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3614
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3615 vim_free(SYN_CLSTR(curwin->w_s)[scl_id].scl_list);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3616 SYN_CLSTR(curwin->w_s)[scl_id].scl_list = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3617 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3618 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3619 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3620 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3621 id = syn_namen2id(arg, (int)(arg_end - arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3622 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3623 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3624 EMSG2(_(e_nogroup), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3625 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3626 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3627 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3628 syn_clear_one(id, syncing);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3629 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3630 arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3631 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3632 }
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
3633 redraw_curbuf_later(SOME_VALID);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3634 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3635 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3636
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3637 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3638 * Clear one syntax group for the current buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3639 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3640 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3641 syn_clear_one(id, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3642 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3643 int syncing;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3644 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3645 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3646 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3647
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3648 /* Clear keywords only when not ":syn sync clear group-name" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3649 if (!syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3650 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3651 (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
3652 (void)syn_clear_keyword(id, &curwin->w_s->b_keywtab_ic);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3653 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3654
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3655 /* clear the patterns for "id" */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3656 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
3657 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3658 spp = &(SYN_ITEMS(curwin->w_s)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3659 if (spp->sp_syn.id != id || spp->sp_syncing != syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3660 continue;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3661 syn_remove_pattern(curwin->w_s, idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3662 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3663 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3664
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3665 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3666 * Handle ":syntax on" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3667 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3668 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3669 syn_cmd_on(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3670 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3671 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3672 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3673 syn_cmd_onoff(eap, "syntax");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3674 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3675
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3676 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3677 * Handle ":syntax enable" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3678 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3679 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3680 syn_cmd_enable(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3681 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3682 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3683 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3684 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3685 syn_cmd_onoff(eap, "syntax");
148
72aefd4c1e0d updated for version 7.0046
vimboss
parents: 134
diff changeset
3686 do_unlet((char_u *)"g:syntax_cmd", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3687 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3688
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3689 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3690 * Handle ":syntax reset" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3691 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3692 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3693 syn_cmd_reset(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3694 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3695 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3696 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3697 eap->nextcmd = check_nextcmd(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3698 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3699 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3700 set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"reset");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3701 do_cmdline_cmd((char_u *)"runtime! syntax/syncolor.vim");
148
72aefd4c1e0d updated for version 7.0046
vimboss
parents: 134
diff changeset
3702 do_unlet((char_u *)"g:syntax_cmd", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3703 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3704 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3705
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3706 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3707 * Handle ":syntax manual" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3708 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3709 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3710 syn_cmd_manual(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3711 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3712 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3713 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3714 syn_cmd_onoff(eap, "manual");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3715 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3716
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3717 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3718 * Handle ":syntax off" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3719 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3720 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3721 syn_cmd_off(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3722 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
3723 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3724 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3725 syn_cmd_onoff(eap, "nosyntax");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3726 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3727
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3728 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3729 syn_cmd_onoff(eap, name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3730 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3731 char *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3732 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3733 char_u buf[100];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3734
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3735 eap->nextcmd = check_nextcmd(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3736 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3737 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3738 STRCPY(buf, "so ");
274
8fa8d7964cf1 updated for version 7.0073
vimboss
parents: 271
diff changeset
3739 vim_snprintf((char *)buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3740 do_cmdline_cmd(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3741 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3742 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3743
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3744 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3745 * Handle ":syntax [list]" command: list current syntax words.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3746 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3747 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3748 syn_cmd_list(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3749 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3750 int syncing; /* when TRUE: list syncing items */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3751 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3752 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3753 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3754 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3755
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3756 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3757 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3758 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3759
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3760 if (!syntax_present(curwin))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3761 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3762 MSG(_("No Syntax items defined for this buffer"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3763 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3764 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3765
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3766 if (syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3767 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3768 if (curwin->w_s->b_syn_sync_flags & SF_CCOMMENT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3769 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3770 MSG_PUTS(_("syncing on C-style comments"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3771 syn_lines_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3772 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3773 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3774 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3775 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
3776 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3777 if (curwin->w_s->b_syn_sync_minlines == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3778 MSG_PUTS(_("no syncing"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3779 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3780 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3781 MSG_PUTS(_("syncing starts "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3782 msg_outnum(curwin->w_s->b_syn_sync_minlines);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3783 MSG_PUTS(_(" lines before top line"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3784 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3785 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3786 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3787 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3788 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
3789 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
3790 || 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
3791 || curwin->w_s->b_syn_sync_linebreaks > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3792 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3793 MSG_PUTS(_("\nsyncing on items"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3794 syn_lines_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3795 syn_match_msg();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3796 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3797 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3798 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3799 MSG_PUTS_TITLE(_("\n--- Syntax items ---"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3800 if (ends_excmd(*arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3801 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3802 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3803 * No argument: List all group IDs and all syntax clusters.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3804 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3805 for (id = 1; id <= highlight_ga.ga_len && !got_int; ++id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3806 syn_list_one(id, syncing, FALSE);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3807 for (id = 0; id < curwin->w_s->b_syn_clusters.ga_len && !got_int; ++id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3808 syn_list_cluster(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3809 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3810 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3811 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3812 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3813 * List the group IDs and syntax clusters that are in the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3814 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3815 while (!ends_excmd(*arg) && !got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3816 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3817 arg_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3818 if (*arg == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3819 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3820 id = syn_scl_namen2id(arg + 1, (int)(arg_end - arg - 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3821 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3822 EMSG2(_("E392: No such syntax cluster: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3823 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3824 syn_list_cluster(id - SYNID_CLUSTER);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3825 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3826 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3827 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3828 id = syn_namen2id(arg, (int)(arg_end - arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3829 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3830 EMSG2(_(e_nogroup), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3831 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3832 syn_list_one(id, syncing, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3833 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3834 arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3835 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3836 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3837 eap->nextcmd = check_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3838 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3839
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3840 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3841 syn_lines_msg()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3842 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3843 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
3844 || curwin->w_s->b_syn_sync_minlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3845 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3846 MSG_PUTS("; ");
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3847 if (curwin->w_s->b_syn_sync_minlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3848 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3849 MSG_PUTS(_("minimal "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3850 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
3851 if (curwin->w_s->b_syn_sync_maxlines)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3852 MSG_PUTS(", ");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3853 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3854 if (curwin->w_s->b_syn_sync_maxlines > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3855 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3856 MSG_PUTS(_("maximal "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3857 msg_outnum(curwin->w_s->b_syn_sync_maxlines);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3858 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3859 MSG_PUTS(_(" lines before top line"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3860 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3861 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3862
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3863 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3864 syn_match_msg()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3865 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3866 if (curwin->w_s->b_syn_sync_linebreaks > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3867 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3868 MSG_PUTS(_("; match "));
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3869 msg_outnum(curwin->w_s->b_syn_sync_linebreaks);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3870 MSG_PUTS(_(" line breaks"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3871 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3872 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3873
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3874 static int last_matchgroup;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3875
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3876 struct name_list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3877 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3878 int flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3879 char *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3880 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3881
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3882 static void syn_list_flags __ARGS((struct name_list *nl, int flags, int attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3883
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3884 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3885 * List one syntax item, for ":syntax" or "syntax list syntax_name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3886 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3887 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3888 syn_list_one(id, syncing, link_only)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3889 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3890 int syncing; /* when TRUE: list syncing items */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3891 int link_only; /* when TRUE; list link-only too */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3892 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3893 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3894 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3895 int did_header = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3896 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3897 static struct name_list namelist1[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3898 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3899 {HL_DISPLAY, "display"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3900 {HL_CONTAINED, "contained"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3901 {HL_ONELINE, "oneline"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3902 {HL_KEEPEND, "keepend"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3903 {HL_EXTEND, "extend"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3904 {HL_EXCLUDENL, "excludenl"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3905 {HL_TRANSP, "transparent"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3906 {HL_FOLD, "fold"},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3907 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3908 {HL_CONCEAL, "conceal"},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3909 {HL_CONCEALENDS, "concealends"},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3910 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3911 {0, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3912 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3913 static struct name_list namelist2[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3914 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3915 {HL_SKIPWHITE, "skipwhite"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3916 {HL_SKIPNL, "skipnl"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3917 {HL_SKIPEMPTY, "skipempty"},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3918 {0, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3919 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3920
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3921 attr = hl_attr(HLF_D); /* highlight like directories */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3922
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3923 /* list the keywords for "id" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3924 if (!syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3925 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3926 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
3927 did_header = syn_list_keywords(id, &curwin->w_s->b_keywtab_ic,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3928 did_header, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3929 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3930
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3931 /* list the patterns for "id" */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3932 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
3933 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3934 spp = &(SYN_ITEMS(curwin->w_s)[idx]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3935 if (spp->sp_syn.id != id || spp->sp_syncing != syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3936 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3937
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3938 (void)syn_list_header(did_header, 999, id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3939 did_header = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3940 last_matchgroup = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3941 if (spp->sp_type == SPTYPE_MATCH)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3942 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3943 put_pattern("match", ' ', spp, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3944 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3945 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3946 else if (spp->sp_type == SPTYPE_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3947 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3948 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
3949 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
3950 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
3951 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
3952 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
3953 && 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
3954 put_pattern("end", '=', &SYN_ITEMS(curwin->w_s)[idx++], attr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3955 --idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3956 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3957 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3958 syn_list_flags(namelist1, spp->sp_flags, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3959
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3960 if (spp->sp_cont_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3961 put_id_list((char_u *)"contains", spp->sp_cont_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3962
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3963 if (spp->sp_syn.cont_in_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3964 put_id_list((char_u *)"containedin",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3965 spp->sp_syn.cont_in_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3966
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3967 if (spp->sp_next_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3968 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3969 put_id_list((char_u *)"nextgroup", spp->sp_next_list, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3970 syn_list_flags(namelist2, spp->sp_flags, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3971 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3972 if (spp->sp_flags & (HL_SYNC_HERE|HL_SYNC_THERE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3973 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3974 if (spp->sp_flags & HL_SYNC_HERE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3975 msg_puts_attr((char_u *)"grouphere", attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3976 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3977 msg_puts_attr((char_u *)"groupthere", attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3978 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3979 if (spp->sp_sync_idx >= 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
3980 msg_outtrans(HL_TABLE()[SYN_ITEMS(curwin->w_s)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3981 [spp->sp_sync_idx].sp_syn.id - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3982 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3983 MSG_PUTS("NONE");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3984 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3985 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3986 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3987
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3988 /* list the link, if there is one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3989 if (HL_TABLE()[id - 1].sg_link && (did_header || link_only) && !got_int)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3990 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3991 (void)syn_list_header(did_header, 999, id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3992 msg_puts_attr((char_u *)"links to", attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3993 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3994 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3995 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3996 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3997
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3998 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3999 syn_list_flags(nl, flags, attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4000 struct name_list *nl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4001 int flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4002 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4003 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4004 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4005
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4006 for (i = 0; nl[i].flag != 0; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4007 if (flags & nl[i].flag)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4008 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4009 msg_puts_attr((char_u *)nl[i].name, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4010 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4011 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4012 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4013
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4014 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4015 * List one syntax cluster, for ":syntax" or "syntax list syntax_name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4016 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4017 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4018 syn_list_cluster(id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4019 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4020 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4021 int endcol = 15;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4022
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4023 /* slight hack: roughly duplicate the guts of syn_list_header() */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4024 msg_putchar('\n');
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4025 msg_outtrans(SYN_CLSTR(curwin->w_s)[id].scl_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4026
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4027 if (msg_col >= endcol) /* output at least one space */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4028 endcol = msg_col + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4029 if (Columns <= endcol) /* avoid hang for tiny window */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4030 endcol = Columns - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4031
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4032 msg_advance(endcol);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4033 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
4034 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4035 put_id_list((char_u *)"cluster", SYN_CLSTR(curwin->w_s)[id].scl_list,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4036 hl_attr(HLF_D));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4037 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4038 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4039 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4040 msg_puts_attr((char_u *)"cluster", hl_attr(HLF_D));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4041 msg_puts((char_u *)"=NONE");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4042 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4043 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4044
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4045 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4046 put_id_list(name, list, attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4047 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4048 short *list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4049 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4050 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4051 short *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4052
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4053 msg_puts_attr(name, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4054 msg_putchar('=');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4055 for (p = list; *p; ++p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4056 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4057 if (*p >= SYNID_ALLBUT && *p < SYNID_TOP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4058 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4059 if (p[1])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4060 MSG_PUTS("ALLBUT");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4061 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4062 MSG_PUTS("ALL");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4063 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4064 else if (*p >= SYNID_TOP && *p < SYNID_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4065 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4066 MSG_PUTS("TOP");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4067 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4068 else if (*p >= SYNID_CONTAINED && *p < SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4069 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4070 MSG_PUTS("CONTAINED");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4071 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4072 else if (*p >= SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4073 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4074 short scl_id = *p - SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4075
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4076 msg_putchar('@');
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4077 msg_outtrans(SYN_CLSTR(curwin->w_s)[scl_id].scl_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4078 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4079 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4080 msg_outtrans(HL_TABLE()[*p - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4081 if (p[1])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4082 msg_putchar(',');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4083 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4084 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4085 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4086
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4087 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4088 put_pattern(s, c, spp, attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4089 char *s;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4090 int c;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4091 synpat_T *spp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4092 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4093 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4094 long n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4095 int mask;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4096 int first;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4097 static char *sepchars = "/+=-#@\"|'^&";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4098 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4099
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4100 /* May have to write "matchgroup=group" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4101 if (last_matchgroup != spp->sp_syn_match_id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4102 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4103 last_matchgroup = spp->sp_syn_match_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4104 msg_puts_attr((char_u *)"matchgroup", attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4105 msg_putchar('=');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4106 if (last_matchgroup == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4107 msg_outtrans((char_u *)"NONE");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4108 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4109 msg_outtrans(HL_TABLE()[last_matchgroup - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4110 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4111 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4112
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4113 /* output the name of the pattern and an '=' or ' ' */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4114 msg_puts_attr((char_u *)s, attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4115 msg_putchar(c);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4116
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4117 /* output the pattern, in between a char that is not in the pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4118 for (i = 0; vim_strchr(spp->sp_pattern, sepchars[i]) != NULL; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4119 if (sepchars[++i] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4120 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4121 i = 0; /* no good char found, just use the first one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4122 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4123 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4124 msg_putchar(sepchars[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4125 msg_outtrans(spp->sp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4126 msg_putchar(sepchars[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4127
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4128 /* output any pattern options */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4129 first = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4130 for (i = 0; i < SPO_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4131 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4132 mask = (1 << i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4133 if (spp->sp_off_flags & (mask + (mask << SPO_COUNT)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4134 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4135 if (!first)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4136 msg_putchar(','); /* separate with commas */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4137 msg_puts((char_u *)spo_name_tab[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4138 n = spp->sp_offsets[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4139 if (i != SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4140 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4141 if (spp->sp_off_flags & mask)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4142 msg_putchar('s');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4143 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4144 msg_putchar('e');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4145 if (n > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4146 msg_putchar('+');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4147 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4148 if (n || i == SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4149 msg_outnum(n);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4150 first = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4151 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4152 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4153 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4154 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4155
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4156 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4157 * List or clear the keywords for one syntax group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4158 * Return TRUE if the header has been printed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4159 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4160 static int
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4161 syn_list_keywords(id, ht, did_header, attr)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4162 int id;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4163 hashtab_T *ht;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4164 int did_header; /* header has already been printed */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4165 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4166 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4167 int outlen;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4168 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4169 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4170 int todo;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4171 int prev_contained = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4172 short *prev_next_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4173 short *prev_cont_in_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4174 int prev_skipnl = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4175 int prev_skipwhite = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4176 int prev_skipempty = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4177
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4178 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4179 * Unfortunately, this list of keywords is not sorted on alphabet but on
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4180 * hash value...
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4181 */
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4182 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4183 for (hi = ht->ht_array; todo > 0 && !got_int; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4184 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4185 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4186 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4187 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4188 for (kp = HI2KE(hi); kp != NULL && !got_int; kp = kp->ke_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4189 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4190 if (kp->k_syn.id == id)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4191 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4192 if (prev_contained != (kp->flags & HL_CONTAINED)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4193 || prev_skipnl != (kp->flags & HL_SKIPNL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4194 || prev_skipwhite != (kp->flags & HL_SKIPWHITE)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4195 || prev_skipempty != (kp->flags & HL_SKIPEMPTY)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4196 || prev_cont_in_list != kp->k_syn.cont_in_list
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4197 || prev_next_list != kp->next_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4198 outlen = 9999;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4199 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4200 outlen = (int)STRLEN(kp->keyword);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4201 /* output "contained" and "nextgroup" on each line */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4202 if (syn_list_header(did_header, outlen, id))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4203 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4204 prev_contained = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4205 prev_next_list = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4206 prev_cont_in_list = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4207 prev_skipnl = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4208 prev_skipwhite = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4209 prev_skipempty = 0;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4210 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4211 did_header = TRUE;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4212 if (prev_contained != (kp->flags & HL_CONTAINED))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4213 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4214 msg_puts_attr((char_u *)"contained", attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4215 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4216 prev_contained = (kp->flags & HL_CONTAINED);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4217 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4218 if (kp->k_syn.cont_in_list != prev_cont_in_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4219 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4220 put_id_list((char_u *)"containedin",
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4221 kp->k_syn.cont_in_list, attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4222 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4223 prev_cont_in_list = kp->k_syn.cont_in_list;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4224 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4225 if (kp->next_list != prev_next_list)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4226 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4227 put_id_list((char_u *)"nextgroup", kp->next_list, attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4228 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4229 prev_next_list = kp->next_list;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4230 if (kp->flags & HL_SKIPNL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4231 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4232 msg_puts_attr((char_u *)"skipnl", attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4233 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4234 prev_skipnl = (kp->flags & HL_SKIPNL);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4235 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4236 if (kp->flags & HL_SKIPWHITE)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4237 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4238 msg_puts_attr((char_u *)"skipwhite", attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4239 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4240 prev_skipwhite = (kp->flags & HL_SKIPWHITE);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4241 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4242 if (kp->flags & HL_SKIPEMPTY)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4243 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4244 msg_puts_attr((char_u *)"skipempty", attr);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4245 msg_putchar(' ');
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4246 prev_skipempty = (kp->flags & HL_SKIPEMPTY);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4247 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4248 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4249 msg_outtrans(kp->keyword);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4250 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4251 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4252 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4253 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4254
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4255 return did_header;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4256 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4257
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4258 static void
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4259 syn_clear_keyword(id, ht)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4260 int id;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4261 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4262 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4263 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4264 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4265 keyentry_T *kp_prev;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4266 keyentry_T *kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4267 int todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4268
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4269 hash_lock(ht);
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4270 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4271 for (hi = ht->ht_array; todo > 0; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4272 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4273 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4274 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4275 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4276 kp_prev = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4277 for (kp = HI2KE(hi); kp != NULL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4278 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4279 if (kp->k_syn.id == id)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4280 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4281 kp_next = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4282 if (kp_prev == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4283 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4284 if (kp_next == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4285 hash_remove(ht, hi);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4286 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4287 hi->hi_key = KE2HIKEY(kp_next);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4288 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4289 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4290 kp_prev->ke_next = kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4291 vim_free(kp->next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4292 vim_free(kp->k_syn.cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4293 vim_free(kp);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4294 kp = kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4295 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4296 else
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4297 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4298 kp_prev = kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4299 kp = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4300 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4301 }
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4302 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4303 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4304 hash_unlock(ht);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4305 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4306
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4307 /*
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4308 * Clear a whole keyword table.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4309 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4310 static void
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4311 clear_keywtab(ht)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4312 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4313 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4314 hashitem_T *hi;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4315 int todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4316 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4317 keyentry_T *kp_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4318
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 834
diff changeset
4319 todo = (int)ht->ht_used;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4320 for (hi = ht->ht_array; todo > 0; ++hi)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4321 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4322 if (!HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4323 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4324 --todo;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4325 for (kp = HI2KE(hi); kp != NULL; kp = kp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4326 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4327 kp_next = kp->ke_next;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4328 vim_free(kp->next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4329 vim_free(kp->k_syn.cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4330 vim_free(kp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4331 }
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4332 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4333 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4334 hash_clear(ht);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4335 hash_init(ht);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4337
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4338 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4339 * Add a keyword to the list of keywords.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4340 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4341 static void
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4342 add_keyword(name, id, flags, cont_in_list, next_list, conceal_char)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4343 char_u *name; /* name of keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4344 int id; /* group ID for this keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4345 int flags; /* flags for this keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4346 short *cont_in_list; /* containedin for this keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4347 short *next_list; /* nextgroup for this keyword */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4348 int conceal_char;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4349 {
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4350 keyentry_T *kp;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4351 hashtab_T *ht;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4352 hashitem_T *hi;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4353 char_u *name_ic;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4354 long_u hash;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4355 char_u name_folded[MAXKEYWLEN + 1];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4356
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4357 if (curwin->w_s->b_syn_ic)
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4358 name_ic = str_foldcase(name, (int)STRLEN(name),
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4359 name_folded, MAXKEYWLEN + 1);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4360 else
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4361 name_ic = name;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4362 kp = (keyentry_T *)alloc((int)(sizeof(keyentry_T) + STRLEN(name_ic)));
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4363 if (kp == NULL)
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4364 return;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4365 STRCPY(kp->keyword, name_ic);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4366 kp->k_syn.id = id;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4367 kp->k_syn.inc_tag = current_syn_inc_tag;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4368 kp->flags = flags;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4369 kp->k_char = conceal_char;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4370 kp->k_syn.cont_in_list = copy_id_list(cont_in_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4371 if (cont_in_list != NULL)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4372 curwin->w_s->b_syn_containedin = TRUE;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4373 kp->next_list = copy_id_list(next_list);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4374
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4375 if (curwin->w_s->b_syn_ic)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4376 ht = &curwin->w_s->b_keywtab_ic;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4377 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4378 ht = &curwin->w_s->b_keywtab;
134
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4379
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4380 hash = hash_hash(kp->keyword);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4381 hi = hash_lookup(ht, kp->keyword, hash);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4382 if (HASHITEM_EMPTY(hi))
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4383 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4384 /* new keyword, add to hashtable */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4385 kp->ke_next = NULL;
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4386 hash_add_item(ht, hi, kp->keyword, hash);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4387 }
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4388 else
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4389 {
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4390 /* keyword already exists, prepend to list */
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4391 kp->ke_next = HI2KE(hi);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4392 hi->hi_key = KE2HIKEY(kp);
9322cb10d72e updated for version 7.0044
vimboss
parents: 41
diff changeset
4393 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4394 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4395
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4396 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4397 * Get the start and end of the group name argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4398 * Return a pointer to the first argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4399 * Return NULL if the end of the command was found instead of further args.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4400 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4401 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4402 get_group_name(arg, name_end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4403 char_u *arg; /* start of the argument */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4404 char_u **name_end; /* pointer to end of the name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4405 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4406 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4407
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4408 *name_end = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4409 rest = skipwhite(*name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4410
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4411 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4412 * Check if there are enough arguments. The first argument may be a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4413 * pattern, where '|' is allowed, so only check for NUL.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4414 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4415 if (ends_excmd(*arg) || *rest == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4416 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4417 return rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4418 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4419
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4420 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4421 * Check for syntax command option arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4422 * This can be called at any place in the list of arguments, and just picks
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4423 * out the arguments that are known. Can be called several times in a row to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4424 * collect all options in between other arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4425 * Return a pointer to the next argument (which isn't an option).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4426 * Return NULL for any error;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4427 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4428 static char_u *
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4429 get_syn_options(arg, opt, conceal_char)
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4430 char_u *arg; /* next argument to be checked */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4431 syn_opt_arg_T *opt; /* various things */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4432 int *conceal_char UNUSED;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4433 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4434 char_u *gname_start, *gname;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4435 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4436 int len;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4437 char *p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4438 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4439 int fidx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4440 static struct flag
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4441 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4442 char *name;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4443 int argtype;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4444 int flags;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4445 } flagtab[] = { {"cCoOnNtTaAiInNeEdD", 0, HL_CONTAINED},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4446 {"oOnNeElLiInNeE", 0, HL_ONELINE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4447 {"kKeEeEpPeEnNdD", 0, HL_KEEPEND},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4448 {"eExXtTeEnNdD", 0, HL_EXTEND},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4449 {"eExXcClLuUdDeEnNlL", 0, HL_EXCLUDENL},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4450 {"tTrRaAnNsSpPaArReEnNtT", 0, HL_TRANSP},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4451 {"sSkKiIpPnNlL", 0, HL_SKIPNL},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4452 {"sSkKiIpPwWhHiItTeE", 0, HL_SKIPWHITE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4453 {"sSkKiIpPeEmMpPtTyY", 0, HL_SKIPEMPTY},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4454 {"gGrRoOuUpPhHeErReE", 0, HL_SYNC_HERE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4455 {"gGrRoOuUpPtThHeErReE", 0, HL_SYNC_THERE},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4456 {"dDiIsSpPlLaAyY", 0, HL_DISPLAY},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4457 {"fFoOlLdD", 0, HL_FOLD},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4458 {"cCoOnNcCeEaAlL", 0, HL_CONCEAL},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4459 {"cCoOnNcCeEaAlLeEnNdDsS", 0, HL_CONCEALENDS},
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4460 {"cCcChHaArR", 11, 0},
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4461 {"cCoOnNtTaAiInNsS", 1, 0},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4462 {"cCoOnNtTaAiInNeEdDiInN", 2, 0},
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4463 {"nNeExXtTgGrRoOuUpP", 3, 0},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4464 };
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4465 static char *first_letters = "cCoOkKeEtTsSgGdDfFnN";
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4466
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4467 if (arg == NULL) /* already detected error */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4468 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4469
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4470 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4471 if (curwin->w_s->b_syn_conceal)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4472 opt->flags |= HL_CONCEAL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4473 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4474
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4475 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4476 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4477 /*
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4478 * This is used very often when a large number of keywords is defined.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4479 * Need to skip quickly when no option name is found.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4480 * Also avoid tolower(), it's slow.
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4481 */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4482 if (strchr(first_letters, *arg) == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4483 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4484
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4485 for (fidx = sizeof(flagtab) / sizeof(struct flag); --fidx >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4486 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4487 p = flagtab[fidx].name;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4488 for (i = 0, len = 0; p[i] != NUL; i += 2, ++len)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4489 if (arg[len] != p[i] && arg[len] != p[i + 1])
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4490 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4491 if (p[i] == NUL && (vim_iswhite(arg[len])
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4492 || (flagtab[fidx].argtype > 0
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4493 ? arg[len] == '='
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4494 : ends_excmd(arg[len]))))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4495 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4496 if (opt->keyword
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4497 && (flagtab[fidx].flags == HL_DISPLAY
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4498 || flagtab[fidx].flags == HL_FOLD
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4499 || flagtab[fidx].flags == HL_EXTEND))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4500 /* treat "display", "fold" and "extend" as a keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4501 fidx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4502 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4503 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4504 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4505 if (fidx < 0) /* no match found */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4506 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4507
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4508 if (flagtab[fidx].argtype == 1)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4509 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4510 if (!opt->has_cont_list)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4511 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4512 EMSG(_("E395: contains argument not accepted here"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4513 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4514 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4515 if (get_id_list(&arg, 8, &opt->cont_list) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4516 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4517 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4518 else if (flagtab[fidx].argtype == 2)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4519 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4520 if (get_id_list(&arg, 11, &opt->cont_in_list) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4521 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4522 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4523 else if (flagtab[fidx].argtype == 3)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4524 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4525 if (get_id_list(&arg, 9, &opt->next_list) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4526 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4527 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4528 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
4529 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4530 #ifdef FEAT_MBYTE
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4531 /* cchar=? */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4532 if (has_mbyte)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4533 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4534 # ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4535 *conceal_char = mb_ptr2char(arg + 6);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4536 # endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4537 arg += mb_ptr2len(arg + 6) - 1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4538 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4539 else
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4540 #endif
2251
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
4541 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4542 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4543 *conceal_char = arg[6];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4544 #else
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4545 ;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4546 #endif
2251
646d34788036 Fix a few compiler warnings. Fix crash with encrypted undo file.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
4547 }
2686
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4548 #ifdef FEAT_CONCEAL
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4549 if (!vim_isprintc_strict(*conceal_char))
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4550 {
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4551 EMSG(_("E844: invalid cchar value"));
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4552 return NULL;
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4553 }
7b44c70ee8ab updated for version 7.3.104
Bram Moolenaar <bram@vim.org>
parents: 2593
diff changeset
4554 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4555 arg = skipwhite(arg + 7);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4556 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4557 else
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4558 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4559 opt->flags |= flagtab[fidx].flags;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4560 arg = skipwhite(arg + len);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4561
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4562 if (flagtab[fidx].flags == HL_SYNC_HERE
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4563 || flagtab[fidx].flags == HL_SYNC_THERE)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4564 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4565 if (opt->sync_idx == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4566 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4567 EMSG(_("E393: group[t]here not accepted here"));
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4568 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4569 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4570 gname_start = arg;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4571 arg = skiptowhite(arg);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4572 if (gname_start == arg)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4573 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4574 gname = vim_strnsave(gname_start, (int)(arg - gname_start));
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4575 if (gname == NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4576 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4577 if (STRCMP(gname, "NONE") == 0)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4578 *opt->sync_idx = NONE_IDX;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4579 else
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4580 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4581 syn_id = syn_name2id(gname);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4582 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
4583 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
4584 && SYN_ITEMS(curwin->w_s)[i].sp_type == SPTYPE_START)
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4585 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4586 *opt->sync_idx = i;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4587 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4588 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4589 if (i < 0)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4590 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4591 EMSG2(_("E394: Didn't find region item for %s"), gname);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4592 vim_free(gname);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4593 return NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4594 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4595 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4596
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4597 vim_free(gname);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4598 arg = skipwhite(arg);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4599 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4600 #ifdef FEAT_FOLDING
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4601 else if (flagtab[fidx].flags == HL_FOLD
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4602 && foldmethodIsSyntax(curwin))
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4603 /* Need to update folds later. */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4604 foldUpdateAll(curwin);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4605 #endif
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4606 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4607 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4608
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4609 return arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4610 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4611
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4612 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4613 * Adjustments to syntax item when declared in a ":syn include"'d file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4614 * Set the contained flag, and if the item is not already contained, add it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4615 * to the specified top-level group, if any.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4616 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4617 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4618 syn_incl_toplevel(id, flagsp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4619 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4620 int *flagsp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4621 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4622 if ((*flagsp & HL_CONTAINED) || curwin->w_s->b_syn_topgrp == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4623 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4624 *flagsp |= HL_CONTAINED;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4625 if (curwin->w_s->b_syn_topgrp >= SYNID_CLUSTER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4626 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4627 /* We have to alloc this, because syn_combine_list() will free it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4628 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
4629 int tlg_id = curwin->w_s->b_syn_topgrp - SYNID_CLUSTER;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4630
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4631 if (grp_list != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4632 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4633 grp_list[0] = id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4634 grp_list[1] = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4635 syn_combine_list(&SYN_CLSTR(curwin->w_s)[tlg_id].scl_list, &grp_list,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4636 CLUSTER_ADD);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4637 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4638 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4639 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4640
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4641 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4642 * Handle ":syntax include [@{group-name}] filename" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4643 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4644 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4645 syn_cmd_include(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4646 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
4647 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4648 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4649 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4650 int sgl_id = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4651 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4652 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4653 char_u *errormsg = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4654 int prev_toplvl_grp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4655 int prev_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4656 int source = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4657
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4658 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4659 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4660 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4661
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4662 if (arg[0] == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4663 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4664 ++arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4665 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4666 if (rest == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4667 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4668 EMSG((char_u *)_("E397: Filename required"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4669 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4670 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4671 sgl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4672 if (sgl_id == 0)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4673 return;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4674 /* separate_nextcmd() and expand_filename() depend on this */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4675 eap->arg = rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4676 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4677
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4678 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4679 * Everything that's left, up to the next command, should be the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4680 * filename to include.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4681 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4682 eap->argt |= (XFILE | NOSPC);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4683 separate_nextcmd(eap);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4684 if (*eap->arg == '<' || *eap->arg == '$' || mch_isFullName(eap->arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4685 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4686 /* For an absolute path, "$VIM/..." or "<sfile>.." we ":source" the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4687 * file. Need to expand the file name first. In other cases
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4688 * ":runtime!" is used. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4689 source = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4690 if (expand_filename(eap, syn_cmdlinep, &errormsg) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4691 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4692 if (errormsg != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4693 EMSG(errormsg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4694 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4695 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4696 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4697
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4698 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4699 * Save and restore the existing top-level grouplist id and ":syn
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4700 * include" tag around the actual inclusion.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4701 */
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4702 if (running_syn_inc_tag >= MAX_SYN_INC_TAG)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4703 {
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4704 EMSG((char_u *)_("E847: Too many syntax includes"));
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4705 return;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4706 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4707 prev_syn_inc_tag = current_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4708 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
4709 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
4710 curwin->w_s->b_syn_topgrp = sgl_id;
1299
82add1e7c154 updated for version 7.1-013
vimboss
parents: 1222
diff changeset
4711 if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL
82add1e7c154 updated for version 7.1-013
vimboss
parents: 1222
diff changeset
4712 : source_runtime(eap->arg, TRUE) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4713 EMSG2(_(e_notopen), eap->arg);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4714 curwin->w_s->b_syn_topgrp = prev_toplvl_grp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4715 current_syn_inc_tag = prev_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4716 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4717
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4718 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4719 * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4720 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4721 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4722 syn_cmd_keyword(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4723 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
4724 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4725 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4726 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4727 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4728 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4729 char_u *rest;
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4730 char_u *keyword_copy = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4731 char_u *p;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4732 char_u *kw;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4733 syn_opt_arg_T syn_opt_arg;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4734 int cnt;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4735 int conceal_char = NUL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4736
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4737 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4738
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4739 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4740 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4741 syn_id = syn_check_group(arg, (int)(group_name_end - arg));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4742 if (syn_id != 0)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4743 /* allocate a buffer, for removing backslashes in the keyword */
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
4744 keyword_copy = alloc((unsigned)STRLEN(rest) + 1);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4745 if (keyword_copy != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4746 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4747 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4748 syn_opt_arg.keyword = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4749 syn_opt_arg.sync_idx = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4750 syn_opt_arg.has_cont_list = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4751 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4752 syn_opt_arg.next_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4753
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4754 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4755 * The options given apply to ALL keywords, so all options must be
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4756 * found before keywords can be created.
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4757 * 1: collect the options and copy the keywords to keyword_copy.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4758 */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4759 cnt = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4760 p = keyword_copy;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4761 for ( ; rest != NULL && !ends_excmd(*rest); rest = skipwhite(rest))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4762 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4763 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4764 if (rest == NULL || ends_excmd(*rest))
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4765 break;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4766 /* Copy the keyword, removing backslashes, and add a NUL. */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4767 while (*rest != NUL && !vim_iswhite(*rest))
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4768 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4769 if (*rest == '\\' && rest[1] != NUL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4770 ++rest;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4771 *p++ = *rest++;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4772 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4773 *p++ = NUL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4774 ++cnt;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4775 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4776
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4777 if (!eap->skip)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4778 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4779 /* Adjust flags for use of ":syn include". */
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4780 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4781
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4782 /*
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4783 * 2: Add an entry for each keyword.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4784 */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4785 for (kw = keyword_copy; --cnt >= 0; kw += STRLEN(kw) + 1)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4786 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4787 for (p = vim_strchr(kw, '['); ; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4788 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4789 if (p != NULL)
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4790 *p = NUL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4791 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
4792 syn_opt_arg.cont_in_list,
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4793 syn_opt_arg.next_list, conceal_char);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4794 if (p == NULL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4795 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4796 if (p[1] == NUL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4797 {
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 836
diff changeset
4798 EMSG2(_("E789: Missing ']': %s"), kw);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4799 kw = p + 2; /* skip over the NUL */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4800 break;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4801 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4802 if (p[1] == ']')
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4803 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4804 kw = p + 1; /* skip over the "]" */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4805 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4806 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4807 #ifdef FEAT_MBYTE
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4808 if (has_mbyte)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4809 {
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 448
diff changeset
4810 int l = (*mb_ptr2len)(p + 1);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4811
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4812 mch_memmove(p, p + 1, l);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4813 p += l;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4814 }
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4815 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4816 #endif
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4817 {
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4818 p[0] = p[1];
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4819 ++p;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4820 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4821 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4822 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4823 }
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4824
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4825 vim_free(keyword_copy);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4826 vim_free(syn_opt_arg.cont_in_list);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 154
diff changeset
4827 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4828 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4829 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4830
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4831 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4832 eap->nextcmd = check_nextcmd(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4833 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4834 EMSG2(_(e_invarg2), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4835
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
4836 redraw_curbuf_later(SOME_VALID);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4837 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4838 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4839
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4840 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4841 * Handle ":syntax match {name} [{options}] {pattern} [{options}]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4842 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4843 * Also ":syntax sync match {name} [[grouphere | groupthere] {group-name}] .."
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4844 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4845 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4846 syn_cmd_match(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4847 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4848 int syncing; /* TRUE for ":syntax sync match .. " */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4849 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4850 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4851 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4852 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4853 synpat_T item; /* the item found in the line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4854 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4855 int idx;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4856 syn_opt_arg_T syn_opt_arg;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4857 int sync_idx = 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4858 int conceal_char = NUL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4859
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4860 /* Isolate the group name, check for validity */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4861 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4862
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4863 /* Get options before the pattern */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4864 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4865 syn_opt_arg.keyword = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4866 syn_opt_arg.sync_idx = syncing ? &sync_idx : NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4867 syn_opt_arg.has_cont_list = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4868 syn_opt_arg.cont_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4869 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4870 syn_opt_arg.next_list = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4871 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4872
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4873 /* get the pattern. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4874 init_syn_patterns();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4875 vim_memset(&item, 0, sizeof(item));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4876 rest = get_syn_pattern(rest, &item);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4877 if (vim_regcomp_had_eol() && !(syn_opt_arg.flags & HL_EXCLUDENL))
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4878 syn_opt_arg.flags |= HL_HAS_EOL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4879
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4880 /* Get options after the pattern */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4881 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4882
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4883 if (rest != NULL) /* all arguments are valid */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4884 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4885 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4886 * Check for trailing command and illegal trailing arguments.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4887 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4888 eap->nextcmd = check_nextcmd(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4889 if (!ends_excmd(*rest) || eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4890 rest = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4891 else if (ga_grow(&curwin->w_s->b_syn_patterns, 1) != FAIL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4892 && (syn_id = syn_check_group(arg,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4893 (int)(group_name_end - arg))) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4894 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4895 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4896 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4897 * Store the pattern in the syn_items list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4898 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4899 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
4900 SYN_ITEMS(curwin->w_s)[idx] = item;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4901 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
4902 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
4903 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
4904 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
4905 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
4906 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
4907 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
4908 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4909 syn_opt_arg.cont_in_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4910 #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
4911 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
4912 #endif
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4913 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
4914 curwin->w_s->b_syn_containedin = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4915 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
4916 ++curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4917
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4918 /* remember that we found a match for syncing on */
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4919 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
4920 curwin->w_s->b_syn_sync_flags |= SF_MATCH;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4921 #ifdef FEAT_FOLDING
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4922 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
4923 ++curwin->w_s->b_syn_folditems;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4924 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4925
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
4926 redraw_curbuf_later(SOME_VALID);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
4927 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4928 return; /* don't free the progs and patterns now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4929 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4930 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4931
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4932 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4933 * Something failed, free the allocated memory.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4934 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4935 vim_free(item.sp_prog);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4936 vim_free(item.sp_pattern);
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4937 vim_free(syn_opt_arg.cont_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4938 vim_free(syn_opt_arg.cont_in_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4939 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4940
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4941 if (rest == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4942 EMSG2(_(e_invarg2), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4943 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4944
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4945 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4946 * Handle ":syntax region {group-name} [matchgroup={group-name}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4947 * start {start} .. [skip {skip}] end {end} .. [{options}]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4948 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4949 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4950 syn_cmd_region(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4951 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4952 int syncing; /* TRUE for ":syntax sync region .." */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4953 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4954 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4955 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4956 char_u *rest; /* next arg, NULL on error */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4957 char_u *key_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4958 char_u *key = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4959 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4960 int item;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4961 #define ITEM_START 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4962 #define ITEM_SKIP 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4963 #define ITEM_END 2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4964 #define ITEM_MATCHGROUP 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4965 struct pat_ptr
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4966 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4967 synpat_T *pp_synp; /* pointer to syn_pattern */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4968 int pp_matchgroup_id; /* matchgroup ID */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4969 struct pat_ptr *pp_next; /* pointer to next pat_ptr */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4970 } *(pat_ptrs[3]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4971 /* patterns found in the line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4972 struct pat_ptr *ppp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4973 struct pat_ptr *ppp_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4974 int pat_count = 0; /* nr of syn_patterns found */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4975 int syn_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4976 int matchgroup_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4977 int not_enough = FALSE; /* not enough arguments */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4978 int illegal = FALSE; /* illegal arguments */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4979 int success = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4980 int idx;
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4981 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
4982 int conceal_char = NUL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4983
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4984 /* Isolate the group name, check for validity */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4985 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4986
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4987 pat_ptrs[0] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4988 pat_ptrs[1] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4989 pat_ptrs[2] = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4990
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4991 init_syn_patterns();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4992
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4993 syn_opt_arg.flags = 0;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4994 syn_opt_arg.keyword = FALSE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4995 syn_opt_arg.sync_idx = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4996 syn_opt_arg.has_cont_list = TRUE;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4997 syn_opt_arg.cont_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4998 syn_opt_arg.cont_in_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
4999 syn_opt_arg.next_list = NULL;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5000
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5001 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5002 * get the options, patterns and matchgroup.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5003 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5004 while (rest != NULL && !ends_excmd(*rest))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5005 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5006 /* Check for option arguments */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5007 rest = get_syn_options(rest, &syn_opt_arg, &conceal_char);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5008 if (rest == NULL || ends_excmd(*rest))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5009 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5010
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5011 /* must be a pattern or matchgroup then */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5012 key_end = rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5013 while (*key_end && !vim_iswhite(*key_end) && *key_end != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5014 ++key_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5015 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5016 key = vim_strnsave_up(rest, (int)(key_end - rest));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5017 if (key == NULL) /* out of memory */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5018 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5019 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5020 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5021 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5022 if (STRCMP(key, "MATCHGROUP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5023 item = ITEM_MATCHGROUP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5024 else if (STRCMP(key, "START") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5025 item = ITEM_START;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5026 else if (STRCMP(key, "END") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5027 item = ITEM_END;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5028 else if (STRCMP(key, "SKIP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5029 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5030 if (pat_ptrs[ITEM_SKIP] != NULL) /* one skip pattern allowed */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5031 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5032 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5033 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5034 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5035 item = ITEM_SKIP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5036 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5037 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5038 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5039 rest = skipwhite(key_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5040 if (*rest != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5041 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5042 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5043 EMSG2(_("E398: Missing '=': %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5044 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5045 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5046 rest = skipwhite(rest + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5047 if (*rest == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5048 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5049 not_enough = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5050 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5051 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5052
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5053 if (item == ITEM_MATCHGROUP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5054 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5055 p = skiptowhite(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5056 if ((p - rest == 4 && STRNCMP(rest, "NONE", 4) == 0) || eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5057 matchgroup_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5058 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5059 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5060 matchgroup_id = syn_check_group(rest, (int)(p - rest));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5061 if (matchgroup_id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5062 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5063 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5064 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5065 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5066 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5067 rest = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5068 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5069 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5070 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5071 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5072 * Allocate room for a syn_pattern, and link it in the list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5073 * syn_patterns for this item, at the start (because the list is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5074 * used from end to start).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5075 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5076 ppp = (struct pat_ptr *)alloc((unsigned)sizeof(struct pat_ptr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5077 if (ppp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5078 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5079 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5080 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5081 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5082 ppp->pp_next = pat_ptrs[item];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5083 pat_ptrs[item] = ppp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5084 ppp->pp_synp = (synpat_T *)alloc_clear((unsigned)sizeof(synpat_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5085 if (ppp->pp_synp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5086 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5087 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5088 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5089 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5090
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5091 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5092 * Get the syntax pattern and the following offset(s).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5093 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5094 /* Enable the appropriate \z specials. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5095 if (item == ITEM_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5096 reg_do_extmatch = REX_SET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5097 else if (item == ITEM_SKIP || item == ITEM_END)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5098 reg_do_extmatch = REX_USE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5099 rest = get_syn_pattern(rest, ppp->pp_synp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5100 reg_do_extmatch = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5101 if (item == ITEM_END && vim_regcomp_had_eol()
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5102 && !(syn_opt_arg.flags & HL_EXCLUDENL))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5103 ppp->pp_synp->sp_flags |= HL_HAS_EOL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5104 ppp->pp_matchgroup_id = matchgroup_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5105 ++pat_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5106 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5107 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5108 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5109 if (illegal || not_enough)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5110 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5111
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5112 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5113 * Must have a "start" and "end" pattern.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5114 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5115 if (rest != NULL && (pat_ptrs[ITEM_START] == NULL ||
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5116 pat_ptrs[ITEM_END] == NULL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5117 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5118 not_enough = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5119 rest = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5120 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5121
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5122 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5123 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5124 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5125 * Check for trailing garbage or command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5126 * If OK, add the item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5127 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5128 eap->nextcmd = check_nextcmd(rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5129 if (!ends_excmd(*rest) || eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5130 rest = NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5131 else if (ga_grow(&(curwin->w_s->b_syn_patterns), pat_count) != FAIL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5132 && (syn_id = syn_check_group(arg,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5133 (int)(group_name_end - arg))) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5134 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5135 syn_incl_toplevel(syn_id, &syn_opt_arg.flags);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5136 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5137 * Store the start/skip/end in the syn_items list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5138 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5139 idx = curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5140 for (item = ITEM_START; item <= ITEM_END; ++item)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5141 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5142 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp->pp_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5143 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5144 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
5145 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
5146 SYN_ITEMS(curwin->w_s)[idx].sp_type =
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5147 (item == ITEM_START) ? SPTYPE_START :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5148 (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
5149 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
5150 SYN_ITEMS(curwin->w_s)[idx].sp_syn.id = syn_id;
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5151 SYN_ITEMS(curwin->w_s)[idx].sp_syn.inc_tag =
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5152 current_syn_inc_tag;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5153 SYN_ITEMS(curwin->w_s)[idx].sp_syn_match_id =
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5154 ppp->pp_matchgroup_id;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5155 #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
5156 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
5157 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5158 if (item == ITEM_START)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5159 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5160 SYN_ITEMS(curwin->w_s)[idx].sp_cont_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5161 syn_opt_arg.cont_list;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5162 SYN_ITEMS(curwin->w_s)[idx].sp_syn.cont_in_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5163 syn_opt_arg.cont_in_list;
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5164 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
5165 curwin->w_s->b_syn_containedin = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5166 SYN_ITEMS(curwin->w_s)[idx].sp_next_list =
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5167 syn_opt_arg.next_list;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5168 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5169 ++curwin->w_s->b_syn_patterns.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5170 ++idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5171 #ifdef FEAT_FOLDING
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5172 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
5173 ++curwin->w_s->b_syn_folditems;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5174 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5175 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5176 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5177
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5178 redraw_curbuf_later(SOME_VALID);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5179 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5180 success = TRUE; /* don't free the progs and patterns now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5181 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5182 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5183
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5184 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5185 * Free the allocated memory.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5186 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5187 for (item = ITEM_START; item <= ITEM_END; ++item)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5188 for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5189 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5190 if (!success)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5191 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5192 vim_free(ppp->pp_synp->sp_prog);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5193 vim_free(ppp->pp_synp->sp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5194 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5195 vim_free(ppp->pp_synp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5196 ppp_next = ppp->pp_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5197 vim_free(ppp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5199
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5200 if (!success)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5201 {
154
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5202 vim_free(syn_opt_arg.cont_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5203 vim_free(syn_opt_arg.cont_in_list);
1a145815483e updated for version 7.0047
vimboss
parents: 148
diff changeset
5204 vim_free(syn_opt_arg.next_list);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5205 if (not_enough)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5206 EMSG2(_("E399: Not enough arguments: syntax region %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5207 else if (illegal || rest == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5208 EMSG2(_(e_invarg2), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5209 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5210 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5211
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5212 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5213 * A simple syntax group ID comparison function suitable for use in qsort()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5214 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5215 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5216 #ifdef __BORLANDC__
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5217 _RTLENTRYF
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5218 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5219 syn_compare_stub(v1, v2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5220 const void *v1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5221 const void *v2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5222 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5223 const short *s1 = v1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5224 const short *s2 = v2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5225
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5226 return (*s1 > *s2 ? 1 : *s1 < *s2 ? -1 : 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5227 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5228
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5229 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5230 * Combines lists of syntax clusters.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5231 * *clstr1 and *clstr2 must both be allocated memory; they will be consumed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5232 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5233 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5234 syn_combine_list(clstr1, clstr2, list_op)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5235 short **clstr1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5236 short **clstr2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5237 int list_op;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5238 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5239 int count1 = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5240 int count2 = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5241 short *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5242 short *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5243 short *clstr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5244 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5245 int round;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5246
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5247 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5248 * Handle degenerate cases.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5249 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5250 if (*clstr2 == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5251 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5252 if (*clstr1 == NULL || list_op == CLUSTER_REPLACE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5253 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5254 if (list_op == CLUSTER_REPLACE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5255 vim_free(*clstr1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5256 if (list_op == CLUSTER_REPLACE || list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5257 *clstr1 = *clstr2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5258 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5259 vim_free(*clstr2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5260 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5261 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5262
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5263 for (g1 = *clstr1; *g1; g1++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5264 ++count1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5265 for (g2 = *clstr2; *g2; g2++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5266 ++count2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5267
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5268 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5269 * For speed purposes, sort both lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5270 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5271 qsort(*clstr1, (size_t)count1, sizeof(short), syn_compare_stub);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5272 qsort(*clstr2, (size_t)count2, sizeof(short), syn_compare_stub);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5273
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5274 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5275 * We proceed in two passes; in round 1, we count the elements to place
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5276 * in the new list, and in round 2, we allocate and populate the new
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5277 * list. For speed, we use a mergesort-like method, adding the smaller
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5278 * of the current elements in each list to the new list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5279 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5280 for (round = 1; round <= 2; round++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5281 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5282 g1 = *clstr1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5283 g2 = *clstr2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5284 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5285
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5286 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5287 * First, loop through the lists until one of them is empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5288 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5289 while (*g1 && *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5290 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5291 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5292 * We always want to add from the first list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5293 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5294 if (*g1 < *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5295 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5296 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5297 clstr[count] = *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5298 count++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5299 g1++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5300 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5301 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5302 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5303 * We only want to add from the second list if we're adding the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5304 * lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5305 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5306 if (list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5307 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5308 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5309 clstr[count] = *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5310 count++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5311 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5312 if (*g1 == *g2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5313 g1++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5314 g2++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5315 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5316
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5317 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5318 * Now add the leftovers from whichever list didn't get finished
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5319 * first. As before, we only want to add from the second list if
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5320 * we're adding the lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5321 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5322 for (; *g1; g1++, count++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5323 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5324 clstr[count] = *g1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5325 if (list_op == CLUSTER_ADD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5326 for (; *g2; g2++, count++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5327 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5328 clstr[count] = *g2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5329
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5330 if (round == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5331 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5332 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5333 * If the group ended up empty, we don't need to allocate any
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5334 * space for it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5335 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5336 if (count == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5337 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5338 clstr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5339 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5340 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5341 clstr = (short *)alloc((unsigned)((count + 1) * sizeof(short)));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5342 if (clstr == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5343 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5344 clstr[count] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5345 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5346 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5347
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5348 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5349 * Finally, put the new list in place.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5350 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5351 vim_free(*clstr1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5352 vim_free(*clstr2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5353 *clstr1 = clstr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5355
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5356 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5357 * Lookup a syntax cluster name and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5358 * If it is not found, 0 is returned.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5359 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5360 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5361 syn_scl_name2id(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5362 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5363 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5364 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5365 char_u *name_u;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5366
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5367 /* Avoid using stricmp() too much, it's slow on some systems */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5368 name_u = vim_strsave_up(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5369 if (name_u == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5370 return 0;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5371 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
5372 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
5373 && STRCMP(name_u, SYN_CLSTR(curwin->w_s)[i].scl_name_u) == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5374 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5375 vim_free(name_u);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5376 return (i < 0 ? 0 : i + SYNID_CLUSTER);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5377 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5378
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5379 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5380 * Like syn_scl_name2id(), but take a pointer + length argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5381 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5382 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5383 syn_scl_namen2id(linep, len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5384 char_u *linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5385 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5386 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5387 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5388 int id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5389
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5390 name = vim_strnsave(linep, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5391 if (name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5392 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5393 id = syn_scl_name2id(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5394 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5395 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5396 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5397 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5398
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5399 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5400 * Find syntax cluster name in the table and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5401 * The argument is a pointer to the name and the length of the name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5402 * If it doesn't exist yet, a new entry is created.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5403 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5404 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5405 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5406 syn_check_cluster(pp, len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5407 char_u *pp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5408 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5409 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5410 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5411 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5412
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5413 name = vim_strnsave(pp, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5414 if (name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5415 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5416
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5417 id = syn_scl_name2id(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5418 if (id == 0) /* doesn't exist yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5419 id = syn_add_cluster(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5420 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5421 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5422 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5423 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5424
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5425 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5426 * Add new syntax cluster and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5427 * "name" must be an allocated string, it will be consumed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5428 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5429 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5430 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5431 syn_add_cluster(name)
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5432 char_u *name;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5433 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5434 int len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5435
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5436 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5437 * First call for this growarray: init growing array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5438 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5439 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
5440 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5441 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
5442 curwin->w_s->b_syn_clusters.ga_growsize = 10;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5443 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5444
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5445 len = curwin->w_s->b_syn_clusters.ga_len;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5446 if (len >= MAX_CLUSTER_ID)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5447 {
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5448 EMSG((char_u *)_("E848: Too many syntax clusters"));
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5449 vim_free(name);
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5450 return 0;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5451 }
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5452
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5453 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5454 * Make room for at least one other cluster entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5455 */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5456 if (ga_grow(&curwin->w_s->b_syn_clusters, 1) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5457 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5458 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5459 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5460 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5461
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5462 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
5463 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
5464 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
5465 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
5466 ++curwin->w_s->b_syn_clusters.ga_len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5467
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5468 if (STRICMP(name, "Spell") == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5469 curwin->w_s->b_spell_cluster_id = len + SYNID_CLUSTER;
227
ef254e0f2365 updated for version 7.0063
vimboss
parents: 221
diff changeset
5470 if (STRICMP(name, "NoSpell") == 0)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5471 curwin->w_s->b_nospell_cluster_id = len + SYNID_CLUSTER;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
5472
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5473 return len + SYNID_CLUSTER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5474 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5475
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5476 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5477 * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5478 * [add={groupname},..] [remove={groupname},..]".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5479 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5480 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5481 syn_cmd_cluster(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5482 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
5483 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5484 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5485 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5486 char_u *group_name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5487 char_u *rest;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5488 int scl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5489 short *clstr_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5490 int got_clstr = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5491 int opt_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5492 int list_op;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5493
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5494 eap->nextcmd = find_nextcmd(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5495 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5496 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5497
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5498 rest = get_group_name(arg, &group_name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5499
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5500 if (rest != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5501 {
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5502 scl_id = syn_check_cluster(arg, (int)(group_name_end - arg));
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5503 if (scl_id == 0)
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5504 return;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5505 scl_id -= SYNID_CLUSTER;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5506
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5507 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5508 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5509 if (STRNICMP(rest, "add", 3) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5510 && (vim_iswhite(rest[3]) || rest[3] == '='))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5511 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5512 opt_len = 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5513 list_op = CLUSTER_ADD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5514 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5515 else if (STRNICMP(rest, "remove", 6) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5516 && (vim_iswhite(rest[6]) || rest[6] == '='))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5517 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5518 opt_len = 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5519 list_op = CLUSTER_SUBTRACT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5520 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5521 else if (STRNICMP(rest, "contains", 8) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5522 && (vim_iswhite(rest[8]) || rest[8] == '='))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5523 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5524 opt_len = 8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5525 list_op = CLUSTER_REPLACE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5526 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5527 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5528 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5529
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5530 clstr_list = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5531 if (get_id_list(&rest, opt_len, &clstr_list) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5532 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5533 EMSG2(_(e_invarg2), rest);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5534 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5535 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5536 syn_combine_list(&SYN_CLSTR(curwin->w_s)[scl_id].scl_list,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5537 &clstr_list, list_op);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5538 got_clstr = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5539 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5540
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5541 if (got_clstr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5542 {
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5543 redraw_curbuf_later(SOME_VALID);
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
5544 syn_stack_free_all(curwin->w_s); /* Need to recompute all. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5545 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5546 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5547
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5548 if (!got_clstr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5549 EMSG(_("E400: No cluster specified"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5550 if (rest == NULL || !ends_excmd(*rest))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5551 EMSG2(_(e_invarg2), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5552 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5553
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5554 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5555 * On first call for current buffer: Init growing array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5556 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5557 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5558 init_syn_patterns()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5559 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5560 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
5561 curwin->w_s->b_syn_patterns.ga_growsize = 10;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5562 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5563
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5564 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5565 * Get one pattern for a ":syntax match" or ":syntax region" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5566 * Stores the pattern and program in a synpat_T.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5567 * Returns a pointer to the next argument, or NULL in case of an error.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5568 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5569 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5570 get_syn_pattern(arg, ci)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5571 char_u *arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5572 synpat_T *ci;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5573 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5574 char_u *end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5575 int *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5576 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5577 char_u *cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5578
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5579 /* need at least three chars */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5580 if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5581 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5582
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5583 end = skip_regexp(arg + 1, *arg, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5584 if (*end != *arg) /* end delimiter not found */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5585 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5586 EMSG2(_("E401: Pattern delimiter not found: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5587 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5588 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5589 /* store the pattern and compiled regexp program */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5590 if ((ci->sp_pattern = vim_strnsave(arg + 1, (int)(end - arg - 1))) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5591 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5592
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5593 /* Make 'cpoptions' empty, to avoid the 'l' flag */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5594 cpo_save = p_cpo;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5595 p_cpo = (char_u *)"";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5596 ci->sp_prog = vim_regcomp(ci->sp_pattern, RE_MAGIC);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5597 p_cpo = cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5598
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5599 if (ci->sp_prog == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5600 return NULL;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5601 ci->sp_ic = curwin->w_s->b_syn_ic;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5602
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5603 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5604 * Check for a match, highlight or region offset.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5605 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5606 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5607 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5608 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5609 for (idx = SPO_COUNT; --idx >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5610 if (STRNCMP(end, spo_name_tab[idx], 3) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5611 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5612 if (idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5613 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5614 p = &(ci->sp_offsets[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5615 if (idx != SPO_LC_OFF)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5616 switch (end[3])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5617 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5618 case 's': break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5619 case 'b': break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5620 case 'e': idx += SPO_COUNT; break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5621 default: idx = -1; break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5622 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5623 if (idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5624 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5625 ci->sp_off_flags |= (1 << idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5626 if (idx == SPO_LC_OFF) /* lc=99 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5627 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5628 end += 3;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5629 *p = getdigits(&end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5630
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5631 /* "lc=" offset automatically sets "ms=" offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5632 if (!(ci->sp_off_flags & (1 << SPO_MS_OFF)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5633 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5634 ci->sp_off_flags |= (1 << SPO_MS_OFF);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5635 ci->sp_offsets[SPO_MS_OFF] = *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5636 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5637 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5638 else /* yy=x+99 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5639 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5640 end += 4;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5641 if (*end == '+')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5642 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5643 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5644 *p = getdigits(&end); /* positive offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5645 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5646 else if (*end == '-')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5647 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5648 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5649 *p = -getdigits(&end); /* negative offset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5650 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5651 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5652 if (*end != ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5653 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5654 ++end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5655 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5656 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5657 } while (idx >= 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5658
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5659 if (!ends_excmd(*end) && !vim_iswhite(*end))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5660 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5661 EMSG2(_("E402: Garbage after pattern: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5662 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5663 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5664 return skipwhite(end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5665 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5666
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5667 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5668 * Handle ":syntax sync .." command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5669 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5670 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5671 syn_cmd_sync(eap, syncing)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5672 exarg_T *eap;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
5673 int syncing UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5674 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5675 char_u *arg_start = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5676 char_u *arg_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5677 char_u *key = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5678 char_u *next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5679 int illegal = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5680 int finished = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5681 long n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5682 char_u *cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5683
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5684 if (ends_excmd(*arg_start))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5685 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5686 syn_cmd_list(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5687 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5688 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5689
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5690 while (!ends_excmd(*arg_start))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5691 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5692 arg_end = skiptowhite(arg_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5693 next_arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5694 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5695 key = vim_strnsave_up(arg_start, (int)(arg_end - arg_start));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5696 if (STRCMP(key, "CCOMMENT") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5697 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5698 if (!eap->skip)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5699 curwin->w_s->b_syn_sync_flags |= SF_CCOMMENT;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5700 if (!ends_excmd(*next_arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5701 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5702 arg_end = skiptowhite(next_arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5703 if (!eap->skip)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5704 curwin->w_s->b_syn_sync_id = syn_check_group(next_arg,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5705 (int)(arg_end - next_arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5706 next_arg = skipwhite(arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5707 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5708 else if (!eap->skip)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5709 curwin->w_s->b_syn_sync_id = syn_name2id((char_u *)"Comment");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5710 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5711 else if ( STRNCMP(key, "LINES", 5) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5712 || STRNCMP(key, "MINLINES", 8) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5713 || STRNCMP(key, "MAXLINES", 8) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5714 || STRNCMP(key, "LINEBREAKS", 10) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5715 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5716 if (key[4] == 'S')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5717 arg_end = key + 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5718 else if (key[0] == 'L')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5719 arg_end = key + 11;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5720 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5721 arg_end = key + 9;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5722 if (arg_end[-1] != '=' || !VIM_ISDIGIT(*arg_end))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5723 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5724 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5725 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5726 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5727 n = getdigits(&arg_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5728 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5729 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5730 if (key[4] == 'B')
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5731 curwin->w_s->b_syn_sync_linebreaks = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5732 else if (key[1] == 'A')
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5733 curwin->w_s->b_syn_sync_maxlines = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5734 else
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5735 curwin->w_s->b_syn_sync_minlines = n;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5736 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5737 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5738 else if (STRCMP(key, "FROMSTART") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5739 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5740 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5741 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5742 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
5743 curwin->w_s->b_syn_sync_maxlines = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5744 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5745 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5746 else if (STRCMP(key, "LINECONT") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5747 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5748 if (curwin->w_s->b_syn_linecont_pat != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5749 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5750 EMSG(_("E403: syntax sync: line continuations pattern specified twice"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5751 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5752 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5753 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5754 arg_end = skip_regexp(next_arg + 1, *next_arg, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5755 if (*arg_end != *next_arg) /* end delimiter not found */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5756 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5757 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5758 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5759 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5760
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5761 if (!eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5762 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5763 /* 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
5764 if ((curwin->w_s->b_syn_linecont_pat = vim_strnsave(next_arg + 1,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5765 (int)(arg_end - next_arg - 1))) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5766 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5767 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5768 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5769 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5770 curwin->w_s->b_syn_linecont_ic = curwin->w_s->b_syn_ic;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5771
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5772 /* Make 'cpoptions' empty, to avoid the 'l' flag */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5773 cpo_save = p_cpo;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5774 p_cpo = (char_u *)"";
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5775 curwin->w_s->b_syn_linecont_prog =
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5776 vim_regcomp(curwin->w_s->b_syn_linecont_pat, RE_MAGIC);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5777 p_cpo = cpo_save;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5778
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5779 if (curwin->w_s->b_syn_linecont_prog == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5780 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5781 vim_free(curwin->w_s->b_syn_linecont_pat);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5782 curwin->w_s->b_syn_linecont_pat = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5783 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5784 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5785 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5786 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5787 next_arg = skipwhite(arg_end + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5788 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5789 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5790 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5791 eap->arg = next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5792 if (STRCMP(key, "MATCH") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5793 syn_cmd_match(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5794 else if (STRCMP(key, "REGION") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5795 syn_cmd_region(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5796 else if (STRCMP(key, "CLEAR") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5797 syn_cmd_clear(eap, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5798 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5799 illegal = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5800 finished = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5801 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5802 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5803 arg_start = next_arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5804 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5805 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5806 if (illegal)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5807 EMSG2(_("E404: Illegal arguments: %s"), arg_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5808 else if (!finished)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5809 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5810 eap->nextcmd = check_nextcmd(arg_start);
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
5811 redraw_curbuf_later(SOME_VALID);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
5812 syn_stack_free_all(curwin->w_s); /* Need to recompute all syntax. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5813 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5814 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5815
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5816 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5817 * Convert a line of highlight group names into a list of group ID numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5818 * "arg" should point to the "contains" or "nextgroup" keyword.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5819 * "arg" is advanced to after the last group name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5820 * Careful: the argument is modified (NULs added).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5821 * returns FAIL for some error, OK for success.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5822 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5823 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5824 get_id_list(arg, keylen, list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5825 char_u **arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5826 int keylen; /* length of keyword */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5827 short **list; /* where to store the resulting list, if not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5828 NULL, the list is silently skipped! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5829 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5830 char_u *p = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5831 char_u *end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5832 int round;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5833 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5834 int total_count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5835 short *retval = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5836 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5837 regmatch_T regmatch;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5838 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5839 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5840 int failed = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5841
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5842 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5843 * We parse the list twice:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5844 * round == 1: count the number of items, allocate the array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5845 * round == 2: fill the array with the items.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5846 * In round 1 new groups may be added, causing the number of items to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5847 * grow when a regexp is used. In that case round 1 is done once again.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5848 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5849 for (round = 1; round <= 2; ++round)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5850 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5851 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5852 * skip "contains"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5853 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5854 p = skipwhite(*arg + keylen);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5855 if (*p != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5856 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5857 EMSG2(_("E405: Missing equal sign: %s"), *arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5858 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5859 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5860 p = skipwhite(p + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5861 if (ends_excmd(*p))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5862 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5863 EMSG2(_("E406: Empty argument: %s"), *arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5864 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5865 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5866
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5867 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5868 * parse the arguments after "contains"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5869 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5870 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5871 while (!ends_excmd(*p))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5872 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5873 for (end = p; *end && !vim_iswhite(*end) && *end != ','; ++end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5874 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5875 name = alloc((int)(end - p + 3)); /* leave room for "^$" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5876 if (name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5877 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5878 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5879 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5880 }
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
5881 vim_strncpy(name + 1, p, end - p);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5882 if ( STRCMP(name + 1, "ALLBUT") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5883 || STRCMP(name + 1, "ALL") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5884 || STRCMP(name + 1, "TOP") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5885 || STRCMP(name + 1, "CONTAINED") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5886 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5887 if (TOUPPER_ASC(**arg) != 'C')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5888 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5889 EMSG2(_("E407: %s not allowed here"), name + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5890 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5891 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5892 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5893 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5894 if (count != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5895 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5896 EMSG2(_("E408: %s must be first in contains list"), name + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5897 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5898 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5899 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5900 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5901 if (name[1] == 'A')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5902 id = SYNID_ALLBUT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5903 else if (name[1] == 'T')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5904 id = SYNID_TOP;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5905 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5906 id = SYNID_CONTAINED;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5907 id += current_syn_inc_tag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5908 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5909 else if (name[1] == '@')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5910 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5911 id = syn_check_cluster(name + 2, (int)(end - p - 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5912 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5913 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5914 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5915 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5916 * Handle full group name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5917 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5918 if (vim_strpbrk(name + 1, (char_u *)"\\.*^$~[") == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5919 id = syn_check_group(name + 1, (int)(end - p));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5920 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5921 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5922 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5923 * Handle match of regexp with group names.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5924 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5925 *name = '^';
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5926 STRCAT(name, "$");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5927 regmatch.regprog = vim_regcomp(name, RE_MAGIC);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5928 if (regmatch.regprog == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5929 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5930 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5931 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5932 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5933 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5934
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5935 regmatch.rm_ic = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5936 id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5937 for (i = highlight_ga.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5938 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5939 if (vim_regexec(&regmatch, HL_TABLE()[i].sg_name,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5940 (colnr_T)0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5941 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5942 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5943 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5944 /* Got more items than expected; can happen
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5945 * when adding items that match:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5946 * "contains=a.*b,axb".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5947 * Go back to first round */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5948 if (count >= total_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5949 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5950 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5951 round = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5953 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5954 retval[count] = i + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5955 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5956 ++count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5957 id = -1; /* remember that we found one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5958 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5959 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5960 vim_free(regmatch.regprog);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5961 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5962 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5963 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5964 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5965 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5966 EMSG2(_("E409: Unknown group name: %s"), p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5967 failed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5968 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5969 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5970 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5971 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5972 if (round == 2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5973 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5974 /* Got more items than expected, go back to first round */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5975 if (count >= total_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5976 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5977 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5978 round = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5979 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5980 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5981 retval[count] = id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5982 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5983 ++count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5984 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5985 p = skipwhite(end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5986 if (*p != ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5987 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5988 p = skipwhite(p + 1); /* skip comma in between arguments */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5989 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5990 if (failed)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5991 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5992 if (round == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5993 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5994 retval = (short *)alloc((unsigned)((count + 1) * sizeof(short)));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5995 if (retval == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5996 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5997 retval[count] = 0; /* zero means end of the list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5998 total_count = count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5999 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6000 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6001
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6002 *arg = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6003 if (failed || retval == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6004 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6005 vim_free(retval);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6006 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6007 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6008
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6009 if (*list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6010 *list = retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6011 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6012 vim_free(retval); /* list already found, don't overwrite it */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6013
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6014 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6015 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6016
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6017 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6018 * Make a copy of an ID list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6019 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6020 static short *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6021 copy_id_list(list)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6022 short *list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6023 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6024 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6025 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6026 short *retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6027
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6028 if (list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6029 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6030
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6031 for (count = 0; list[count]; ++count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6032 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6033 len = (count + 1) * sizeof(short);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6034 retval = (short *)alloc((unsigned)len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6035 if (retval != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6036 mch_memmove(retval, list, (size_t)len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6037
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6038 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6039 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6040
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6041 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6042 * Check if syntax group "ssp" is in the ID list "list" of "cur_si".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6043 * "cur_si" can be NULL if not checking the "containedin" list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6044 * Used to check if a syntax item is in the "contains" or "nextgroup" list of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6045 * the current item.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6046 * This function is called very often, keep it fast!!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6047 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6048 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6049 in_id_list(cur_si, list, ssp, contained)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6050 stateitem_T *cur_si; /* current item or NULL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6051 short *list; /* id list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6052 struct sp_syn *ssp; /* group id and ":syn include" tag of group */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6053 int contained; /* group id is contained */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6054 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6055 int retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6056 short *scl_list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6057 short item;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6058 short id = ssp->id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6059 static int depth = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6060 int r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6061
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6062 /* If spp has a "containedin" list and "cur_si" is in it, return TRUE. */
36
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
6063 if (cur_si != NULL && ssp->cont_in_list != NULL
125e80798a85 updated for version 7.0021
vimboss
parents: 26
diff changeset
6064 && !(cur_si->si_flags & HL_MATCH))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6065 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6066 /* Ignore transparent items without a contains argument. Double check
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6067 * that we don't go back past the first one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6068 while ((cur_si->si_flags & HL_TRANS_CONT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6069 && cur_si > (stateitem_T *)(current_state.ga_data))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6070 --cur_si;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6071 /* cur_si->si_idx is -1 for keywords, these never contain anything. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6072 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
6073 &(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
6074 SYN_ITEMS(syn_block)[cur_si->si_idx].sp_flags & HL_CONTAINED))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6075 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6076 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6077
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6078 if (list == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6079 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6080
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6081 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6082 * If list is ID_LIST_ALL, we are in a transparent item that isn't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6083 * inside anything. Only allow not-contained groups.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6084 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6085 if (list == ID_LIST_ALL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6086 return !contained;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6087
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6088 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6089 * If the first item is "ALLBUT", return TRUE if "id" is NOT in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6090 * contains list. We also require that "id" is at the same ":syn include"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6091 * level as the list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6092 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6093 item = *list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6094 if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6095 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6096 if (item < SYNID_TOP)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6097 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6098 /* ALL or ALLBUT: accept all groups in the same file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6099 if (item - SYNID_ALLBUT != ssp->inc_tag)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6100 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6101 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6102 else if (item < SYNID_CONTAINED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6103 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6104 /* TOP: accept all not-contained groups in the same file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6105 if (item - SYNID_TOP != ssp->inc_tag || contained)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6106 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6107 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6108 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6109 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6110 /* CONTAINED: accept all contained groups in the same file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6111 if (item - SYNID_CONTAINED != ssp->inc_tag || !contained)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6112 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6113 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6114 item = *++list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6115 retval = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6116 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6117 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6118 retval = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6119
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6120 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6121 * Return "retval" if id is in the contains list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6122 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6123 while (item != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6124 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6125 if (item == id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6126 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6127 if (item >= SYNID_CLUSTER)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6128 {
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6129 scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6130 /* restrict recursiveness to 30 to avoid an endless loop for a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6131 * cluster that includes itself (indirectly) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6132 if (scl_list != NULL && depth < 30)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6133 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6134 ++depth;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6135 r = in_id_list(NULL, scl_list, ssp, contained);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6136 --depth;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6137 if (r)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6138 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6139 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6140 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6141 item = *++list;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6142 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6143 return !retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6144 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6145
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6146 struct subcommand
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6147 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6148 char *name; /* subcommand name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6149 void (*func)__ARGS((exarg_T *, int)); /* function to call */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6150 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6151
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6152 static struct subcommand subcommands[] =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6153 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6154 {"case", syn_cmd_case},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6155 {"clear", syn_cmd_clear},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6156 {"cluster", syn_cmd_cluster},
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6157 {"conceal", syn_cmd_conceal},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6158 {"enable", syn_cmd_enable},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6159 {"include", syn_cmd_include},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6160 {"keyword", syn_cmd_keyword},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6161 {"list", syn_cmd_list},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6162 {"manual", syn_cmd_manual},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6163 {"match", syn_cmd_match},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6164 {"on", syn_cmd_on},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6165 {"off", syn_cmd_off},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6166 {"region", syn_cmd_region},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6167 {"reset", syn_cmd_reset},
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
6168 {"spell", syn_cmd_spell},
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6169 {"sync", syn_cmd_sync},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6170 {"", syn_cmd_list},
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6171 {NULL, NULL}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6172 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6173
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6174 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6175 * ":syntax".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6176 * This searches the subcommands[] table for the subcommand name, and calls a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6177 * syntax_subcommand() function to do the rest.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6178 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6179 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6180 ex_syntax(eap)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6181 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6182 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6183 char_u *arg = eap->arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6184 char_u *subcmd_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6185 char_u *subcmd_name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6186 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6187
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6188 syn_cmdlinep = eap->cmdlinep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6189
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6190 /* isolate subcommand name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6191 for (subcmd_end = arg; ASCII_ISALPHA(*subcmd_end); ++subcmd_end)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6192 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6193 subcmd_name = vim_strnsave(arg, (int)(subcmd_end - arg));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6194 if (subcmd_name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6195 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6196 if (eap->skip) /* skip error messages for all subcommands */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6197 ++emsg_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6198 for (i = 0; ; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6199 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6200 if (subcommands[i].name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6201 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6202 EMSG2(_("E410: Invalid :syntax subcommand: %s"), subcmd_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6203 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6204 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6205 if (STRCMP(subcmd_name, (char_u *)subcommands[i].name) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6206 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6207 eap->arg = skipwhite(subcmd_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6208 (subcommands[i].func)(eap, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6209 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6210 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6211 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6212 vim_free(subcmd_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6213 if (eap->skip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6214 --emsg_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6215 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6216 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6217
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6218 void
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6219 ex_ownsyntax(eap)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6220 exarg_T *eap;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6221 {
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6222 char_u *old_value;
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6223 char_u *new_value;
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6224
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6225 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
6226 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6227 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
6228 memset(curwin->w_s, 0, sizeof(synblock_T));
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6229 #ifdef FEAT_SPELL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6230 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
6231 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
6232 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
6233 vim_free(curwin->w_s->b_cap_prog);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6234 curwin->w_s->b_cap_prog = NULL;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6235 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
6236 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6237 }
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6238
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6239 /* save value of b:current_syntax */
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6240 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
6241 if (old_value != NULL)
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6242 old_value = vim_strsave(old_value);
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6243
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6244 /* 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
6245 * file. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6246 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
6247
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6248 /* 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
6249 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
6250 if (new_value != NULL)
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6251 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
6252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6253 /* restore value of b:current_syntax */
2256
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6254 if (old_value == NULL)
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6255 do_unlet((char_u *)"b:current_syntax", TRUE);
8b3203df361f Fix crash for ":ownsyntax". (Dominique Pelle)
Bram Moolenaar <bram@vim.org>
parents: 2253
diff changeset
6256 else
2252
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6257 {
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6258 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
6259 vim_free(old_value);
a0b5918c33cc Fixed memory leak in ":ownsyntax".
Bram Moolenaar <bram@vim.org>
parents: 2251
diff changeset
6260 }
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6261 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6262
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6263 int
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6264 syntax_present(win)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6265 win_T *win;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6266 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6267 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
6268 || 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
6269 || 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
6270 || win->w_s->b_keywtab_ic.ht_used > 0);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6271 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6272
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6273 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6274
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6275 static enum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6276 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6277 EXP_SUBCMD, /* expand ":syn" sub-commands */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6278 EXP_CASE /* expand ":syn case" arguments */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6279 } expand_what;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6280
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6281 /*
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6282 * Reset include_link, include_default, include_none to 0.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6283 * Called when we are done expanding.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6284 */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6285 void
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6286 reset_expand_highlight()
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6287 {
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6288 include_link = include_default = include_none = 0;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6289 }
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6290
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6291 /*
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6292 * Handle command line completion for :match and :echohl command: Add "None"
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6293 * as highlight group.
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6294 */
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6295 void
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6296 set_context_in_echohl_cmd(xp, arg)
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6297 expand_T *xp;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6298 char_u *arg;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6299 {
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6300 xp->xp_context = EXPAND_HIGHLIGHT;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6301 xp->xp_pattern = arg;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6302 include_none = 1;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6303 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6304
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6305 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6306 * Handle command line completion for :syntax command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6307 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6308 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6309 set_context_in_syntax_cmd(xp, arg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6310 expand_T *xp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6311 char_u *arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6312 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6313 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6314
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6315 /* Default: expand subcommands */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6316 xp->xp_context = EXPAND_SYNTAX;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6317 expand_what = EXP_SUBCMD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6318 xp->xp_pattern = arg;
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6319 include_link = 0;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
6320 include_default = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6321
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6322 /* (part of) subcommand already typed */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6323 if (*arg != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6324 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6325 p = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6326 if (*p != NUL) /* past first word */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6327 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6328 xp->xp_pattern = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6329 if (*skiptowhite(xp->xp_pattern) != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6330 xp->xp_context = EXPAND_NOTHING;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6331 else if (STRNICMP(arg, "case", p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6332 expand_what = EXP_CASE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6333 else if ( STRNICMP(arg, "keyword", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6334 || STRNICMP(arg, "region", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6335 || STRNICMP(arg, "match", p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6336 || STRNICMP(arg, "list", p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6337 xp->xp_context = EXPAND_HIGHLIGHT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6338 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6339 xp->xp_context = EXPAND_NOTHING;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6340 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6341 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6342 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6343
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6344 static char *(case_args[]) = {"match", "ignore", NULL};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6345
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6346 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6347 * Function given to ExpandGeneric() to obtain the list syntax names for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6348 * expansion.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6349 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6350 char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6351 get_syntax_name(xp, idx)
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
6352 expand_T *xp UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6353 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6354 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6355 if (expand_what == EXP_SUBCMD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6356 return (char_u *)subcommands[idx].name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6357 return (char_u *)case_args[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6358 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6359
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6360 #endif /* FEAT_CMDL_COMPL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6361
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6362 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6363 * Function called for expression evaluation: get syntax ID at file position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6364 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6365 int
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6366 syn_get_id(wp, lnum, col, trans, spellp, keep_state)
499
08012a1ff8d4 updated for version 7.0137
vimboss
parents: 482
diff changeset
6367 win_T *wp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6368 long lnum;
253
62a331864307 updated for version 7.0069
vimboss
parents: 227
diff changeset
6369 colnr_T col;
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
6370 int trans; /* remove transparency */
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6371 int *spellp; /* return: can do spell checking */
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6372 int keep_state; /* keep state of char at "col" */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6373 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6374 /* When the position is not after the current position and in the same
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6375 * line of the same buffer, need to restart parsing. */
499
08012a1ff8d4 updated for version 7.0137
vimboss
parents: 482
diff changeset
6376 if (wp->w_buffer != syn_buf
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6377 || lnum != current_lnum
253
62a331864307 updated for version 7.0069
vimboss
parents: 227
diff changeset
6378 || col < current_col)
499
08012a1ff8d4 updated for version 7.0137
vimboss
parents: 482
diff changeset
6379 syntax_start(wp, lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6380
2375
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
6381 (void)get_syntax_attr(col, spellp, keep_state);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6382
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6383 return (trans ? current_trans_id : current_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6384 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6385
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6386 #if defined(FEAT_CONCEAL) || defined(PROTO)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6387 /*
2375
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
6388 * 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
6389 * 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
6390 * 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
6391 * 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
6392 */
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
6393 int
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
6394 get_syntax_info(seqnrp)
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
6395 int *seqnrp;
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
6396 {
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
6397 *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
6398 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
6399 }
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
6400
a96dd77ce213 For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents: 2318
diff changeset
6401 /*
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6402 * Return conceal substitution character
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 int
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6405 syn_get_sub_char()
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6406 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6407 return current_sub_char;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6408 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6409 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6410
1500
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6411 #if defined(FEAT_EVAL) || defined(PROTO)
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6412 /*
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6413 * Return the syntax ID at position "i" in the current stack.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6414 * The caller must have called syn_get_id() before to fill the stack.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6415 * Returns -1 when "i" is out of range.
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6416 */
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6417 int
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6418 syn_get_stack_item(i)
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6419 int i;
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6420 {
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6421 if (i >= current_state.ga_len)
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6422 {
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6423 /* Need to invalidate the state, because we didn't properly finish it
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6424 * for the last character, "keep_state" was TRUE. */
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6425 invalidate_current_state();
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6426 current_col = MAXCOL;
1500
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6427 return -1;
1504
1b55bbf5c580 updated for version 7.1-219
vimboss
parents: 1503
diff changeset
6428 }
1500
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6429 return CUR_STATE(i).si_id;
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6430 }
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6431 #endif
ea9f418ed072 updated for version 7.1-215
vimboss
parents: 1421
diff changeset
6432
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6433 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6434 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6435 * Function called to get folding level for line "lnum" in window "wp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6436 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6437 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6438 syn_get_foldlevel(wp, lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6439 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6440 long lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6441 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6442 int level = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6443 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6444
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6445 /* Return quickly when there are no fold items at all. */
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6446 if (wp->w_s->b_syn_folditems != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6447 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6448 syntax_start(wp, lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6449
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6450 for (i = 0; i < current_state.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6451 if (CUR_STATE(i).si_flags & HL_FOLD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6452 ++level;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6454 if (level > wp->w_p_fdn)
1028
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6455 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6456 level = wp->w_p_fdn;
1028
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6457 if (level < 0)
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6458 level = 0;
5044d9d784ed updated for version 7.0-154
vimboss
parents: 991
diff changeset
6459 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6460 return level;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6461 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6462 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6463
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6464 #endif /* FEAT_SYN_HL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6465
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6466 /**************************************
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6467 * Highlighting stuff *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6468 **************************************/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6469
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6470 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6471 * The default highlight groups. These are compiled-in for fast startup and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6472 * they still work when the runtime files can't be found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6473 * When making changes here, also change runtime/colors/default.vim!
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6474 * The #ifdefs are needed to reduce the amount of static data. Helps to make
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6475 * the 16 bit DOS (museum) version compile.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6476 */
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
6477 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6478 # define CENT(a, b) b
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6479 #else
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6480 # define CENT(a, b) a
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6481 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6482 static char *(highlight_init_both[]) =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6483 {
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6484 CENT("ErrorMsg term=standout ctermbg=DarkRed ctermfg=White",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6485 "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6486 CENT("IncSearch term=reverse cterm=reverse",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6487 "IncSearch term=reverse cterm=reverse gui=reverse"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6488 CENT("ModeMsg term=bold cterm=bold",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6489 "ModeMsg term=bold cterm=bold gui=bold"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6490 CENT("NonText term=bold ctermfg=Blue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6491 "NonText term=bold ctermfg=Blue gui=bold guifg=Blue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6492 CENT("StatusLine term=reverse,bold cterm=reverse,bold",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6493 "StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6494 CENT("StatusLineNC term=reverse cterm=reverse",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6495 "StatusLineNC term=reverse cterm=reverse gui=reverse"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6496 #ifdef FEAT_VERTSPLIT
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6497 CENT("VertSplit term=reverse cterm=reverse",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6498 "VertSplit term=reverse cterm=reverse gui=reverse"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6499 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6500 #ifdef FEAT_CLIPBOARD
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6501 CENT("VisualNOS term=underline,bold cterm=underline,bold",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6502 "VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6503 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6504 #ifdef FEAT_DIFF
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6505 CENT("DiffText term=reverse cterm=bold ctermbg=Red",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6506 "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6507 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6508 #ifdef FEAT_INS_EXPAND
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6509 CENT("PmenuThumb cterm=reverse",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6510 "PmenuThumb cterm=reverse gui=reverse"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6511 CENT("PmenuSbar ctermbg=Grey",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6512 "PmenuSbar ctermbg=Grey guibg=Grey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6513 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6514 #ifdef FEAT_WINDOWS
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6515 CENT("TabLineSel term=bold cterm=bold",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6516 "TabLineSel term=bold cterm=bold gui=bold"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6517 CENT("TabLineFill term=reverse cterm=reverse",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6518 "TabLineFill term=reverse cterm=reverse gui=reverse"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6519 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6520 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6521 "Cursor guibg=fg guifg=bg",
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6522 "lCursor guibg=fg guifg=bg", /* should be different, but what? */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6523 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6524 NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6525 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6526
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6527 static char *(highlight_init_light[]) =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6528 {
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6529 CENT("Directory term=bold ctermfg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6530 "Directory term=bold ctermfg=DarkBlue guifg=Blue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6531 CENT("LineNr term=underline ctermfg=Brown",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6532 "LineNr term=underline ctermfg=Brown guifg=Brown"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6533 CENT("MoreMsg term=bold ctermfg=DarkGreen",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6534 "MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6535 CENT("Question term=standout ctermfg=DarkGreen",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6536 "Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6537 CENT("Search term=reverse ctermbg=Yellow ctermfg=NONE",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6538 "Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6539 #ifdef FEAT_SPELL
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6540 CENT("SpellBad term=reverse ctermbg=LightRed",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6541 "SpellBad term=reverse ctermbg=LightRed guisp=Red gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6542 CENT("SpellCap term=reverse ctermbg=LightBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6543 "SpellCap term=reverse ctermbg=LightBlue guisp=Blue gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6544 CENT("SpellRare term=reverse ctermbg=LightMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6545 "SpellRare term=reverse ctermbg=LightMagenta guisp=Magenta gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6546 CENT("SpellLocal term=underline ctermbg=Cyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6547 "SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6548 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6549 #ifdef FEAT_INS_EXPAND
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6550 CENT("Pmenu ctermbg=LightMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6551 "Pmenu ctermbg=LightMagenta guibg=LightMagenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6552 CENT("PmenuSel ctermbg=LightGrey",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6553 "PmenuSel ctermbg=LightGrey guibg=Grey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6554 #endif
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6555 CENT("SpecialKey term=bold ctermfg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6556 "SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6557 CENT("Title term=bold ctermfg=DarkMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6558 "Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6559 CENT("WarningMsg term=standout ctermfg=DarkRed",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6560 "WarningMsg term=standout ctermfg=DarkRed guifg=Red"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6561 #ifdef FEAT_WILDMENU
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6562 CENT("WildMenu term=standout ctermbg=Yellow ctermfg=Black",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6563 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6564 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6565 #ifdef FEAT_FOLDING
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6566 CENT("Folded term=standout ctermbg=Grey ctermfg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6567 "Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6568 CENT("FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6569 "FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6570 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6571 #ifdef FEAT_SIGNS
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6572 CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6573 "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6574 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6575 #ifdef FEAT_VISUAL
836
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6576 CENT("Visual term=reverse",
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6577 "Visual term=reverse guibg=LightGrey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6578 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6579 #ifdef FEAT_DIFF
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6580 CENT("DiffAdd term=bold ctermbg=LightBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6581 "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6582 CENT("DiffChange term=bold ctermbg=LightMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6583 "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6584 CENT("DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6585 "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6586 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6587 #ifdef FEAT_WINDOWS
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6588 CENT("TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6589 "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6590 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6591 #ifdef FEAT_SYN_HL
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6592 CENT("CursorColumn term=reverse ctermbg=LightGrey",
818
1f929f3ca806 updated for version 7.0c03
vimboss
parents: 809
diff changeset
6593 "CursorColumn term=reverse ctermbg=LightGrey guibg=Grey90"),
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6594 CENT("CursorLine term=underline cterm=underline",
818
1f929f3ca806 updated for version 7.0c03
vimboss
parents: 809
diff changeset
6595 "CursorLine term=underline cterm=underline guibg=Grey90"),
2314
233eb4412f5d Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents: 2311
diff changeset
6596 CENT("ColorColumn term=reverse ctermbg=LightRed",
233eb4412f5d Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents: 2311
diff changeset
6597 "ColorColumn term=reverse ctermbg=LightRed guibg=LightRed"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6598 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6599 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6600 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6601 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6602 #endif
834
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6603 #ifdef FEAT_AUTOCMD
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6604 CENT("MatchParen term=reverse ctermbg=Cyan",
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6605 "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6606 #endif
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6607 #ifdef FEAT_GUI
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6608 "Normal gui=NONE",
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6609 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6610 NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6611 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6612
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6613 static char *(highlight_init_dark[]) =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6614 {
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6615 CENT("Directory term=bold ctermfg=LightCyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6616 "Directory term=bold ctermfg=LightCyan guifg=Cyan"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6617 CENT("LineNr term=underline ctermfg=Yellow",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6618 "LineNr term=underline ctermfg=Yellow guifg=Yellow"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6619 CENT("MoreMsg term=bold ctermfg=LightGreen",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6620 "MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6621 CENT("Question term=standout ctermfg=LightGreen",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6622 "Question term=standout ctermfg=LightGreen gui=bold guifg=Green"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6623 CENT("Search term=reverse ctermbg=Yellow ctermfg=Black",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6624 "Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6625 CENT("SpecialKey term=bold ctermfg=LightBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6626 "SpecialKey term=bold ctermfg=LightBlue guifg=Cyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6627 #ifdef FEAT_SPELL
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6628 CENT("SpellBad term=reverse ctermbg=Red",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6629 "SpellBad term=reverse ctermbg=Red guisp=Red gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6630 CENT("SpellCap term=reverse ctermbg=Blue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6631 "SpellCap term=reverse ctermbg=Blue guisp=Blue gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6632 CENT("SpellRare term=reverse ctermbg=Magenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6633 "SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6634 CENT("SpellLocal term=underline ctermbg=Cyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6635 "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6636 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6637 #ifdef FEAT_INS_EXPAND
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6638 CENT("Pmenu ctermbg=Magenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6639 "Pmenu ctermbg=Magenta guibg=Magenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6640 CENT("PmenuSel ctermbg=DarkGrey",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6641 "PmenuSel ctermbg=DarkGrey guibg=DarkGrey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6642 #endif
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6643 CENT("Title term=bold ctermfg=LightMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6644 "Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6645 CENT("WarningMsg term=standout ctermfg=LightRed",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6646 "WarningMsg term=standout ctermfg=LightRed guifg=Red"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6647 #ifdef FEAT_WILDMENU
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6648 CENT("WildMenu term=standout ctermbg=Yellow ctermfg=Black",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6649 "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6650 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6651 #ifdef FEAT_FOLDING
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6652 CENT("Folded term=standout ctermbg=DarkGrey ctermfg=Cyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6653 "Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6654 CENT("FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6655 "FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6656 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6657 #ifdef FEAT_SIGNS
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6658 CENT("SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6659 "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6660 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6661 #ifdef FEAT_VISUAL
836
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6662 CENT("Visual term=reverse",
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6663 "Visual term=reverse guibg=DarkGrey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6664 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6665 #ifdef FEAT_DIFF
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6666 CENT("DiffAdd term=bold ctermbg=DarkBlue",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6667 "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6668 CENT("DiffChange term=bold ctermbg=DarkMagenta",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6669 "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6670 CENT("DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6671 "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6672 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6673 #ifdef FEAT_WINDOWS
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6674 CENT("TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey",
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6675 "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6676 #endif
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6677 #ifdef FEAT_SYN_HL
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6678 CENT("CursorColumn term=reverse ctermbg=DarkGrey",
834
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6679 "CursorColumn term=reverse ctermbg=DarkGrey guibg=Grey40"),
809
4f1b94b51e99 updated for version 7.0b02
vimboss
parents: 806
diff changeset
6680 CENT("CursorLine term=underline cterm=underline",
834
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6681 "CursorLine term=underline cterm=underline guibg=Grey40"),
2314
233eb4412f5d Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents: 2311
diff changeset
6682 CENT("ColorColumn term=reverse ctermbg=DarkRed",
233eb4412f5d Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents: 2311
diff changeset
6683 "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"),
834
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6684 #endif
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6685 #ifdef FEAT_AUTOCMD
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6686 CENT("MatchParen term=reverse ctermbg=DarkCyan",
5117153003bd updated for version 7.0e
vimboss
parents: 819
diff changeset
6687 "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"),
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6688 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6689 #ifdef FEAT_CONCEAL
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6690 CENT("Conceal ctermbg=DarkGrey ctermfg=LightGrey",
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6691 "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2215
diff changeset
6692 #endif
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6693 #ifdef FEAT_GUI
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6694 "Normal gui=NONE",
806
de6d169fe745 updated for version 7.0b01
vimboss
parents: 745
diff changeset
6695 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6696 NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6697 };
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6698
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6699 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6700 init_highlight(both, reset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6701 int both; /* include groups where 'bg' doesn't matter */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6702 int reset; /* clear group first */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6703 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6704 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6705 char **pp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6706 static int had_both = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6707 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6708 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6709
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6710 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6711 * Try finding the color scheme file. Used when a color file was loaded
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6712 * and 'background' or 't_Co' is changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6713 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6714 p = get_var_value((char_u *)"g:colors_name");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6715 if (p != NULL && load_colors(p) == OK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6716 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6717 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6718
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6719 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6720 * Didn't use a color file, use the compiled-in colors.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6721 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6722 if (both)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6723 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6724 had_both = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6725 pp = highlight_init_both;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6726 for (i = 0; pp[i] != NULL; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6727 do_highlight((char_u *)pp[i], reset, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6728 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6729 else if (!had_both)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6730 /* Don't do anything before the call with both == TRUE from main().
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6731 * Not everything has been setup then, and that call will overrule
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6732 * everything anyway. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6733 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6734
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6735 if (*p_bg == 'l')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6736 pp = highlight_init_light;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6737 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6738 pp = highlight_init_dark;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6739 for (i = 0; pp[i] != NULL; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6740 do_highlight((char_u *)pp[i], reset, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6741
836
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6742 /* Reverse looks ugly, but grey may not work for 8 colors. Thus let it
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6743 * depend on the number of colors available.
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6744 * With 8 colors brown is equal to yellow, need to use black for Search fg
1697
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6745 * to avoid Statement highlighted text disappears.
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6746 * Clear the attributes, needed when changing the t_Co value. */
527
93a822c9e3d2 updated for version 7.0147
vimboss
parents: 523
diff changeset
6747 if (t_colors > 8)
1697
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6748 do_highlight((char_u *)(*p_bg == 'l'
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6749 ? "Visual cterm=NONE ctermbg=LightGrey"
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6750 : "Visual cterm=NONE ctermbg=DarkGrey"), FALSE, TRUE);
836
5a7843c57316 updated for version 7.0e02
vimboss
parents: 835
diff changeset
6751 else
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6752 {
1697
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6753 do_highlight((char_u *)"Visual cterm=reverse ctermbg=NONE",
2f9308b31181 updated for version 7.2b-030
vimboss
parents: 1624
diff changeset
6754 FALSE, TRUE);
844
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6755 if (*p_bg == 'l')
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6756 do_highlight((char_u *)"Search ctermfg=black", FALSE, TRUE);
d3bbb5dd3913 updated for version 7.0f02
vimboss
parents: 840
diff changeset
6757 }
527
93a822c9e3d2 updated for version 7.0147
vimboss
parents: 523
diff changeset
6758
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6759 #ifdef FEAT_SYN_HL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6760 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6761 * If syntax highlighting is enabled load the highlighting for it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6762 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6763 if (get_var_value((char_u *)"g:syntax_on") != NULL)
24
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6764 {
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6765 static int recursive = 0;
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6766
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6767 if (recursive >= 5)
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6768 EMSG(_("E679: recursive loop loading syncolor.vim"));
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6769 else
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6770 {
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6771 ++recursive;
480
bf5ba8a0cdee updated for version 7.0129
vimboss
parents: 474
diff changeset
6772 (void)source_runtime((char_u *)"syntax/syncolor.vim", TRUE);
24
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6773 --recursive;
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6774 }
8ff7fd162d3c updated for version 7.0016
vimboss
parents: 16
diff changeset
6775 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6776 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6777 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6778
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6779 /*
12
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6780 * Load color file "name".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6781 * Return OK for success, FAIL for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6782 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6783 int
12
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6784 load_colors(name)
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6785 char_u *name;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6786 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6787 char_u *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6788 int retval = FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6789 static int recursive = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6790
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6791 /* When being called recursively, this is probably because setting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6792 * 'background' caused the highlighting to be reloaded. This means it is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6793 * working, thus we should return OK. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6794 if (recursive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6795 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6796
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6797 recursive = TRUE;
12
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6798 buf = alloc((unsigned)(STRLEN(name) + 12));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6799 if (buf != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6800 {
12
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6801 sprintf((char *)buf, "colors/%s.vim", name);
480
bf5ba8a0cdee updated for version 7.0129
vimboss
parents: 474
diff changeset
6802 retval = source_runtime(buf, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6803 vim_free(buf);
12
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6804 #ifdef FEAT_AUTOCMD
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6805 apply_autocmds(EVENT_COLORSCHEME, NULL, NULL, FALSE, curbuf);
bdeee1504ac1 updated for version 7.0004
vimboss
parents: 7
diff changeset
6806 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6807 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6808 recursive = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6809
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6810 return retval;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6811 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6812
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6813 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6814 * Handle the ":highlight .." command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6815 * When using ":hi clear" this is called recursively for each group with
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6816 * "forceit" and "init" both TRUE.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6817 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6818 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6819 do_highlight(line, forceit, init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6820 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6821 int forceit;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6822 int init; /* TRUE when called for initializing */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6824 char_u *name_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6825 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6826 char_u *linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6827 char_u *key_start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6828 char_u *arg_start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6829 char_u *key = NULL, *arg = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6830 long i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6831 int off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6832 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6833 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6834 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6835 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6836 int dodefault = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6837 int doclear = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6838 int dolink = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6839 int error = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6840 int color;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6841 int is_normal_group = FALSE; /* "Normal" group */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6842 #ifdef FEAT_GUI_X11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6843 int is_menu_group = FALSE; /* "Menu" group */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6844 int is_scrollbar_group = FALSE; /* "Scrollbar" group */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6845 int is_tooltip_group = FALSE; /* "Tooltip" group */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6846 int do_colors = FALSE; /* need to update colors? */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6847 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6848 # define is_menu_group 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6849 # define is_tooltip_group 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6850 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6851
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6852 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6853 * If no argument, list current highlighting.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6854 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6855 if (ends_excmd(*line))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6856 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6857 for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6858 /* TODO: only call when the group has attributes set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6859 highlight_list_one((int)i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6860 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6861 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6862
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6863 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6864 * Isolate the name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6865 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6866 name_end = skiptowhite(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6867 linep = skipwhite(name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6868
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6869 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6870 * Check for "default" argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6871 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6872 if (STRNCMP(line, "default", name_end - line) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6873 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6874 dodefault = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6875 line = linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6876 name_end = skiptowhite(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6877 linep = skipwhite(name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6878 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6879
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6880 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6881 * Check for "clear" or "link" argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6882 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6883 if (STRNCMP(line, "clear", name_end - line) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6884 doclear = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6885 if (STRNCMP(line, "link", name_end - line) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6886 dolink = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6887
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6888 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6889 * ":highlight {group-name}": list highlighting for one group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6890 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6891 if (!doclear && !dolink && ends_excmd(*linep))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6892 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6893 id = syn_namen2id(line, (int)(name_end - line));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6894 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6895 EMSG2(_("E411: highlight group not found: %s"), line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6896 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6897 highlight_list_one(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6898 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6899 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6900
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6901 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6902 * Handle ":highlight link {from} {to}" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6903 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6904 if (dolink)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6905 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6906 char_u *from_start = linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6907 char_u *from_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6908 char_u *to_start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6909 char_u *to_end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6910 int from_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6911 int to_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6912
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6913 from_end = skiptowhite(from_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6914 to_start = skipwhite(from_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6915 to_end = skiptowhite(to_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6917 if (ends_excmd(*from_start) || ends_excmd(*to_start))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6918 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6919 EMSG2(_("E412: Not enough arguments: \":highlight link %s\""),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6920 from_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6921 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6922 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6923
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6924 if (!ends_excmd(*skipwhite(to_end)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6925 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6926 EMSG2(_("E413: Too many arguments: \":highlight link %s\""), from_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6927 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6928 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6929
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6930 from_id = syn_check_group(from_start, (int)(from_end - from_start));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6931 if (STRNCMP(to_start, "NONE", 4) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6932 to_id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6933 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6934 to_id = syn_check_group(to_start, (int)(to_end - to_start));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6935
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6936 if (from_id > 0 && (!init || HL_TABLE()[from_id - 1].sg_set == 0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6937 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6938 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6939 * Don't allow a link when there already is some highlighting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6940 * for the group, unless '!' is used
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6941 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6942 if (to_id > 0 && !forceit && !init
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6943 && hl_has_settings(from_id - 1, dodefault))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6944 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6945 if (sourcing_name == NULL && !dodefault)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6946 EMSG(_("E414: group has settings, highlight link ignored"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6947 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6948 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6949 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6950 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6951 HL_TABLE()[from_id - 1].sg_set |= SG_LINK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6952 HL_TABLE()[from_id - 1].sg_link = to_id;
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
6953 #ifdef FEAT_EVAL
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
6954 HL_TABLE()[from_id - 1].sg_scriptID = current_SID;
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
6955 #endif
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
6956 redraw_all_later(SOME_VALID);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6957 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6958 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6959
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6960 /* Only call highlight_changed() once, after sourcing a syntax file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6961 need_highlight_changed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6962
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6963 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6964 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6965
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6966 if (doclear)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6967 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6968 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6969 * ":highlight clear [group]" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6970 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6971 line = linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6972 if (ends_excmd(*line))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6973 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6974 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6975 /* First, we do not destroy the old values, but allocate the new
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6976 * ones and update the display. THEN we destroy the old values.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6977 * If we destroy the old values first, then the old values
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6978 * (such as GuiFont's or GuiFontset's) will still be displayed but
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6979 * invalid because they were free'd.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6980 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6981 if (gui.in_use)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6982 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6983 # ifdef FEAT_BEVAL_TIP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6984 gui_init_tooltip_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6985 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6986 # if defined(FEAT_MENU) && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6987 gui_init_menu_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6988 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6989 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6990 # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_X11)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6991 gui_mch_def_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6992 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6993 # ifdef FEAT_GUI_X11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6994 # ifdef FEAT_MENU
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6995
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6996 /* This only needs to be done when there is no Menu highlight
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6997 * group defined by default, which IS currently the case.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6998 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6999 gui_mch_new_menu_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7000 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7001 if (gui.in_use)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7002 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7003 gui_new_scrollbar_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7004 # ifdef FEAT_BEVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7005 gui_mch_new_tooltip_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7006 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7007 # ifdef FEAT_MENU
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7008 gui_mch_new_menu_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7009 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7010 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7011 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7012
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7013 /* Ok, we're done allocating the new default graphics items.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7014 * The screen should already be refreshed at this point.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7015 * It is now Ok to clear out the old data.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7016 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7017 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7018 #ifdef FEAT_EVAL
148
72aefd4c1e0d updated for version 7.0046
vimboss
parents: 134
diff changeset
7019 do_unlet((char_u *)"colors_name", TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7020 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7021 restore_cterm_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7022
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7023 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7024 * Clear all default highlight groups and load the defaults.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7025 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7026 for (idx = 0; idx < highlight_ga.ga_len; ++idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7027 highlight_clear(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7028 init_highlight(TRUE, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7029 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7030 if (gui.in_use)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7031 highlight_gui_started();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7032 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7033 highlight_changed();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7034 redraw_later_clear();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7035 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7036 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7037 name_end = skiptowhite(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7038 linep = skipwhite(name_end);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7039 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7040
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7041 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7042 * Find the group name in the table. If it does not exist yet, add it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7043 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7044 id = syn_check_group(line, (int)(name_end - line));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7045 if (id == 0) /* failed (out of memory) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7046 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7047 idx = id - 1; /* index is ID minus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7048
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7049 /* Return if "default" was used and the group already has settings. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7050 if (dodefault && hl_has_settings(idx, TRUE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7051 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7052
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7053 if (STRCMP(HL_TABLE()[idx].sg_name_u, "NORMAL") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7054 is_normal_group = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7055 #ifdef FEAT_GUI_X11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7056 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "MENU") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7057 is_menu_group = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7058 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "SCROLLBAR") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7059 is_scrollbar_group = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7060 else if (STRCMP(HL_TABLE()[idx].sg_name_u, "TOOLTIP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7061 is_tooltip_group = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7062 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7063
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7064 /* Clear the highlighting for ":hi clear {group}" and ":hi clear". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7065 if (doclear || (forceit && init))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7066 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7067 highlight_clear(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7068 if (!doclear)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7069 HL_TABLE()[idx].sg_set = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7070 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7071
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7072 if (!doclear)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7073 while (!ends_excmd(*linep))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7074 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7075 key_start = linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7076 if (*linep == '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7077 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7078 EMSG2(_("E415: unexpected equal sign: %s"), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7079 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7080 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7081 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7082
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7083 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7084 * Isolate the key ("term", "ctermfg", "ctermbg", "font", "guifg" or
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7085 * "guibg").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7086 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7087 while (*linep && !vim_iswhite(*linep) && *linep != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7088 ++linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7089 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7090 key = vim_strnsave_up(key_start, (int)(linep - key_start));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7091 if (key == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7092 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7093 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7094 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7095 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7096 linep = skipwhite(linep);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7097
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7098 if (STRCMP(key, "NONE") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7099 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7100 if (!init || HL_TABLE()[idx].sg_set == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7101 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7102 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7103 HL_TABLE()[idx].sg_set |= SG_TERM+SG_CTERM+SG_GUI;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7104 highlight_clear(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7105 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7106 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7107 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7108
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7109 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7110 * Check for the equal sign.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7111 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7112 if (*linep != '=')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7113 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7114 EMSG2(_("E416: missing equal sign: %s"), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7115 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7116 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7117 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7118 ++linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7119
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7120 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7121 * Isolate the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7122 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7123 linep = skipwhite(linep);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7124 if (*linep == '\'') /* guifg='color name' */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7125 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7126 arg_start = ++linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7127 linep = vim_strchr(linep, '\'');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7128 if (linep == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7129 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7130 EMSG2(_(e_invarg2), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7131 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7132 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7133 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7134 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7135 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7136 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7137 arg_start = linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7138 linep = skiptowhite(linep);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7139 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7140 if (linep == arg_start)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7141 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7142 EMSG2(_("E417: missing argument: %s"), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7143 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7144 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7145 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7146 vim_free(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7147 arg = vim_strnsave(arg_start, (int)(linep - arg_start));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7148 if (arg == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7149 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7150 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7151 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7152 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7153 if (*linep == '\'')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7154 ++linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7155
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7156 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7157 * Store the argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7158 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7159 if ( STRCMP(key, "TERM") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7160 || STRCMP(key, "CTERM") == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7161 || STRCMP(key, "GUI") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7162 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7163 attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7164 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7165 while (arg[off] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7166 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7167 for (i = sizeof(hl_attr_table) / sizeof(int); --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7168 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7169 len = (int)STRLEN(hl_name_table[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7170 if (STRNICMP(arg + off, hl_name_table[i], len) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7171 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7172 attr |= hl_attr_table[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7173 off += len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7174 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7175 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7176 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7177 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7178 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7179 EMSG2(_("E418: Illegal value: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7180 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7181 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7182 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7183 if (arg[off] == ',') /* another one follows */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7184 ++off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7185 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7186 if (error)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7187 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7188 if (*key == 'T')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7189 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7190 if (!init || !(HL_TABLE()[idx].sg_set & SG_TERM))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7191 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7192 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7193 HL_TABLE()[idx].sg_set |= SG_TERM;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7194 HL_TABLE()[idx].sg_term = attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7195 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7196 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7197 else if (*key == 'C')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7198 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7199 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7200 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7201 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7202 HL_TABLE()[idx].sg_set |= SG_CTERM;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7203 HL_TABLE()[idx].sg_cterm = attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7204 HL_TABLE()[idx].sg_cterm_bold = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7205 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7206 }
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7207 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7208 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7209 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7210 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7211 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7212 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7213 HL_TABLE()[idx].sg_set |= SG_GUI;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7214 HL_TABLE()[idx].sg_gui = attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7215 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7216 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7217 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7218 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7219 else if (STRCMP(key, "FONT") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7220 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7221 /* in non-GUI fonts are simply ignored */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7222 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7223 if (!gui.shell_created)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7224 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7225 /* GUI not started yet, always accept the name. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7226 vim_free(HL_TABLE()[idx].sg_font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7227 HL_TABLE()[idx].sg_font_name = vim_strsave(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7228 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7229 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7230 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7231 GuiFont temp_sg_font = HL_TABLE()[idx].sg_font;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7232 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7233 GuiFontset temp_sg_fontset = HL_TABLE()[idx].sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7234 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7235 /* First, save the current font/fontset.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7236 * Then try to allocate the font/fontset.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7237 * If the allocation fails, HL_TABLE()[idx].sg_font OR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7238 * sg_fontset will be set to NOFONT or NOFONTSET respectively.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7239 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7240
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7241 HL_TABLE()[idx].sg_font = NOFONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7242 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7243 HL_TABLE()[idx].sg_fontset = NOFONTSET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7244 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7245 hl_do_font(idx, arg, is_normal_group, is_menu_group,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7246 is_tooltip_group);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7247
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7248 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7249 if (HL_TABLE()[idx].sg_fontset != NOFONTSET)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7250 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7251 /* New fontset was accepted. Free the old one, if there was
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7252 * one.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7253 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7254 gui_mch_free_fontset(temp_sg_fontset);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7255 vim_free(HL_TABLE()[idx].sg_font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7256 HL_TABLE()[idx].sg_font_name = vim_strsave(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7257 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7258 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7259 HL_TABLE()[idx].sg_fontset = temp_sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7260 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7261 if (HL_TABLE()[idx].sg_font != NOFONT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7262 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7263 /* New font was accepted. Free the old one, if there was
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7264 * one.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7265 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7266 gui_mch_free_font(temp_sg_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7267 vim_free(HL_TABLE()[idx].sg_font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7268 HL_TABLE()[idx].sg_font_name = vim_strsave(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7269 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7270 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7271 HL_TABLE()[idx].sg_font = temp_sg_font;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7272 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7273 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7274 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7275 else if (STRCMP(key, "CTERMFG") == 0 || STRCMP(key, "CTERMBG") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7276 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7277 if (!init || !(HL_TABLE()[idx].sg_set & SG_CTERM))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7278 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7279 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7280 HL_TABLE()[idx].sg_set |= SG_CTERM;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7281
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7282 /* When setting the foreground color, and previously the "bold"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7283 * flag was set for a light color, reset it now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7284 if (key[5] == 'F' && HL_TABLE()[idx].sg_cterm_bold)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7285 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7286 HL_TABLE()[idx].sg_cterm &= ~HL_BOLD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7287 HL_TABLE()[idx].sg_cterm_bold = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7288 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7289
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7290 if (VIM_ISDIGIT(*arg))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7291 color = atoi((char *)arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7292 else if (STRICMP(arg, "fg") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7293 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7294 if (cterm_normal_fg_color)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7295 color = cterm_normal_fg_color - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7296 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7297 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7298 EMSG(_("E419: FG color unknown"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7299 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7300 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7301 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7302 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7303 else if (STRICMP(arg, "bg") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7304 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7305 if (cterm_normal_bg_color > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7306 color = cterm_normal_bg_color - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7307 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7308 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7309 EMSG(_("E420: BG color unknown"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7310 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7311 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7312 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7313 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7314 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7315 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7316 static char *(color_names[28]) = {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7317 "Black", "DarkBlue", "DarkGreen", "DarkCyan",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7318 "DarkRed", "DarkMagenta", "Brown", "DarkYellow",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7319 "Gray", "Grey",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7320 "LightGray", "LightGrey", "DarkGray", "DarkGrey",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7321 "Blue", "LightBlue", "Green", "LightGreen",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7322 "Cyan", "LightCyan", "Red", "LightRed", "Magenta",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7323 "LightMagenta", "Yellow", "LightYellow", "White", "NONE"};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7324 static int color_numbers_16[28] = {0, 1, 2, 3,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7325 4, 5, 6, 6,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7326 7, 7,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7327 7, 7, 8, 8,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7328 9, 9, 10, 10,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7329 11, 11, 12, 12, 13,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7330 13, 14, 14, 15, -1};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7331 /* for xterm with 88 colors... */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7332 static int color_numbers_88[28] = {0, 4, 2, 6,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7333 1, 5, 32, 72,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7334 84, 84,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7335 7, 7, 82, 82,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7336 12, 43, 10, 61,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7337 14, 63, 9, 74, 13,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7338 75, 11, 78, 15, -1};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7339 /* for xterm with 256 colors... */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7340 static int color_numbers_256[28] = {0, 4, 2, 6,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7341 1, 5, 130, 130,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7342 248, 248,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7343 7, 7, 242, 242,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7344 12, 81, 10, 121,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7345 14, 159, 9, 224, 13,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7346 225, 11, 229, 15, -1};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7347 /* for terminals with less than 16 colors... */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7348 static int color_numbers_8[28] = {0, 4, 2, 6,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7349 1, 5, 3, 3,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7350 7, 7,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7351 7, 7, 0+8, 0+8,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7352 4+8, 4+8, 2+8, 2+8,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7353 6+8, 6+8, 1+8, 1+8, 5+8,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7354 5+8, 3+8, 3+8, 7+8, -1};
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7355 #if defined(__QNXNTO__)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7356 static int *color_numbers_8_qansi = color_numbers_8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7357 /* On qnx, the 8 & 16 color arrays are the same */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7358 if (STRNCMP(T_NAME, "qansi", 5) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7359 color_numbers_8_qansi = color_numbers_16;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7360 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7361
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7362 /* reduce calls to STRICMP a bit, it can be slow */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7363 off = TOUPPER_ASC(*arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7364 for (i = (sizeof(color_names) / sizeof(char *)); --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7365 if (off == color_names[i][0]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7366 && STRICMP(arg + 1, color_names[i] + 1) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7367 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7368 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7369 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7370 EMSG2(_("E421: Color name or number not recognized: %s"), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7371 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7372 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7373 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7374
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7375 /* Use the _16 table to check if its a valid color name. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7376 color = color_numbers_16[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7377 if (color >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7378 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7379 if (t_colors == 8)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7380 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7381 /* t_Co is 8: use the 8 colors table */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7382 #if defined(__QNXNTO__)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7383 color = color_numbers_8_qansi[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7384 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7385 color = color_numbers_8[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7386 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7387 if (key[5] == 'F')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7388 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7389 /* set/reset bold attribute to get light foreground
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7390 * colors (on some terminals, e.g. "linux") */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7391 if (color & 8)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7392 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7393 HL_TABLE()[idx].sg_cterm |= HL_BOLD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7394 HL_TABLE()[idx].sg_cterm_bold = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7395 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7396 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7397 HL_TABLE()[idx].sg_cterm &= ~HL_BOLD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7398 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7399 color &= 7; /* truncate to 8 colors */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7400 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7401 else if (t_colors == 16 || t_colors == 88
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7402 || t_colors == 256)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7403 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7404 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7405 * Guess: if the termcap entry ends in 'm', it is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7406 * probably an xterm-like terminal. Use the changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7407 * order for colors.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7408 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7409 if (*T_CAF != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7410 p = T_CAF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7411 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7412 p = T_CSF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7413 if (*p != NUL && *(p + STRLEN(p) - 1) == 'm')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7414 switch (t_colors)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7415 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7416 case 16:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7417 color = color_numbers_8[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7418 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7419 case 88:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7420 color = color_numbers_88[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7421 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7422 case 256:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7423 color = color_numbers_256[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7424 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7425 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7426 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7427 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7428 }
2136
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7429 /* 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
7430 * "NONE", then "color" is -1. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7431 if (key[5] == 'F')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7432 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7433 HL_TABLE()[idx].sg_cterm_fg = color + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7434 if (is_normal_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7435 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7436 cterm_normal_fg_color = color + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7437 cterm_normal_fg_bold = (HL_TABLE()[idx].sg_cterm & HL_BOLD);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7438 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7439 /* Don't do this if the GUI is used. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7440 if (!gui.in_use && !gui.starting)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7441 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7442 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7443 must_redraw = CLEAR;
2136
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7444 if (termcap_active && color >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7445 term_fg_color(color);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7446 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7447 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7448 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7449 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7450 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7451 HL_TABLE()[idx].sg_cterm_bg = color + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7452 if (is_normal_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7453 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7454 cterm_normal_bg_color = color + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7455 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7456 /* Don't mess with 'background' if the GUI is used. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7457 if (!gui.in_use && !gui.starting)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7458 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7459 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7460 must_redraw = CLEAR;
2136
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7461 if (color >= 0)
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7462 {
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7463 if (termcap_active)
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7464 term_bg_color(color);
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7465 if (t_colors < 16)
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7466 i = (color == 0 || color == 4);
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7467 else
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7468 i = (color < 7 || color == 8);
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7469 /* Set the 'background' option if the value is
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7470 * wrong. */
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7471 if (i != (*p_bg == 'd'))
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7472 set_option_value((char_u *)"bg", 0L,
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7473 i ? (char_u *)"dark"
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7474 : (char_u *)"light", 0);
431ebc9412a8 updated for version 7.2.418
Bram Moolenaar <bram@zimbu.org>
parents: 2123
diff changeset
7475 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7476 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7477 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7478 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7479 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7480 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7481 else if (STRCMP(key, "GUIFG") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7482 {
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7483 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7484 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7485 {
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7486 if (!init)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7487 HL_TABLE()[idx].sg_set |= SG_GUI;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7488
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7489 # ifdef FEAT_GUI
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7490 /* In GUI guifg colors are only used when recognized */
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7491 i = color_name2handle(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7492 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7493 {
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7494 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
7495 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7496 vim_free(HL_TABLE()[idx].sg_gui_fg_name);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7497 if (STRCMP(arg, "NONE"))
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7498 HL_TABLE()[idx].sg_gui_fg_name = vim_strsave(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7499 else
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7500 HL_TABLE()[idx].sg_gui_fg_name = NULL;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7501 # ifdef FEAT_GUI
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7502 # ifdef FEAT_GUI_X11
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7503 if (is_menu_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7504 gui.menu_fg_pixel = i;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7505 if (is_scrollbar_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7506 gui.scroll_fg_pixel = i;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7507 # ifdef FEAT_BEVAL
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7508 if (is_tooltip_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7509 gui.tooltip_fg_pixel = i;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7510 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7511 do_colors = TRUE;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7512 # endif
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7513 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7514 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7515 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7516 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7517 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7518 else if (STRCMP(key, "GUIBG") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7519 {
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7520 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7521 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7522 {
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7523 if (!init)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7524 HL_TABLE()[idx].sg_set |= SG_GUI;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7525
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7526 # ifdef FEAT_GUI
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7527 /* In GUI guifg colors are only used when recognized */
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7528 i = color_name2handle(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7529 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7530 {
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7531 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
7532 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7533 vim_free(HL_TABLE()[idx].sg_gui_bg_name);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7534 if (STRCMP(arg, "NONE") != 0)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7535 HL_TABLE()[idx].sg_gui_bg_name = vim_strsave(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7536 else
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7537 HL_TABLE()[idx].sg_gui_bg_name = NULL;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7538 # ifdef FEAT_GUI
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7539 # ifdef FEAT_GUI_X11
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7540 if (is_menu_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7541 gui.menu_bg_pixel = i;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7542 if (is_scrollbar_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7543 gui.scroll_bg_pixel = i;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7544 # ifdef FEAT_BEVAL
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7545 if (is_tooltip_group)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7546 gui.tooltip_bg_pixel = i;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7547 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7548 do_colors = TRUE;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7549 # endif
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7550 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7551 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7552 }
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7553 #endif
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7554 }
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7555 else if (STRCMP(key, "GUISP") == 0)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7556 {
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7557 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7558 if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7559 {
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7560 if (!init)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7561 HL_TABLE()[idx].sg_set |= SG_GUI;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7562
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7563 # ifdef FEAT_GUI
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7564 i = color_name2handle(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7565 if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !gui.in_use)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7566 {
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7567 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
7568 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7569 vim_free(HL_TABLE()[idx].sg_gui_sp_name);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7570 if (STRCMP(arg, "NONE") != 0)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7571 HL_TABLE()[idx].sg_gui_sp_name = vim_strsave(arg);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7572 else
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7573 HL_TABLE()[idx].sg_gui_sp_name = NULL;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7574 # ifdef FEAT_GUI
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7575 }
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7576 # endif
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7577 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7578 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7579 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7580 else if (STRCMP(key, "START") == 0 || STRCMP(key, "STOP") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7581 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7582 char_u buf[100];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7583 char_u *tname;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7584
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7585 if (!init)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7586 HL_TABLE()[idx].sg_set |= SG_TERM;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7587
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7588 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7589 * The "start" and "stop" arguments can be a literal escape
1222
756bed568f5d updated for version 7.1b
vimboss
parents: 1161
diff changeset
7590 * sequence, or a comma separated list of terminal codes.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7591 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7592 if (STRNCMP(arg, "t_", 2) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7593 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7594 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7595 buf[0] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7596 while (arg[off] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7597 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7598 /* Isolate one termcap name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7599 for (len = 0; arg[off + len] &&
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7600 arg[off + len] != ','; ++len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7601 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7602 tname = vim_strnsave(arg + off, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7603 if (tname == NULL) /* out of memory */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7604 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7605 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7606 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7607 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7608 /* lookup the escape sequence for the item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7609 p = get_term_code(tname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7610 vim_free(tname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7611 if (p == NULL) /* ignore non-existing things */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7612 p = (char_u *)"";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7613
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7614 /* Append it to the already found stuff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7615 if ((int)(STRLEN(buf) + STRLEN(p)) >= 99)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7616 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7617 EMSG2(_("E422: terminal code too long: %s"), arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7618 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7619 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7620 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7621 STRCAT(buf, p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7622
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7623 /* Advance to the next item */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7624 off += len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7625 if (arg[off] == ',') /* another one follows */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7626 ++off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7627 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7628 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7629 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7630 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7631 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7632 * Copy characters from arg[] to buf[], translating <> codes.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7633 */
2593
103dea654543 updated for version 7.3.017
Bram Moolenaar <bram@vim.org>
parents: 2520
diff changeset
7634 for (p = arg, off = 0; off < 100 - 6 && *p; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7635 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7636 len = trans_special(&p, buf + off, FALSE);
2593
103dea654543 updated for version 7.3.017
Bram Moolenaar <bram@vim.org>
parents: 2520
diff changeset
7637 if (len > 0) /* recognized special char */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7638 off += len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7639 else /* copy as normal char */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7640 buf[off++] = *p++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7641 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7642 buf[off] = NUL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7643 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7644 if (error)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7645 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7646
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7647 if (STRCMP(buf, "NONE") == 0) /* resetting the value */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7648 p = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7649 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7650 p = vim_strsave(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7651 if (key[2] == 'A')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7652 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7653 vim_free(HL_TABLE()[idx].sg_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7654 HL_TABLE()[idx].sg_start = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7655 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7656 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7657 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7658 vim_free(HL_TABLE()[idx].sg_stop);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7659 HL_TABLE()[idx].sg_stop = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7660 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7661 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7662 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7663 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7664 EMSG2(_("E423: Illegal argument: %s"), key_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7665 error = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7666 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7667 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7668
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7669 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7670 * When highlighting has been given for a group, don't link it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7671 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7672 if (!init || !(HL_TABLE()[idx].sg_set & SG_LINK))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7673 HL_TABLE()[idx].sg_link = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7674
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7675 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7676 * Continue with next argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7677 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7678 linep = skipwhite(linep);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7679 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7680
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7681 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7682 * If there is an error, and it's a new entry, remove it from the table.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7683 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7684 if (error && idx == highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7685 syn_unadd_group();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7686 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7687 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7688 if (is_normal_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7689 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7690 HL_TABLE()[idx].sg_term_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7691 HL_TABLE()[idx].sg_cterm_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7692 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7693 HL_TABLE()[idx].sg_gui_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7694 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7695 * Need to update all groups, because they might be using "bg"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7696 * and/or "fg", which have been changed now.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7697 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7698 if (gui.in_use)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7699 highlight_gui_started();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7700 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7701 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7702 #ifdef FEAT_GUI_X11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7703 # ifdef FEAT_MENU
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7704 else if (is_menu_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7705 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7706 if (gui.in_use && do_colors)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7707 gui_mch_new_menu_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7708 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7709 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7710 else if (is_scrollbar_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7711 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7712 if (gui.in_use && do_colors)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7713 gui_new_scrollbar_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7714 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7715 # ifdef FEAT_BEVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7716 else if (is_tooltip_group)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7717 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7718 if (gui.in_use && do_colors)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7719 gui_mch_new_tooltip_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7720 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7721 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7722 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7723 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7724 set_hl_attr(idx);
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7725 #ifdef FEAT_EVAL
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7726 HL_TABLE()[idx].sg_scriptID = current_SID;
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7727 #endif
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
7728 redraw_all_later(NOT_VALID);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7729 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7730 vim_free(key);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7731 vim_free(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7732
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7733 /* Only call highlight_changed() once, after sourcing a syntax file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7734 need_highlight_changed = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7735 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7736
356
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7737 #if defined(EXITFREE) || defined(PROTO)
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7738 void
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7739 free_highlight()
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7740 {
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7741 int i;
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7742
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7743 for (i = 0; i < highlight_ga.ga_len; ++i)
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
7744 {
356
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7745 highlight_clear(i);
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
7746 vim_free(HL_TABLE()[i].sg_name);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
7747 vim_free(HL_TABLE()[i].sg_name_u);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
7748 }
356
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7749 ga_clear(&highlight_ga);
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7750 }
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7751 #endif
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 348
diff changeset
7752
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7753 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7754 * Reset the cterm colors to what they were before Vim was started, if
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7755 * possible. Otherwise reset them to zero.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7756 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7757 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7758 restore_cterm_colors()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7759 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7760 #if defined(MSDOS) || (defined(WIN3264) && !defined(FEAT_GUI_W32))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7761 /* Since t_me has been set, this probably means that the user
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7762 * wants to use this as default colors. Need to reset default
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7763 * background/foreground colors. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7764 mch_set_normal_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7765 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7766 cterm_normal_fg_color = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7767 cterm_normal_fg_bold = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7768 cterm_normal_bg_color = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7769 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7770 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7771
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7772 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7773 * Return TRUE if highlight group "idx" has any settings.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7774 * When "check_link" is TRUE also check for an existing link.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7775 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7776 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7777 hl_has_settings(idx, check_link)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7778 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7779 int check_link;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7780 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7781 return ( HL_TABLE()[idx].sg_term_attr != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7782 || HL_TABLE()[idx].sg_cterm_attr != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7783 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7784 || HL_TABLE()[idx].sg_gui_attr != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7785 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7786 || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK)));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7787 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7788
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7789 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7790 * Clear highlighting for one group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7791 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7792 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7793 highlight_clear(idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7794 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7795 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7796 HL_TABLE()[idx].sg_term = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7797 vim_free(HL_TABLE()[idx].sg_start);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7798 HL_TABLE()[idx].sg_start = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7799 vim_free(HL_TABLE()[idx].sg_stop);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7800 HL_TABLE()[idx].sg_stop = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7801 HL_TABLE()[idx].sg_term_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7802 HL_TABLE()[idx].sg_cterm = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7803 HL_TABLE()[idx].sg_cterm_bold = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7804 HL_TABLE()[idx].sg_cterm_fg = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7805 HL_TABLE()[idx].sg_cterm_bg = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7806 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
7807 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7808 HL_TABLE()[idx].sg_gui = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7809 vim_free(HL_TABLE()[idx].sg_gui_fg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7810 HL_TABLE()[idx].sg_gui_fg_name = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7811 vim_free(HL_TABLE()[idx].sg_gui_bg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7812 HL_TABLE()[idx].sg_gui_bg_name = NULL;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7813 vim_free(HL_TABLE()[idx].sg_gui_sp_name);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7814 HL_TABLE()[idx].sg_gui_sp_name = NULL;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7815 #endif
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7816 #ifdef FEAT_GUI
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7817 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
7818 HL_TABLE()[idx].sg_gui_bg = INVALCOLOR;
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
7819 HL_TABLE()[idx].sg_gui_sp = INVALCOLOR;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7820 gui_mch_free_font(HL_TABLE()[idx].sg_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7821 HL_TABLE()[idx].sg_font = NOFONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7822 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7823 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7824 HL_TABLE()[idx].sg_fontset = NOFONTSET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7825 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7826 vim_free(HL_TABLE()[idx].sg_font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7827 HL_TABLE()[idx].sg_font_name = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7828 HL_TABLE()[idx].sg_gui_attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7829 #endif
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7830 #ifdef FEAT_EVAL
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7831 /* Clear the script ID only when there is no link, since that is not
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7832 * cleared. */
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7833 if (HL_TABLE()[idx].sg_link == 0)
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7834 HL_TABLE()[idx].sg_scriptID = 0;
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
7835 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7836 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7837
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7838 #if defined(FEAT_GUI) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7839 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7840 * Set the normal foreground and background colors according to the "Normal"
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
7841 * highlighting group. For X11 also set "Menu", "Scrollbar", and
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7842 * "Tooltip" colors.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7843 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7844 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7845 set_normal_colors()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7846 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7847 if (set_group_colors((char_u *)"Normal",
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7848 &gui.norm_pixel, &gui.back_pixel,
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7849 FALSE, TRUE, FALSE))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7850 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7851 gui_mch_new_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7852 must_redraw = CLEAR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7853 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7854 #ifdef FEAT_GUI_X11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7855 if (set_group_colors((char_u *)"Menu",
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7856 &gui.menu_fg_pixel, &gui.menu_bg_pixel,
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7857 TRUE, FALSE, FALSE))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7858 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7859 # ifdef FEAT_MENU
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7860 gui_mch_new_menu_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7861 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7862 must_redraw = CLEAR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7863 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7864 # ifdef FEAT_BEVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7865 if (set_group_colors((char_u *)"Tooltip",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7866 &gui.tooltip_fg_pixel, &gui.tooltip_bg_pixel,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7867 FALSE, FALSE, TRUE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7868 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7869 # ifdef FEAT_TOOLBAR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7870 gui_mch_new_tooltip_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7871 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7872 must_redraw = CLEAR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7873 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7874 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7875 if (set_group_colors((char_u *)"Scrollbar",
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7876 &gui.scroll_fg_pixel, &gui.scroll_bg_pixel,
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
7877 FALSE, FALSE, FALSE))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7878 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7879 gui_new_scrollbar_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7880 must_redraw = CLEAR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7881 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7882 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7883 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7884
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7885 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7886 * Set the colors for "Normal", "Menu", "Tooltip" or "Scrollbar".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7887 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7888 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7889 set_group_colors(name, fgp, bgp, do_menu, use_norm, do_tooltip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7890 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7891 guicolor_T *fgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7892 guicolor_T *bgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7893 int do_menu;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7894 int use_norm;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7895 int do_tooltip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7896 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7897 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7898
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7899 idx = syn_name2id(name) - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7900 if (idx >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7901 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7902 gui_do_one_color(idx, do_menu, do_tooltip);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7903
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7904 if (HL_TABLE()[idx].sg_gui_fg != INVALCOLOR)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7905 *fgp = HL_TABLE()[idx].sg_gui_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7906 else if (use_norm)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7907 *fgp = gui.def_norm_pixel;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7908 if (HL_TABLE()[idx].sg_gui_bg != INVALCOLOR)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7909 *bgp = HL_TABLE()[idx].sg_gui_bg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7910 else if (use_norm)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7911 *bgp = gui.def_back_pixel;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7912 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7913 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7914 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7915 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7917 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7918 * Get the font of the "Normal" group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7919 * Returns "" when it's not found or not set.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7920 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7921 char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7922 hl_get_font_name()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7923 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7924 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7925 char_u *s;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7926
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7927 id = syn_name2id((char_u *)"Normal");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7928 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7929 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7930 s = HL_TABLE()[id - 1].sg_font_name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7931 if (s != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7932 return s;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7933 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7934 return (char_u *)"";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7935 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7936
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7937 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7938 * Set font for "Normal" group. Called by gui_mch_init_font() when a font has
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7939 * actually chosen to be used.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7940 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7941 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7942 hl_set_font_name(font_name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7943 char_u *font_name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7944 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7945 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7946
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7947 id = syn_name2id((char_u *)"Normal");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7948 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7949 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7950 vim_free(HL_TABLE()[id - 1].sg_font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7951 HL_TABLE()[id - 1].sg_font_name = vim_strsave(font_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7953 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7954
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7955 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7956 * Set background color for "Normal" group. Called by gui_set_bg_color()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7957 * when the color is known.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7958 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7959 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7960 hl_set_bg_color_name(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7961 char_u *name; /* must have been allocated */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7962 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7963 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7964
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7965 if (name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7966 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7967 id = syn_name2id((char_u *)"Normal");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7968 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7969 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7970 vim_free(HL_TABLE()[id - 1].sg_gui_bg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7971 HL_TABLE()[id - 1].sg_gui_bg_name = name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7972 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7973 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7974 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7975
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7976 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7977 * Set foreground color for "Normal" group. Called by gui_set_fg_color()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7978 * when the color is known.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7979 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7980 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7981 hl_set_fg_color_name(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7982 char_u *name; /* must have been allocated */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7983 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7984 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7985
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7986 if (name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7987 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7988 id = syn_name2id((char_u *)"Normal");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7989 if (id > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7990 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7991 vim_free(HL_TABLE()[id - 1].sg_gui_fg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7992 HL_TABLE()[id - 1].sg_gui_fg_name = name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7993 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7994 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7995 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7996
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7997 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7998 * Return the handle for a color name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7999 * Returns INVALCOLOR when failed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8000 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8001 static guicolor_T
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8002 color_name2handle(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8003 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8004 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8005 if (STRCMP(name, "NONE") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8006 return INVALCOLOR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8007
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8008 if (STRICMP(name, "fg") == 0 || STRICMP(name, "foreground") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8009 return gui.norm_pixel;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8010 if (STRICMP(name, "bg") == 0 || STRICMP(name, "background") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8011 return gui.back_pixel;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8012
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8013 return gui_get_color(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8014 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8015
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8016 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8017 * Return the handle for a font name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8018 * Returns NOFONT when failed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8019 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8020 static GuiFont
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8021 font_name2handle(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8022 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8023 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8024 if (STRCMP(name, "NONE") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8025 return NOFONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8026
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8027 return gui_mch_get_font(name, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8028 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8029
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8030 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8031 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8032 * Return the handle for a fontset name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8033 * Returns NOFONTSET when failed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8034 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8035 static GuiFontset
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8036 fontset_name2handle(name, fixed_width)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8037 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8038 int fixed_width;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8039 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8040 if (STRCMP(name, "NONE") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8041 return NOFONTSET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8042
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8043 return gui_mch_get_fontset(name, TRUE, fixed_width);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8044 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8045 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8046
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8047 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8048 * Get the font or fontset for one highlight group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8049 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8050 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8051 hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8052 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8053 char_u *arg;
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
8054 int do_normal; /* set normal font */
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
8055 int do_menu UNUSED; /* set menu font */
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
8056 int do_tooltip UNUSED; /* set tooltip font */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8057 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8058 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8059 /* If 'guifontset' is not empty, first try using the name as a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8060 * fontset. If that doesn't work, use it as a font name. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8061 if (*p_guifontset != NUL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8062 # ifdef FONTSET_ALWAYS
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8063 || do_menu
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8064 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8065 # ifdef FEAT_BEVAL_TIP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8066 /* In Athena & Motif, the Tooltip highlight group is always a fontset */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8067 || do_tooltip
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8068 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8069 )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8070 HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8071 # ifdef FONTSET_ALWAYS
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8072 || do_menu
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8073 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8074 # ifdef FEAT_BEVAL_TIP
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8075 || do_tooltip
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8076 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8077 );
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8078 if (HL_TABLE()[idx].sg_fontset != NOFONTSET)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8079 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8080 /* If it worked and it's the Normal group, use it as the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8081 * normal fontset. Same for the Menu group. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8082 if (do_normal)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8083 gui_init_font(arg, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8084 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8085 if (do_menu)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8086 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8087 # ifdef FONTSET_ALWAYS
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8088 gui.menu_fontset = HL_TABLE()[idx].sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8089 # else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8090 /* YIKES! This is a bug waiting to crash the program */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8091 gui.menu_font = HL_TABLE()[idx].sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8092 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8093 gui_mch_new_menu_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8094 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8095 # ifdef FEAT_BEVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8096 if (do_tooltip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8097 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8098 /* The Athena widget set cannot currently handle switching between
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8099 * displaying a single font and a fontset.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8100 * If the XtNinternational resource is set to True at widget
1222
756bed568f5d updated for version 7.1b
vimboss
parents: 1161
diff changeset
8101 * creation, then a fontset is always used, otherwise an
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8102 * XFontStruct is used.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8103 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8104 gui.tooltip_fontset = (XFontSet)HL_TABLE()[idx].sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8105 gui_mch_new_tooltip_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8106 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8107 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8108 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8109 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8110 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8111 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8112 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8113 HL_TABLE()[idx].sg_font = font_name2handle(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8114 /* If it worked and it's the Normal group, use it as the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8115 * normal font. Same for the Menu group. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8116 if (HL_TABLE()[idx].sg_font != NOFONT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8117 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8118 if (do_normal)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8119 gui_init_font(arg, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8120 #ifndef FONTSET_ALWAYS
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8121 # if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8122 if (do_menu)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8123 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8124 gui.menu_font = HL_TABLE()[idx].sg_font;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8125 gui_mch_new_menu_font();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8126 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8127 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8128 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8129 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8131 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8133 #endif /* FEAT_GUI */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8134
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8135 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8136 * Table with the specifications for an attribute number.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8137 * Note that this table is used by ALL buffers. This is required because the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8138 * GUI can redraw at any time for any buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8139 */
298
f9de3e679a04 updated for version 7.0078
vimboss
parents: 294
diff changeset
8140 static garray_T term_attr_table = {0, 0, 0, 0, NULL};
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8141
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8142 #define TERM_ATTR_ENTRY(idx) ((attrentry_T *)term_attr_table.ga_data)[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8143
298
f9de3e679a04 updated for version 7.0078
vimboss
parents: 294
diff changeset
8144 static garray_T cterm_attr_table = {0, 0, 0, 0, NULL};
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8145
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8146 #define CTERM_ATTR_ENTRY(idx) ((attrentry_T *)cterm_attr_table.ga_data)[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8147
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8148 #ifdef FEAT_GUI
298
f9de3e679a04 updated for version 7.0078
vimboss
parents: 294
diff changeset
8149 static garray_T gui_attr_table = {0, 0, 0, 0, NULL};
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8150
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8151 #define GUI_ATTR_ENTRY(idx) ((attrentry_T *)gui_attr_table.ga_data)[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8152 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8153
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8154 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8155 * Return the attr number for a set of colors and font.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8156 * Add a new entry to the term_attr_table, cterm_attr_table or gui_attr_table
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8157 * if the combination is new.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8158 * Return 0 for error (no more room).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8159 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8160 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8161 get_attr_entry(table, aep)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8162 garray_T *table;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8163 attrentry_T *aep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8164 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8165 int i;
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8166 attrentry_T *taep;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8167 static int recursive = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8168
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8169 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8170 * Init the table, in case it wasn't done yet.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8171 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8172 table->ga_itemsize = sizeof(attrentry_T);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8173 table->ga_growsize = 7;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8174
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8175 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8176 * Try to find an entry with the same specifications.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8177 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8178 for (i = 0; i < table->ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8179 {
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8180 taep = &(((attrentry_T *)table->ga_data)[i]);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8181 if ( aep->ae_attr == taep->ae_attr
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8182 && (
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8183 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8184 (table == &gui_attr_table
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8185 && (aep->ae_u.gui.fg_color == taep->ae_u.gui.fg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8186 && aep->ae_u.gui.bg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8187 == taep->ae_u.gui.bg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8188 && aep->ae_u.gui.sp_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8189 == taep->ae_u.gui.sp_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8190 && aep->ae_u.gui.font == taep->ae_u.gui.font
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8191 # ifdef FEAT_XFONTSET
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8192 && aep->ae_u.gui.fontset == taep->ae_u.gui.fontset
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8193 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8194 ))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8195 ||
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8196 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8197 (table == &term_attr_table
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8198 && (aep->ae_u.term.start == NULL)
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8199 == (taep->ae_u.term.start == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8200 && (aep->ae_u.term.start == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8201 || STRCMP(aep->ae_u.term.start,
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8202 taep->ae_u.term.start) == 0)
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8203 && (aep->ae_u.term.stop == NULL)
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8204 == (taep->ae_u.term.stop == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8205 && (aep->ae_u.term.stop == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8206 || STRCMP(aep->ae_u.term.stop,
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8207 taep->ae_u.term.stop) == 0))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8208 || (table == &cterm_attr_table
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8209 && aep->ae_u.cterm.fg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8210 == taep->ae_u.cterm.fg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8211 && aep->ae_u.cterm.bg_color
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8212 == taep->ae_u.cterm.bg_color)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8213 ))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8214
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8215 return i + ATTR_OFF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8216 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8217
271
8d34af900bae updated for version 7.0072
vimboss
parents: 253
diff changeset
8218 if (table->ga_len + ATTR_OFF > MAX_TYPENR)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8219 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8220 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8221 * Running out of attribute entries! remove all attributes, and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8222 * compute new ones for all groups.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8223 * When called recursively, we are really out of numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8224 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8225 if (recursive)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8226 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8227 EMSG(_("E424: Too many different highlighting attributes in use"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8228 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8229 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8230 recursive = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8231
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8232 clear_hl_tables();
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8233
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8234 must_redraw = CLEAR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8235
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8236 for (i = 0; i < highlight_ga.ga_len; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8237 set_hl_attr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8238
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8239 recursive = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8240 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8241
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8242 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8243 * This is a new combination of colors and font, add an entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8244 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8245 if (ga_grow(table, 1) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8246 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8247
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8248 taep = &(((attrentry_T *)table->ga_data)[table->ga_len]);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8249 vim_memset(taep, 0, sizeof(attrentry_T));
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8250 taep->ae_attr = aep->ae_attr;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8251 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8252 if (table == &gui_attr_table)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8253 {
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8254 taep->ae_u.gui.fg_color = aep->ae_u.gui.fg_color;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8255 taep->ae_u.gui.bg_color = aep->ae_u.gui.bg_color;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8256 taep->ae_u.gui.sp_color = aep->ae_u.gui.sp_color;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8257 taep->ae_u.gui.font = aep->ae_u.gui.font;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8258 # ifdef FEAT_XFONTSET
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8259 taep->ae_u.gui.fontset = aep->ae_u.gui.fontset;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8260 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8261 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8262 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8263 if (table == &term_attr_table)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8264 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8265 if (aep->ae_u.term.start == NULL)
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8266 taep->ae_u.term.start = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8267 else
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8268 taep->ae_u.term.start = vim_strsave(aep->ae_u.term.start);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8269 if (aep->ae_u.term.stop == NULL)
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8270 taep->ae_u.term.stop = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8271 else
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8272 taep->ae_u.term.stop = vim_strsave(aep->ae_u.term.stop);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8273 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8274 else if (table == &cterm_attr_table)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8275 {
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8276 taep->ae_u.cterm.fg_color = aep->ae_u.cterm.fg_color;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8277 taep->ae_u.cterm.bg_color = aep->ae_u.cterm.bg_color;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8278 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8279 ++table->ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8280 return (table->ga_len - 1 + ATTR_OFF);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8281 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8282
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8283 /*
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8284 * Clear all highlight tables.
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8285 */
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8286 void
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8287 clear_hl_tables()
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8288 {
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8289 int i;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8290 attrentry_T *taep;
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8291
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8292 #ifdef FEAT_GUI
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8293 ga_clear(&gui_attr_table);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8294 #endif
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8295 for (i = 0; i < term_attr_table.ga_len; ++i)
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8296 {
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8297 taep = &(((attrentry_T *)term_attr_table.ga_data)[i]);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8298 vim_free(taep->ae_u.term.start);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8299 vim_free(taep->ae_u.term.stop);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8300 }
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8301 ga_clear(&term_attr_table);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8302 ga_clear(&cterm_attr_table);
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8303 }
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
8304
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8305 #if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO)
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8306 /*
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8307 * Combine special attributes (e.g., for spelling) with other attributes
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8308 * (e.g., for syntax highlighting).
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8309 * "prim_attr" overrules "char_attr".
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8310 * This creates a new group when required.
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8311 * Since we expect there to be few spelling mistakes we don't cache the
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8312 * result.
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8313 * Return the resulting attributes.
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8314 */
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8315 int
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8316 hl_combine_attr(char_attr, prim_attr)
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8317 int char_attr;
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8318 int prim_attr;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8319 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8320 attrentry_T *char_aep = NULL;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8321 attrentry_T *spell_aep;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8322 attrentry_T new_en;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8323
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8324 if (char_attr == 0)
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8325 return prim_attr;
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8326 if (char_attr <= HL_ALL && prim_attr <= HL_ALL)
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8327 return char_attr | prim_attr;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8328 #ifdef FEAT_GUI
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8329 if (gui.in_use)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8330 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8331 if (char_attr > HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8332 char_aep = syn_gui_attr2entry(char_attr);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8333 if (char_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8334 new_en = *char_aep;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8335 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8336 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8337 vim_memset(&new_en, 0, sizeof(new_en));
548
f43150a669dc updated for version 7.0155
vimboss
parents: 540
diff changeset
8338 new_en.ae_u.gui.fg_color = INVALCOLOR;
f43150a669dc updated for version 7.0155
vimboss
parents: 540
diff changeset
8339 new_en.ae_u.gui.bg_color = INVALCOLOR;
f43150a669dc updated for version 7.0155
vimboss
parents: 540
diff changeset
8340 new_en.ae_u.gui.sp_color = INVALCOLOR;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8341 if (char_attr <= HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8342 new_en.ae_attr = char_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8343 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8344
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8345 if (prim_attr <= HL_ALL)
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8346 new_en.ae_attr |= prim_attr;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8347 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8348 {
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8349 spell_aep = syn_gui_attr2entry(prim_attr);
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8350 if (spell_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8351 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8352 new_en.ae_attr |= spell_aep->ae_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8353 if (spell_aep->ae_u.gui.fg_color != INVALCOLOR)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8354 new_en.ae_u.gui.fg_color = spell_aep->ae_u.gui.fg_color;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8355 if (spell_aep->ae_u.gui.bg_color != INVALCOLOR)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8356 new_en.ae_u.gui.bg_color = spell_aep->ae_u.gui.bg_color;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8357 if (spell_aep->ae_u.gui.sp_color != INVALCOLOR)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8358 new_en.ae_u.gui.sp_color = spell_aep->ae_u.gui.sp_color;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8359 if (spell_aep->ae_u.gui.font != NOFONT)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8360 new_en.ae_u.gui.font = spell_aep->ae_u.gui.font;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8361 # ifdef FEAT_XFONTSET
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8362 if (spell_aep->ae_u.gui.fontset != NOFONTSET)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8363 new_en.ae_u.gui.fontset = spell_aep->ae_u.gui.fontset;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8364 # endif
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8365 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8366 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8367 return get_attr_entry(&gui_attr_table, &new_en);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8368 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8369 #endif
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8370
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8371 if (t_colors > 1)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8372 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8373 if (char_attr > HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8374 char_aep = syn_cterm_attr2entry(char_attr);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8375 if (char_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8376 new_en = *char_aep;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8377 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8378 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8379 vim_memset(&new_en, 0, sizeof(new_en));
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8380 if (char_attr <= HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8381 new_en.ae_attr = char_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8382 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8383
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8384 if (prim_attr <= HL_ALL)
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8385 new_en.ae_attr |= prim_attr;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8386 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8387 {
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8388 spell_aep = syn_cterm_attr2entry(prim_attr);
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8389 if (spell_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8390 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8391 new_en.ae_attr |= spell_aep->ae_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8392 if (spell_aep->ae_u.cterm.fg_color > 0)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8393 new_en.ae_u.cterm.fg_color = spell_aep->ae_u.cterm.fg_color;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8394 if (spell_aep->ae_u.cterm.bg_color > 0)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8395 new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8396 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8397 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8398 return get_attr_entry(&cterm_attr_table, &new_en);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8399 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8400
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8401 if (char_attr > HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8402 char_aep = syn_term_attr2entry(char_attr);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8403 if (char_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8404 new_en = *char_aep;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8405 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8406 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8407 vim_memset(&new_en, 0, sizeof(new_en));
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8408 if (char_attr <= HL_ALL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8409 new_en.ae_attr = char_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8410 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8411
348
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8412 if (prim_attr <= HL_ALL)
7e819e81117e updated for version 7.0090
vimboss
parents: 320
diff changeset
8413 new_en.ae_attr |= prim_attr;
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8414 else
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8415 {
607
1b7cac059bab updated for version 7.0172
vimboss
parents: 548
diff changeset
8416 spell_aep = syn_term_attr2entry(prim_attr);
221
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8417 if (spell_aep != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8418 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8419 new_en.ae_attr |= spell_aep->ae_attr;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8420 if (spell_aep->ae_u.term.start != NULL)
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8421 {
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8422 new_en.ae_u.term.start = spell_aep->ae_u.term.start;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8423 new_en.ae_u.term.stop = spell_aep->ae_u.term.stop;
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8424 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8425 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8426 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8427 return get_attr_entry(&term_attr_table, &new_en);
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8428 }
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8429 #endif
7fd4b5df33be updated for version 7.0062
vimboss
parents: 205
diff changeset
8430
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8431 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8432
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8433 attrentry_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8434 syn_gui_attr2entry(attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8435 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8436 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8437 attr -= ATTR_OFF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8438 if (attr >= gui_attr_table.ga_len) /* did ":syntax clear" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8439 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8440 return &(GUI_ATTR_ENTRY(attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8441 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8442 #endif /* FEAT_GUI */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8443
745
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8444 /*
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8445 * Get the highlight attributes (HL_BOLD etc.) from an attribute nr.
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8446 * Only to be used when "attr" > HL_ALL.
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8447 */
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8448 int
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8449 syn_attr2attr(attr)
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8450 int attr;
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8451 {
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8452 attrentry_T *aep;
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8453
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8454 #ifdef FEAT_GUI
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8455 if (gui.in_use)
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8456 aep = syn_gui_attr2entry(attr);
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8457 else
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8458 #endif
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8459 if (t_colors > 1)
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8460 aep = syn_cterm_attr2entry(attr);
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8461 else
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8462 aep = syn_term_attr2entry(attr);
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8463
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8464 if (aep == NULL) /* highlighting not set */
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8465 return 0;
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8466 return aep->ae_attr;
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8467 }
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8468
d41f5f59266e updated for version 7.0222
vimboss
parents: 699
diff changeset
8469
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8470 attrentry_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8471 syn_term_attr2entry(attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8472 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8473 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8474 attr -= ATTR_OFF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8475 if (attr >= term_attr_table.ga_len) /* did ":syntax clear" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8476 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8477 return &(TERM_ATTR_ENTRY(attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8478 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8479
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8480 attrentry_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8481 syn_cterm_attr2entry(attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8482 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8483 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8484 attr -= ATTR_OFF;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8485 if (attr >= cterm_attr_table.ga_len) /* did ":syntax clear" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8486 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8487 return &(CTERM_ATTR_ENTRY(attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8488 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8489
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8490 #define LIST_ATTR 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8491 #define LIST_STRING 2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8492 #define LIST_INT 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8493
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8494 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8495 highlight_list_one(id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8496 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8497 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8498 struct hl_group *sgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8499 int didh = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8500
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8501 sgp = &HL_TABLE()[id - 1]; /* index is ID minus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8502
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8503 didh = highlight_list_arg(id, didh, LIST_ATTR,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8504 sgp->sg_term, NULL, "term");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8505 didh = highlight_list_arg(id, didh, LIST_STRING,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8506 0, sgp->sg_start, "start");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8507 didh = highlight_list_arg(id, didh, LIST_STRING,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8508 0, sgp->sg_stop, "stop");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8509
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8510 didh = highlight_list_arg(id, didh, LIST_ATTR,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8511 sgp->sg_cterm, NULL, "cterm");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8512 didh = highlight_list_arg(id, didh, LIST_INT,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8513 sgp->sg_cterm_fg, NULL, "ctermfg");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8514 didh = highlight_list_arg(id, didh, LIST_INT,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8515 sgp->sg_cterm_bg, NULL, "ctermbg");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8516
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
8517 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8518 didh = highlight_list_arg(id, didh, LIST_ATTR,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8519 sgp->sg_gui, NULL, "gui");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8520 didh = highlight_list_arg(id, didh, LIST_STRING,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8521 0, sgp->sg_gui_fg_name, "guifg");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8522 didh = highlight_list_arg(id, didh, LIST_STRING,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8523 0, sgp->sg_gui_bg_name, "guibg");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8524 didh = highlight_list_arg(id, didh, LIST_STRING,
301
006e9c8a6a8a updated for version 7.0079
vimboss
parents: 298
diff changeset
8525 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
8526 #endif
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
8527 #ifdef FEAT_GUI
301
006e9c8a6a8a updated for version 7.0079
vimboss
parents: 298
diff changeset
8528 didh = highlight_list_arg(id, didh, LIST_STRING,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8529 0, sgp->sg_font_name, "font");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8530 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8531
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8532 if (sgp->sg_link && !got_int)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8533 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8534 (void)syn_list_header(didh, 9999, id);
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8535 didh = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8536 msg_puts_attr((char_u *)"links to", hl_attr(HLF_D));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8537 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8538 msg_outtrans(HL_TABLE()[HL_TABLE()[id - 1].sg_link - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8539 }
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8540
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8541 if (!didh)
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8542 highlight_list_arg(id, didh, LIST_STRING, 0, (char_u *)"cleared", "");
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8543 #ifdef FEAT_EVAL
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8544 if (p_verbose > 0)
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8545 last_set_msg(sgp->sg_scriptID);
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8546 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8547 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8548
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8549 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8550 highlight_list_arg(id, didh, type, iarg, sarg, name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8551 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8552 int didh;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8553 int type;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8554 int iarg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8555 char_u *sarg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8556 char *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8557 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8558 char_u buf[100];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8559 char_u *ts;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8560 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8561
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8562 if (got_int)
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8563 return FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8564 if (type == LIST_STRING ? (sarg != NULL) : (iarg != 0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8565 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8566 ts = buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8567 if (type == LIST_INT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8568 sprintf((char *)buf, "%d", iarg - 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8569 else if (type == LIST_STRING)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8570 ts = sarg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8571 else /* type == LIST_ATTR */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8572 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8573 buf[0] = NUL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8574 for (i = 0; hl_attr_table[i] != 0; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8575 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8576 if (iarg & hl_attr_table[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8577 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8578 if (buf[0] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8579 STRCAT(buf, ",");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8580 STRCAT(buf, hl_name_table[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8581 iarg &= ~hl_attr_table[i]; /* don't want "inverse" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8582 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8583 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8584 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8585
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8586 (void)syn_list_header(didh,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8587 (int)(vim_strsize(ts) + STRLEN(name) + 1), id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8588 didh = TRUE;
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8589 if (!got_int)
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8590 {
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8591 if (*name != NUL)
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8592 {
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8593 MSG_PUTS_ATTR(name, hl_attr(HLF_D));
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8594 MSG_PUTS_ATTR("=", hl_attr(HLF_D));
07d199fe02ed updated for version 7.0209
vimboss
parents: 683
diff changeset
8595 }
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8596 msg_outtrans(ts);
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8597 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8598 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8599 return didh;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8600 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8601
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8602 #if (((defined(FEAT_EVAL) || defined(FEAT_PRINTER))) && defined(FEAT_SYN_HL)) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8603 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8604 * Return "1" if highlight group "id" has attribute "flag".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8605 * Return NULL otherwise.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8606 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8607 char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8608 highlight_has_attr(id, flag, modec)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8609 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8610 int flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8611 int modec; /* 'g' for GUI, 'c' for cterm, 't' for term */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8612 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8613 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8614
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8615 if (id <= 0 || id > highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8616 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8617
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
8618 #if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8619 if (modec == 'g')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8620 attr = HL_TABLE()[id - 1].sg_gui;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8621 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8622 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8623 if (modec == 'c')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8624 attr = HL_TABLE()[id - 1].sg_cterm;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8625 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8626 attr = HL_TABLE()[id - 1].sg_term;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8627
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8628 if (attr & flag)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8629 return (char_u *)"1";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8630 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8631 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8632 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8633
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8634 #if (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8635 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8636 * Return color name of highlight group "id".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8637 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8638 char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8639 highlight_color(id, what, modec)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8640 int id;
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8641 char_u *what; /* "font", "fg", "bg", "sp", "fg#", "bg#" or "sp#" */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8642 int modec; /* 'g' for GUI, 'c' for cterm, 't' for term */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8643 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8644 static char_u name[20];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8645 int n;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8646 int fg = FALSE;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8647 int sp = FALSE;
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8648 int font = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8649
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8650 if (id <= 0 || id > highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8651 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8652
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8653 if (TOLOWER_ASC(what[0]) == 'f' && TOLOWER_ASC(what[1]) == 'g')
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8654 fg = TRUE;
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8655 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
8656 && 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
8657 font = TRUE;
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8658 else if (TOLOWER_ASC(what[0]) == 's' && TOLOWER_ASC(what[1]) == 'p')
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8659 sp = TRUE;
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8660 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
8661 return NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8662 if (modec == 'g')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8663 {
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
8664 # ifdef FEAT_GUI
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8665 /* return font name */
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8666 if (font)
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8667 return HL_TABLE()[id - 1].sg_font_name;
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8668
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8669 /* return #RRGGBB form (only possible when GUI is running) */
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8670 if (gui.in_use && what[2] == '#')
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8671 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8672 guicolor_T color;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8673 long_u rgb;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8674 static char_u buf[10];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8675
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8676 if (fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8677 color = HL_TABLE()[id - 1].sg_gui_fg;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8678 else if (sp)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8679 color = HL_TABLE()[id - 1].sg_gui_sp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8680 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8681 color = HL_TABLE()[id - 1].sg_gui_bg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8682 if (color == INVALCOLOR)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8683 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8684 rgb = gui_mch_get_rgb(color);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8685 sprintf((char *)buf, "#%02x%02x%02x",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8686 (unsigned)(rgb >> 16),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8687 (unsigned)(rgb >> 8) & 255,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8688 (unsigned)rgb & 255);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8689 return buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8690 }
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
8691 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8692 if (fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8693 return (HL_TABLE()[id - 1].sg_gui_fg_name);
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8694 if (sp)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8695 return (HL_TABLE()[id - 1].sg_gui_sp_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8696 return (HL_TABLE()[id - 1].sg_gui_bg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8697 }
2106
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8698 if (font || sp)
15674e198164 updated for version 7.2.389
Bram Moolenaar <bram@zimbu.org>
parents: 2100
diff changeset
8699 return NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8700 if (modec == 'c')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8701 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8702 if (fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8703 n = HL_TABLE()[id - 1].sg_cterm_fg - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8704 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8705 n = HL_TABLE()[id - 1].sg_cterm_bg - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8706 sprintf((char *)name, "%d", n);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8707 return name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8708 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8709 /* term doesn't have color */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8710 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8711 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8712 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8713
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8714 #if (defined(FEAT_SYN_HL) && defined(FEAT_GUI) && defined(FEAT_PRINTER)) \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8715 || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8716 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8717 * Return color name of highlight group "id" as RGB value.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8718 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8719 long_u
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8720 highlight_gui_color_rgb(id, fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8721 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8722 int fg; /* TRUE = fg, FALSE = bg */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8723 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8724 guicolor_T color;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8725
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8726 if (id <= 0 || id > highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8727 return 0L;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8728
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8729 if (fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8730 color = HL_TABLE()[id - 1].sg_gui_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8731 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8732 color = HL_TABLE()[id - 1].sg_gui_bg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8733
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8734 if (color == INVALCOLOR)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8735 return 0L;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8736
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8737 return gui_mch_get_rgb(color);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8738 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8739 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8740
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8741 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8742 * Output the syntax list header.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8743 * Return TRUE when started a new line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8744 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8745 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8746 syn_list_header(did_header, outlen, id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8747 int did_header; /* did header already */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8748 int outlen; /* length of string that comes */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8749 int id; /* highlight group id */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8750 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8751 int endcol = 19;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8752 int newline = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8753
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8754 if (!did_header)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8755 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8756 msg_putchar('\n');
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8757 if (got_int)
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8758 return TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8759 msg_outtrans(HL_TABLE()[id - 1].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8760 endcol = 15;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8761 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8762 else if (msg_col + outlen + 1 >= Columns)
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8763 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8764 msg_putchar('\n');
448
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8765 if (got_int)
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8766 return TRUE;
dd9db57ee7ce updated for version 7.0118
vimboss
parents: 442
diff changeset
8767 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8768 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8769 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8770 if (msg_col >= endcol) /* wrap around is like starting a new line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8771 newline = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8772 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8773
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8774 if (msg_col >= endcol) /* output at least one space */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8775 endcol = msg_col + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8776 if (Columns <= endcol) /* avoid hang for tiny window */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8777 endcol = Columns - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8778
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8779 msg_advance(endcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8780
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8781 /* Show "xxx" with the attributes. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8782 if (!did_header)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8783 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8784 msg_puts_attr((char_u *)"xxx", syn_id2attr(id));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8785 msg_putchar(' ');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8786 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8787
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8788 return newline;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8789 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8790
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8791 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8792 * Set the attribute numbers for a highlight group.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8793 * Called after one of the attributes has changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8794 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8795 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8796 set_hl_attr(idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8797 int idx; /* index in array */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8798 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8799 attrentry_T at_en;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8800 struct hl_group *sgp = HL_TABLE() + idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8801
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8802 /* The "Normal" group doesn't need an attribute number */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8803 if (sgp->sg_name_u != NULL && STRCMP(sgp->sg_name_u, "NORMAL") == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8804 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8805
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8806 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8807 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8808 * For the GUI mode: If there are other than "normal" highlighting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8809 * attributes, need to allocate an attr number.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8810 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8811 if (sgp->sg_gui_fg == INVALCOLOR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8812 && sgp->sg_gui_bg == INVALCOLOR
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8813 && sgp->sg_gui_sp == INVALCOLOR
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8814 && sgp->sg_font == NOFONT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8815 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8816 && sgp->sg_fontset == NOFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8817 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8818 )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8819 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8820 sgp->sg_gui_attr = sgp->sg_gui;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8821 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8822 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8824 at_en.ae_attr = sgp->sg_gui;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8825 at_en.ae_u.gui.fg_color = sgp->sg_gui_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8826 at_en.ae_u.gui.bg_color = sgp->sg_gui_bg;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
8827 at_en.ae_u.gui.sp_color = sgp->sg_gui_sp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8828 at_en.ae_u.gui.font = sgp->sg_font;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8829 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8830 at_en.ae_u.gui.fontset = sgp->sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8831 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8832 sgp->sg_gui_attr = get_attr_entry(&gui_attr_table, &at_en);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8833 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8834 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8835 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8836 * For the term mode: If there are other than "normal" highlighting
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8837 * attributes, need to allocate an attr number.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8838 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8839 if (sgp->sg_start == NULL && sgp->sg_stop == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8840 sgp->sg_term_attr = sgp->sg_term;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8841 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8842 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8843 at_en.ae_attr = sgp->sg_term;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8844 at_en.ae_u.term.start = sgp->sg_start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8845 at_en.ae_u.term.stop = sgp->sg_stop;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8846 sgp->sg_term_attr = get_attr_entry(&term_attr_table, &at_en);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8847 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8848
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8849 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8850 * For the color term mode: If there are other than "normal"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8851 * highlighting attributes, need to allocate an attr number.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8852 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8853 if (sgp->sg_cterm_fg == 0 && sgp->sg_cterm_bg == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8854 sgp->sg_cterm_attr = sgp->sg_cterm;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8855 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8856 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8857 at_en.ae_attr = sgp->sg_cterm;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8858 at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8859 at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8860 sgp->sg_cterm_attr = get_attr_entry(&cterm_attr_table, &at_en);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8861 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8862 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8863
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8864 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8865 * Lookup a highlight group name and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8866 * If it is not found, 0 is returned.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8867 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8868 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8869 syn_name2id(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8870 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8871 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8872 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8873 char_u name_u[200];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8874
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8875 /* Avoid using stricmp() too much, it's slow on some systems */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8876 /* Avoid alloc()/free(), these are slow too. ID names over 200 chars
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8877 * don't deserve to be found! */
419
f713fc55bf7b updated for version 7.0109
vimboss
parents: 410
diff changeset
8878 vim_strncpy(name_u, name, 199);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8879 vim_strup(name_u);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8880 for (i = highlight_ga.ga_len; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8881 if (HL_TABLE()[i].sg_name_u != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8882 && STRCMP(name_u, HL_TABLE()[i].sg_name_u) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8883 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8884 return i + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8885 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8886
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8887 #if defined(FEAT_EVAL) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8888 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8889 * Return TRUE if highlight group "name" exists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8890 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8891 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8892 highlight_exists(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8893 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8894 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8895 return (syn_name2id(name) > 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8896 }
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8897
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8898 # if defined(FEAT_SEARCH_EXTRA) || defined(PROTO)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8899 /*
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8900 * Return the name of highlight group "id".
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8901 * When not a valid ID return an empty string.
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8902 */
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8903 char_u *
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8904 syn_id2name(id)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8905 int id;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8906 {
1326
22886f3d882d updated for version 7.1-040
vimboss
parents: 1322
diff changeset
8907 if (id <= 0 || id > highlight_ga.ga_len)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8908 return (char_u *)"";
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8909 return HL_TABLE()[id - 1].sg_name;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8910 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 818
diff changeset
8911 # endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8912 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8913
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8914 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8915 * Like syn_name2id(), but take a pointer + length argument.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8916 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8917 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8918 syn_namen2id(linep, len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8919 char_u *linep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8920 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8921 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8922 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8923 int id = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8924
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8925 name = vim_strnsave(linep, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8926 if (name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8927 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8928 id = syn_name2id(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8929 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8930 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8931 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8932 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8933
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8934 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8935 * Find highlight group name in the table and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8936 * The argument is a pointer to the name and the length of the name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8937 * If it doesn't exist yet, a new entry is created.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8938 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8939 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8940 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8941 syn_check_group(pp, len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8942 char_u *pp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8943 int len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8944 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8945 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8946 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8947
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8948 name = vim_strnsave(pp, len);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8949 if (name == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8950 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8951
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8952 id = syn_name2id(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8953 if (id == 0) /* doesn't exist yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8954 id = syn_add_group(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8955 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8956 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8957 return id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8958 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8959
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8960 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8961 * Add new highlight group and return it's ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8962 * "name" must be an allocated string, it will be consumed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8963 * Return 0 for failure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8964 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8965 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8966 syn_add_group(name)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8967 char_u *name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8968 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8969 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8970
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8971 /* Check that the name is ASCII letters, digits and underscore. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8972 for (p = name; *p != NUL; ++p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8973 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8974 if (!vim_isprintc(*p))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8975 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8976 EMSG(_("E669: Unprintable character in group name"));
2020
710da9abc3c1 updated for version 7.2-317
vimboss
parents: 1883
diff changeset
8977 vim_free(name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8978 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8979 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8980 else if (!ASCII_ISALNUM(*p) && *p != '_')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8981 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8982 /* This is an error, but since there previously was no check only
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8983 * give a warning. */
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 12
diff changeset
8984 msg_source(hl_attr(HLF_W));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8985 MSG(_("W18: Invalid character in group name"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8986 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8987 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8988 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8989
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8990 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8991 * First call for this growarray: init growing array.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8992 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8993 if (highlight_ga.ga_data == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8994 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8995 highlight_ga.ga_itemsize = sizeof(struct hl_group);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8996 highlight_ga.ga_growsize = 10;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8997 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8998
2756
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
8999 if (highlight_ga.ga_len >= MAX_HL_ID)
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
9000 {
d72d709f0e18 updated for version 7.3.154
Bram Moolenaar <bram@vim.org>
parents: 2743
diff changeset
9001 EMSG(_("E849: Too many highlight and syntax groups"));
2743
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
9002 vim_free(name);
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
9003 return 0;
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
9004 }
d67916de812a updated for version 7.3.148
Bram Moolenaar <bram@vim.org>
parents: 2686
diff changeset
9005
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9006 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9007 * Make room for at least one other syntax_highlight entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9008 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9009 if (ga_grow(&highlight_ga, 1) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9010 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9011 vim_free(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9012 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9013 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9014
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9015 vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(struct hl_group));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9016 HL_TABLE()[highlight_ga.ga_len].sg_name = name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9017 HL_TABLE()[highlight_ga.ga_len].sg_name_u = vim_strsave_up(name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9018 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9019 HL_TABLE()[highlight_ga.ga_len].sg_gui_bg = INVALCOLOR;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9020 HL_TABLE()[highlight_ga.ga_len].sg_gui_fg = INVALCOLOR;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9021 HL_TABLE()[highlight_ga.ga_len].sg_gui_sp = INVALCOLOR;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9022 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9023 ++highlight_ga.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9024
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9025 return highlight_ga.ga_len; /* ID is index plus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9026 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9027
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9028 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9029 * When, just after calling syn_add_group(), an error is discovered, this
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9030 * function deletes the new name.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9031 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9032 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9033 syn_unadd_group()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9034 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9035 --highlight_ga.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9036 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9037 vim_free(HL_TABLE()[highlight_ga.ga_len].sg_name_u);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9038 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9039
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9040 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9041 * Translate a group ID to highlight attributes.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9042 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9043 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9044 syn_id2attr(hl_id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9045 int hl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9046 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9047 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9048 struct hl_group *sgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9049
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9050 hl_id = syn_get_final_id(hl_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9051 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9052
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9053 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9054 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9055 * Only use GUI attr when the GUI is being used.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9056 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9057 if (gui.in_use)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9058 attr = sgp->sg_gui_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9059 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9060 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9061 if (t_colors > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9062 attr = sgp->sg_cterm_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9063 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9064 attr = sgp->sg_term_attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9065
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9066 return attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9067 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9068
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9069 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9070 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9071 * Get the GUI colors and attributes for a group ID.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9072 * NOTE: the colors will be INVALCOLOR when not set, the color otherwise.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9073 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9074 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9075 syn_id2colors(hl_id, fgp, bgp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9076 int hl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9077 guicolor_T *fgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9078 guicolor_T *bgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9079 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9080 struct hl_group *sgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9081
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9082 hl_id = syn_get_final_id(hl_id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9083 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9084
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9085 *fgp = sgp->sg_gui_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9086 *bgp = sgp->sg_gui_bg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9087 return sgp->sg_gui;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9088 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9089 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9090
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9091 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9092 * Translate a group ID to the final group ID (following links).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9093 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9094 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9095 syn_get_final_id(hl_id)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9096 int hl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9097 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9098 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9099 struct hl_group *sgp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9100
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9101 if (hl_id > highlight_ga.ga_len || hl_id < 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9102 return 0; /* Can be called from eval!! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9103
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9104 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9105 * Follow links until there is no more.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9106 * Look out for loops! Break after 100 links.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9107 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9108 for (count = 100; --count >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9109 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9110 sgp = &HL_TABLE()[hl_id - 1]; /* index is ID minus one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9111 if (sgp->sg_link == 0 || sgp->sg_link > highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9112 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9113 hl_id = sgp->sg_link;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9114 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9115
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9116 return hl_id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9117 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9119 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9120 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9121 * Call this function just after the GUI has started.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9122 * It finds the font and color handles for the highlighting groups.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9123 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9124 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9125 highlight_gui_started()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9126 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9127 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9128
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9129 /* First get the colors from the "Normal" and "Menu" group, if set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9130 set_normal_colors();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9131
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9132 for (idx = 0; idx < highlight_ga.ga_len; ++idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9133 gui_do_one_color(idx, FALSE, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9134
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9135 highlight_changed();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9136 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9137
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9138 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9139 gui_do_one_color(idx, do_menu, do_tooltip)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9140 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9141 int do_menu; /* TRUE: might set the menu font */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9142 int do_tooltip; /* TRUE: might set the tooltip font */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9143 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9144 int didit = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9145
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9146 if (HL_TABLE()[idx].sg_font_name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9147 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9148 hl_do_font(idx, HL_TABLE()[idx].sg_font_name, FALSE, do_menu,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9149 do_tooltip);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9150 didit = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9151 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9152 if (HL_TABLE()[idx].sg_gui_fg_name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9153 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9154 HL_TABLE()[idx].sg_gui_fg =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9155 color_name2handle(HL_TABLE()[idx].sg_gui_fg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9156 didit = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9157 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9158 if (HL_TABLE()[idx].sg_gui_bg_name != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9159 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9160 HL_TABLE()[idx].sg_gui_bg =
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9161 color_name2handle(HL_TABLE()[idx].sg_gui_bg_name);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9162 didit = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9163 }
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9164 if (HL_TABLE()[idx].sg_gui_sp_name != NULL)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9165 {
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9166 HL_TABLE()[idx].sg_gui_sp =
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9167 color_name2handle(HL_TABLE()[idx].sg_gui_sp_name);
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9168 didit = TRUE;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9169 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9170 if (didit) /* need to get a new attr number */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9171 set_hl_attr(idx);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9172 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9173
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9174 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9175
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9176 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9177 * Translate the 'highlight' option into attributes in highlight_attr[] and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9178 * set up the user highlights User1..9. If FEAT_STL_OPT is in use, a set of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9179 * corresponding highlights to use on top of HLF_SNC is computed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9180 * Called only when the 'highlight' option has been changed and upon first
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9181 * screen redraw after any :highlight command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9182 * Return FAIL when an invalid flag is found in 'highlight'. OK otherwise.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9183 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9184 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9185 highlight_changed()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9186 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9187 int hlf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9188 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9189 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9190 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9191 char_u *end;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9192 int id;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9193 #ifdef USER_HIGHLIGHT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9194 char_u userhl[10];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9195 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9196 int id_SNC = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9197 int id_S = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9198 int hlcnt;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9199 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9200 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9201 static int hl_flags[HLF_COUNT] = HL_FLAGS;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9202
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9203 need_highlight_changed = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9204
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9205 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9206 * Clear all attributes.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9207 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9208 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9209 highlight_attr[hlf] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9210
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9211 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9212 * First set all attributes to their default value.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9213 * Then use the attributes from the 'highlight' option.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9214 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9215 for (i = 0; i < 2; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9216 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9217 if (i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9218 p = p_hl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9219 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9220 p = get_highlight_default();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9221 if (p == NULL) /* just in case */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9222 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9223
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9224 while (*p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9225 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9226 for (hlf = 0; hlf < (int)HLF_COUNT; ++hlf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9227 if (hl_flags[hlf] == *p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9228 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9229 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9230 if (hlf == (int)HLF_COUNT || *p == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9231 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9232
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9233 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9234 * Allow several hl_flags to be combined, like "bu" for
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9235 * bold-underlined.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9236 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9237 attr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9238 for ( ; *p && *p != ','; ++p) /* parse upto comma */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9239 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9240 if (vim_iswhite(*p)) /* ignore white space */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9241 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9242
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9243 if (attr > HL_ALL) /* Combination with ':' is not allowed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9244 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9245
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9246 switch (*p)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9247 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9248 case 'b': attr |= HL_BOLD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9249 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9250 case 'i': attr |= HL_ITALIC;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9251 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9252 case '-':
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9253 case 'n': /* no highlighting */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9254 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9255 case 'r': attr |= HL_INVERSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9256 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9257 case 's': attr |= HL_STANDOUT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9258 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9259 case 'u': attr |= HL_UNDERLINE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9260 break;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9261 case 'c': attr |= HL_UNDERCURL;
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9262 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9263 case ':': ++p; /* highlight group name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9264 if (attr || *p == NUL) /* no combinations */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9265 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9266 end = vim_strchr(p, ',');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9267 if (end == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9268 end = p + STRLEN(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9269 id = syn_check_group(p, (int)(end - p));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9270 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9271 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9272 attr = syn_id2attr(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9273 p = end - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9274 #if defined(FEAT_STL_OPT) && defined(USER_HIGHLIGHT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9275 if (hlf == (int)HLF_SNC)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9276 id_SNC = syn_get_final_id(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9277 else if (hlf == (int)HLF_S)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9278 id_S = syn_get_final_id(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9279 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9280 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9281 default: return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9282 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9283 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9284 highlight_attr[hlf] = attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9285
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9286 p = skip_to_option_part(p); /* skip comma and spaces */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9287 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9288 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9289
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9290 #ifdef USER_HIGHLIGHT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9291 /* Setup the user highlights
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9292 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9293 * Temporarily utilize 10 more hl entries. Have to be in there
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9294 * simultaneously in case of table overflows in get_attr_entry()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9295 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9296 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9297 if (ga_grow(&highlight_ga, 10) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9298 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9299 hlcnt = highlight_ga.ga_len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9300 if (id_S == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9301 { /* Make sure id_S is always valid to simplify code below */
2215
cccb71c2c5c1 Fix uninit memory read in undo code. Fix uint32_t in proto file.
Bram Moolenaar <bram@vim.org>
parents: 2136
diff changeset
9302 vim_memset(&HL_TABLE()[hlcnt + 9], 0, sizeof(struct hl_group));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9303 HL_TABLE()[hlcnt + 9].sg_term = highlight_attr[HLF_S];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9304 id_S = hlcnt + 10;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9305 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9306 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9307 for (i = 0; i < 9; i++)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9308 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9309 sprintf((char *)userhl, "User%d", i + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9310 id = syn_name2id(userhl);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9311 if (id == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9312 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9313 highlight_user[i] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9314 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9315 highlight_stlnc[i] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9316 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9317 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9318 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9319 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9320 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9321 struct hl_group *hlt = HL_TABLE();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9322 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9323
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9324 highlight_user[i] = syn_id2attr(id);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9325 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9326 if (id_SNC == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9327 {
2215
cccb71c2c5c1 Fix uninit memory read in undo code. Fix uint32_t in proto file.
Bram Moolenaar <bram@vim.org>
parents: 2136
diff changeset
9328 vim_memset(&hlt[hlcnt + i], 0, sizeof(struct hl_group));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9329 hlt[hlcnt + i].sg_term = highlight_attr[HLF_SNC];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9330 hlt[hlcnt + i].sg_cterm = highlight_attr[HLF_SNC];
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
9331 # if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9332 hlt[hlcnt + i].sg_gui = highlight_attr[HLF_SNC];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9333 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9334 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9335 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9336 mch_memmove(&hlt[hlcnt + i],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9337 &hlt[id_SNC - 1],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9338 sizeof(struct hl_group));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9339 hlt[hlcnt + i].sg_link = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9340
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9341 /* Apply difference between UserX and HLF_S to HLF_SNC */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9342 hlt[hlcnt + i].sg_term ^=
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9343 hlt[id - 1].sg_term ^ hlt[id_S - 1].sg_term;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9344 if (hlt[id - 1].sg_start != hlt[id_S - 1].sg_start)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9345 hlt[hlcnt + i].sg_start = hlt[id - 1].sg_start;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9346 if (hlt[id - 1].sg_stop != hlt[id_S - 1].sg_stop)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9347 hlt[hlcnt + i].sg_stop = hlt[id - 1].sg_stop;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9348 hlt[hlcnt + i].sg_cterm ^=
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9349 hlt[id - 1].sg_cterm ^ hlt[id_S - 1].sg_cterm;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9350 if (hlt[id - 1].sg_cterm_fg != hlt[id_S - 1].sg_cterm_fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9351 hlt[hlcnt + i].sg_cterm_fg = hlt[id - 1].sg_cterm_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9352 if (hlt[id - 1].sg_cterm_bg != hlt[id_S - 1].sg_cterm_bg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9353 hlt[hlcnt + i].sg_cterm_bg = hlt[id - 1].sg_cterm_bg;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
9354 # if defined(FEAT_GUI) || defined(FEAT_EVAL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9355 hlt[hlcnt + i].sg_gui ^=
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9356 hlt[id - 1].sg_gui ^ hlt[id_S - 1].sg_gui;
2318
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
9357 # endif
9cf111138fb9 Allow synIDattr() getting GUI attributes when build without GUI.
Bram Moolenaar <bram@vim.org>
parents: 2314
diff changeset
9358 # ifdef FEAT_GUI
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9359 if (hlt[id - 1].sg_gui_fg != hlt[id_S - 1].sg_gui_fg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9360 hlt[hlcnt + i].sg_gui_fg = hlt[id - 1].sg_gui_fg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9361 if (hlt[id - 1].sg_gui_bg != hlt[id_S - 1].sg_gui_bg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9362 hlt[hlcnt + i].sg_gui_bg = hlt[id - 1].sg_gui_bg;
205
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9363 if (hlt[id - 1].sg_gui_sp != hlt[id_S - 1].sg_gui_sp)
d292c40ca788 updated for version 7.0060
vimboss
parents: 168
diff changeset
9364 hlt[hlcnt + i].sg_gui_sp = hlt[id - 1].sg_gui_sp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9365 if (hlt[id - 1].sg_font != hlt[id_S - 1].sg_font)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9366 hlt[hlcnt + i].sg_font = hlt[id - 1].sg_font;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9367 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9368 if (hlt[id - 1].sg_fontset != hlt[id_S - 1].sg_fontset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9369 hlt[hlcnt + i].sg_fontset = hlt[id - 1].sg_fontset;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9370 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9371 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9372 highlight_ga.ga_len = hlcnt + i + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9373 set_hl_attr(hlcnt + i); /* At long last we can apply */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9374 highlight_stlnc[i] = syn_id2attr(hlcnt + i + 1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9375 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9376 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9377 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9378 # ifdef FEAT_STL_OPT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9379 highlight_ga.ga_len = hlcnt;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9380 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9381
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9382 #endif /* USER_HIGHLIGHT */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9383
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9384 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9385 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9386
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9387 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9388
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9389 static void highlight_list __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9390 static void highlight_list_two __ARGS((int cnt, int attr));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9391
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9392 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9393 * Handle command line completion for :highlight command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9394 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9395 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9396 set_context_in_highlight_cmd(xp, arg)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9397 expand_T *xp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9398 char_u *arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9399 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9400 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9401
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9402 /* Default: expand group names */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9403 xp->xp_context = EXPAND_HIGHLIGHT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9404 xp->xp_pattern = arg;
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9405 include_link = 2;
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9406 include_default = 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9407
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9408 /* (part of) subcommand already typed */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9409 if (*arg != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9410 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9411 p = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9412 if (*p != NUL) /* past "default" or group name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9413 {
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9414 include_default = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9415 if (STRNCMP("default", arg, p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9416 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9417 arg = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9418 xp->xp_pattern = arg;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9419 p = skiptowhite(arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9420 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9421 if (*p != NUL) /* past group name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9422 {
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9423 include_link = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9424 if (arg[1] == 'i' && arg[0] == 'N')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9425 highlight_list();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9426 if (STRNCMP("link", arg, p - arg) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9427 || STRNCMP("clear", arg, p - arg) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9428 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9429 xp->xp_pattern = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9430 p = skiptowhite(xp->xp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9431 if (*p != NUL) /* past first group name */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9432 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9433 xp->xp_pattern = skipwhite(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9434 p = skiptowhite(xp->xp_pattern);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9435 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9436 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9437 if (*p != NUL) /* past group name(s) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9438 xp->xp_context = EXPAND_NOTHING;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9439 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9440 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9441 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9442 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9443
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9444 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9445 * List highlighting matches in a nice way.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9446 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9447 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9448 highlight_list()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9449 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9450 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9451
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9452 for (i = 10; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9453 highlight_list_two(i, hl_attr(HLF_D));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9454 for (i = 40; --i >= 0; )
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9455 highlight_list_two(99, 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9456 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9457
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9458 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9459 highlight_list_two(cnt, attr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9460 int cnt;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9461 int attr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9462 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9463 msg_puts_attr((char_u *)("N \bI \b! \b" + cnt / 11), attr);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9464 msg_clr_eos();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9465 out_flush();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9466 ui_delay(cnt == 99 ? 40L : (long)cnt * 50L, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9467 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9468
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9469 #endif /* FEAT_CMDL_COMPL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9470
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9471 #if defined(FEAT_CMDL_COMPL) || (defined(FEAT_SYN_HL) && defined(FEAT_EVAL)) \
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9472 || defined(FEAT_SIGNS) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9473 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9474 * Function given to ExpandGeneric() to obtain the list of group names.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9475 * Also used for synIDattr() function.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9476 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9477 char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9478 get_highlight_name(xp, idx)
1883
c8f343a465a2 updated for version 7.2-180
vimboss
parents: 1702
diff changeset
9479 expand_T *xp UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9480 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9481 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9482 #ifdef FEAT_CMDL_COMPL
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9483 if (idx == highlight_ga.ga_len && include_none != 0)
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9484 return (char_u *)"none";
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9485 if (idx == highlight_ga.ga_len + include_none && include_default != 0)
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9486 return (char_u *)"default";
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9487 if (idx == highlight_ga.ga_len + include_none + include_default
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9488 && include_link != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9489 return (char_u *)"link";
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9490 if (idx == highlight_ga.ga_len + include_none + include_default + 1
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9491 && include_link != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9492 return (char_u *)"clear";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9493 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9494 if (idx < 0 || idx >= highlight_ga.ga_len)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9495 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9496 return HL_TABLE()[idx].sg_name;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9497 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9498 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9499
1322
4ce0a7e4c6b3 updated for version 7.1-036
vimboss
parents: 1299
diff changeset
9500 #if defined(FEAT_GUI) || defined(PROTO)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9501 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9502 * Free all the highlight group fonts.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9503 * Used when quitting for systems which need it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9504 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9505 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9506 free_highlight_fonts()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9507 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9508 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9509
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9510 for (idx = 0; idx < highlight_ga.ga_len; ++idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9511 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9512 gui_mch_free_font(HL_TABLE()[idx].sg_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9513 HL_TABLE()[idx].sg_font = NOFONT;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9514 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9515 gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9516 HL_TABLE()[idx].sg_fontset = NOFONTSET;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9517 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9518 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9519
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9520 gui_mch_free_font(gui.norm_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9521 # ifdef FEAT_XFONTSET
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9522 gui_mch_free_fontset(gui.fontset);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9523 # endif
2277
f42e0b5ff9e9 Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents: 2256
diff changeset
9524 # ifndef FEAT_GUI_GTK
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9525 gui_mch_free_font(gui.bold_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9526 gui_mch_free_font(gui.ital_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9527 gui_mch_free_font(gui.boldital_font);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9528 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9529 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9530 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9531
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9532 /**************************************
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9533 * End of Highlighting stuff *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9534 **************************************/