Mercurial > vim
annotate src/fold.c @ 11984:829a855d3204
Added tag v8.0.0872 for changeset 448635f73e096506361ae48f09eb19894910cab6
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 05 Aug 2017 19:45:05 +0200 |
parents | e9924d19ee37 |
children | 68d7bc045dbe |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * vim600:fdm=marker fdl=1 fdc=3: |
3 * | |
4 * VIM - Vi IMproved by Bram Moolenaar | |
5 * | |
6 * Do ":help uganda" in Vim to read copying and usage conditions. | |
7 * Do ":help credits" in Vim to see a list of people who contributed. | |
8 * See README.txt for an overview of the Vim source code. | |
9 */ | |
10 | |
11 /* | |
12 * fold.c: code for folding | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 #if defined(FEAT_FOLDING) || defined(PROTO) | |
18 | |
19 /* local declarations. {{{1 */ | |
20 /* typedef fold_T {{{2 */ | |
21 /* | |
22 * The toplevel folds for each window are stored in the w_folds growarray. | |
23 * Each toplevel fold can contain an array of second level folds in the | |
24 * fd_nested growarray. | |
25 * The info stored in both growarrays is the same: An array of fold_T. | |
26 */ | |
27 typedef struct | |
28 { | |
29 linenr_T fd_top; /* first line of fold; for nested fold | |
30 * relative to parent */ | |
31 linenr_T fd_len; /* number of lines in the fold */ | |
32 garray_T fd_nested; /* array of nested folds */ | |
33 char fd_flags; /* see below */ | |
34 char fd_small; /* TRUE, FALSE or MAYBE: fold smaller than | |
35 'foldminlines'; MAYBE applies to nested | |
36 folds too */ | |
37 } fold_T; | |
38 | |
39 #define FD_OPEN 0 /* fold is open (nested ones can be closed) */ | |
40 #define FD_CLOSED 1 /* fold is closed */ | |
41 #define FD_LEVEL 2 /* depends on 'foldlevel' (nested folds too) */ | |
42 | |
43 #define MAX_LEVEL 20 /* maximum fold depth */ | |
44 | |
45 /* static functions {{{2 */ | |
7801
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
46 static void newFoldLevelWin(win_T *wp); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
47 static int checkCloseRec(garray_T *gap, linenr_T lnum, int level); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
48 static int foldFind(garray_T *gap, linenr_T lnum, fold_T **fpp); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
49 static int foldLevelWin(win_T *wp, linenr_T lnum); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
50 static void checkupdate(win_T *wp); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
51 static void setFoldRepeat(linenr_T lnum, long count, int do_open); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
52 static linenr_T setManualFold(linenr_T lnum, int opening, int recurse, int *donep); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
53 static linenr_T setManualFoldWin(win_T *wp, linenr_T lnum, int opening, int recurse, int *donep); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
54 static void foldOpenNested(fold_T *fpr); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
55 static void deleteFoldEntry(garray_T *gap, int idx, int recursive); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
56 static void foldMarkAdjustRecurse(garray_T *gap, linenr_T line1, linenr_T line2, long amount, long amount_after); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
57 static int getDeepestNestingRecurse(garray_T *gap); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
58 static int check_closed(win_T *win, fold_T *fp, int *use_levelp, int level, int *maybe_smallp, linenr_T lnum_off); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
59 static void checkSmall(win_T *wp, fold_T *fp, linenr_T lnum_off); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
60 static void setSmallMaybe(garray_T *gap); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
61 static void foldCreateMarkers(linenr_T start, linenr_T end); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
62 static void foldAddMarker(linenr_T lnum, char_u *marker, int markerlen); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
63 static void deleteFoldMarkers(fold_T *fp, int recursive, linenr_T lnum_off); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
64 static void foldDelMarker(linenr_T lnum, char_u *marker, int markerlen); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
65 static void foldUpdateIEMS(win_T *wp, linenr_T top, linenr_T bot); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
66 static void parseMarker(win_T *wp); |
7 | 67 |
68 static char *e_nofold = N_("E490: No fold found"); | |
69 | |
70 /* | |
71 * While updating the folds lines between invalid_top and invalid_bot have an | |
72 * undefined fold level. Only used for the window currently being updated. | |
73 */ | |
74 static linenr_T invalid_top = (linenr_T)0; | |
75 static linenr_T invalid_bot = (linenr_T)0; | |
76 | |
77 /* | |
78 * When using 'foldexpr' we sometimes get the level of the next line, which | |
79 * calls foldlevel() to get the level of the current line, which hasn't been | |
80 * stored yet. To get around this chicken-egg problem the level of the | |
81 * previous line is stored here when available. prev_lnum is zero when the | |
82 * level is not available. | |
83 */ | |
84 static linenr_T prev_lnum = 0; | |
85 static int prev_lnum_lvl = -1; | |
86 | |
87 /* Flags used for "done" argument of setManualFold. */ | |
88 #define DONE_NOTHING 0 | |
89 #define DONE_ACTION 1 /* did close or open a fold */ | |
90 #define DONE_FOLD 2 /* did find a fold */ | |
91 | |
92 static int foldstartmarkerlen; | |
93 static char_u *foldendmarker; | |
94 static int foldendmarkerlen; | |
95 | |
96 /* Exported folding functions. {{{1 */ | |
97 /* copyFoldingState() {{{2 */ | |
98 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
99 /* | |
100 * Copy that folding state from window "wp_from" to window "wp_to". | |
101 */ | |
102 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
103 copyFoldingState(win_T *wp_from, win_T *wp_to) |
7 | 104 { |
105 wp_to->w_fold_manual = wp_from->w_fold_manual; | |
106 wp_to->w_foldinvalid = wp_from->w_foldinvalid; | |
107 cloneFoldGrowArray(&wp_from->w_folds, &wp_to->w_folds); | |
108 } | |
109 #endif | |
110 | |
111 /* hasAnyFolding() {{{2 */ | |
112 /* | |
113 * Return TRUE if there may be folded lines in the current window. | |
114 */ | |
115 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
116 hasAnyFolding(win_T *win) |
7 | 117 { |
118 /* very simple now, but can become more complex later */ | |
119 return (win->w_p_fen | |
120 && (!foldmethodIsManual(win) || win->w_folds.ga_len > 0)); | |
121 } | |
122 | |
123 /* hasFolding() {{{2 */ | |
124 /* | |
125 * Return TRUE if line "lnum" in the current window is part of a closed | |
126 * fold. | |
127 * When returning TRUE, *firstp and *lastp are set to the first and last | |
128 * lnum of the sequence of folded lines (skipped when NULL). | |
129 */ | |
130 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
131 hasFolding(linenr_T lnum, linenr_T *firstp, linenr_T *lastp) |
7 | 132 { |
133 return hasFoldingWin(curwin, lnum, firstp, lastp, TRUE, NULL); | |
134 } | |
135 | |
136 /* hasFoldingWin() {{{2 */ | |
137 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
138 hasFoldingWin( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
139 win_T *win, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
140 linenr_T lnum, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
141 linenr_T *firstp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
142 linenr_T *lastp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
143 int cache, /* when TRUE: use cached values of window */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
144 foldinfo_T *infop) /* where to store fold info */ |
7 | 145 { |
146 int had_folded = FALSE; | |
147 linenr_T first = 0; | |
148 linenr_T last = 0; | |
149 linenr_T lnum_rel = lnum; | |
150 int x; | |
151 fold_T *fp; | |
152 int level = 0; | |
153 int use_level = FALSE; | |
154 int maybe_small = FALSE; | |
155 garray_T *gap; | |
9252
c25898cc99c1
commit https://github.com/vim/vim/commit/945ec093cd4ddefab930239990564b12eb232153
Christian Brabandt <cb@256bit.org>
parents:
8891
diff
changeset
|
156 int low_level = 0; |
7 | 157 |
158 checkupdate(win); | |
159 /* | |
160 * Return quickly when there is no folding at all in this window. | |
161 */ | |
162 if (!hasAnyFolding(win)) | |
163 { | |
164 if (infop != NULL) | |
165 infop->fi_level = 0; | |
166 return FALSE; | |
167 } | |
168 | |
169 if (cache) | |
170 { | |
171 /* | |
172 * First look in cached info for displayed lines. This is probably | |
173 * the fastest, but it can only be used if the entry is still valid. | |
174 */ | |
175 x = find_wl_entry(win, lnum); | |
176 if (x >= 0) | |
177 { | |
178 first = win->w_lines[x].wl_lnum; | |
179 last = win->w_lines[x].wl_lastlnum; | |
180 had_folded = win->w_lines[x].wl_folded; | |
181 } | |
182 } | |
183 | |
184 if (first == 0) | |
185 { | |
186 /* | |
187 * Recursively search for a fold that contains "lnum". | |
188 */ | |
189 gap = &win->w_folds; | |
190 for (;;) | |
191 { | |
192 if (!foldFind(gap, lnum_rel, &fp)) | |
193 break; | |
194 | |
195 /* Remember lowest level of fold that starts in "lnum". */ | |
196 if (lnum_rel == fp->fd_top && low_level == 0) | |
197 low_level = level + 1; | |
198 | |
199 first += fp->fd_top; | |
200 last += fp->fd_top; | |
201 | |
202 /* is this fold closed? */ | |
203 had_folded = check_closed(win, fp, &use_level, level, | |
204 &maybe_small, lnum - lnum_rel); | |
205 if (had_folded) | |
206 { | |
207 /* Fold closed: Set last and quit loop. */ | |
208 last += fp->fd_len - 1; | |
209 break; | |
210 } | |
211 | |
212 /* Fold found, but it's open: Check nested folds. Line number is | |
213 * relative to containing fold. */ | |
214 gap = &fp->fd_nested; | |
215 lnum_rel -= fp->fd_top; | |
216 ++level; | |
217 } | |
218 } | |
219 | |
220 if (!had_folded) | |
221 { | |
222 if (infop != NULL) | |
223 { | |
224 infop->fi_level = level; | |
225 infop->fi_lnum = lnum - lnum_rel; | |
226 infop->fi_low_level = low_level == 0 ? level : low_level; | |
227 } | |
228 return FALSE; | |
229 } | |
230 | |
6753 | 231 if (last > win->w_buffer->b_ml.ml_line_count) |
232 last = win->w_buffer->b_ml.ml_line_count; | |
7 | 233 if (lastp != NULL) |
234 *lastp = last; | |
235 if (firstp != NULL) | |
236 *firstp = first; | |
237 if (infop != NULL) | |
238 { | |
239 infop->fi_level = level + 1; | |
240 infop->fi_lnum = first; | |
241 infop->fi_low_level = low_level == 0 ? level + 1 : low_level; | |
242 } | |
243 return TRUE; | |
244 } | |
245 | |
246 /* foldLevel() {{{2 */ | |
247 /* | |
248 * Return fold level at line number "lnum" in the current window. | |
249 */ | |
250 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
251 foldLevel(linenr_T lnum) |
7 | 252 { |
253 /* While updating the folds lines between invalid_top and invalid_bot have | |
254 * an undefined fold level. Otherwise update the folds first. */ | |
255 if (invalid_top == (linenr_T)0) | |
256 checkupdate(curwin); | |
257 else if (lnum == prev_lnum && prev_lnum_lvl >= 0) | |
258 return prev_lnum_lvl; | |
259 else if (lnum >= invalid_top && lnum <= invalid_bot) | |
260 return -1; | |
261 | |
262 /* Return quickly when there is no folding at all in this window. */ | |
263 if (!hasAnyFolding(curwin)) | |
264 return 0; | |
265 | |
266 return foldLevelWin(curwin, lnum); | |
267 } | |
268 | |
269 /* lineFolded() {{{2 */ | |
270 /* | |
271 * Low level function to check if a line is folded. Doesn't use any caching. | |
272 * Return TRUE if line is folded. | |
273 * Return FALSE if line is not folded. | |
274 * Return MAYBE if the line is folded when next to a folded line. | |
275 */ | |
276 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
277 lineFolded(win_T *win, linenr_T lnum) |
7 | 278 { |
279 return foldedCount(win, lnum, NULL) != 0; | |
280 } | |
281 | |
282 /* foldedCount() {{{2 */ | |
283 /* | |
284 * Count the number of lines that are folded at line number "lnum". | |
285 * Normally "lnum" is the first line of a possible fold, and the returned | |
286 * number is the number of lines in the fold. | |
287 * Doesn't use caching from the displayed window. | |
288 * Returns number of folded lines from "lnum", or 0 if line is not folded. | |
289 * When "infop" is not NULL, fills *infop with the fold level info. | |
290 */ | |
291 long | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
292 foldedCount(win_T *win, linenr_T lnum, foldinfo_T *infop) |
7 | 293 { |
294 linenr_T last; | |
295 | |
296 if (hasFoldingWin(win, lnum, NULL, &last, FALSE, infop)) | |
297 return (long)(last - lnum + 1); | |
298 return 0; | |
299 } | |
300 | |
301 /* foldmethodIsManual() {{{2 */ | |
302 /* | |
303 * Return TRUE if 'foldmethod' is "manual" | |
304 */ | |
305 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
306 foldmethodIsManual(win_T *wp) |
7 | 307 { |
308 return (wp->w_p_fdm[3] == 'u'); | |
309 } | |
310 | |
311 /* foldmethodIsIndent() {{{2 */ | |
312 /* | |
313 * Return TRUE if 'foldmethod' is "indent" | |
314 */ | |
315 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
316 foldmethodIsIndent(win_T *wp) |
7 | 317 { |
318 return (wp->w_p_fdm[0] == 'i'); | |
319 } | |
320 | |
321 /* foldmethodIsExpr() {{{2 */ | |
322 /* | |
323 * Return TRUE if 'foldmethod' is "expr" | |
324 */ | |
325 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
326 foldmethodIsExpr(win_T *wp) |
7 | 327 { |
328 return (wp->w_p_fdm[1] == 'x'); | |
329 } | |
330 | |
331 /* foldmethodIsMarker() {{{2 */ | |
332 /* | |
333 * Return TRUE if 'foldmethod' is "marker" | |
334 */ | |
335 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
336 foldmethodIsMarker(win_T *wp) |
7 | 337 { |
338 return (wp->w_p_fdm[2] == 'r'); | |
339 } | |
340 | |
341 /* foldmethodIsSyntax() {{{2 */ | |
342 /* | |
343 * Return TRUE if 'foldmethod' is "syntax" | |
344 */ | |
345 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
346 foldmethodIsSyntax(win_T *wp) |
7 | 347 { |
348 return (wp->w_p_fdm[0] == 's'); | |
349 } | |
350 | |
351 /* foldmethodIsDiff() {{{2 */ | |
352 /* | |
353 * Return TRUE if 'foldmethod' is "diff" | |
354 */ | |
355 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
356 foldmethodIsDiff(win_T *wp) |
7 | 357 { |
358 return (wp->w_p_fdm[0] == 'd'); | |
359 } | |
360 | |
361 /* closeFold() {{{2 */ | |
362 /* | |
363 * Close fold for current window at line "lnum". | |
364 * Repeat "count" times. | |
365 */ | |
366 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
367 closeFold(linenr_T lnum, long count) |
7 | 368 { |
369 setFoldRepeat(lnum, count, FALSE); | |
370 } | |
371 | |
372 /* closeFoldRecurse() {{{2 */ | |
373 /* | |
374 * Close fold for current window at line "lnum" recursively. | |
375 */ | |
376 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
377 closeFoldRecurse(linenr_T lnum) |
7 | 378 { |
379 (void)setManualFold(lnum, FALSE, TRUE, NULL); | |
380 } | |
381 | |
382 /* opFoldRange() {{{2 */ | |
383 /* | |
384 * Open or Close folds for current window in lines "first" to "last". | |
385 * Used for "zo", "zO", "zc" and "zC" in Visual mode. | |
386 */ | |
387 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
388 opFoldRange( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
389 linenr_T first, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
390 linenr_T last, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
391 int opening, /* TRUE to open, FALSE to close */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
392 int recurse, /* TRUE to do it recursively */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
393 int had_visual) /* TRUE when Visual selection used */ |
7 | 394 { |
395 int done = DONE_NOTHING; /* avoid error messages */ | |
396 linenr_T lnum; | |
397 linenr_T lnum_next; | |
398 | |
399 for (lnum = first; lnum <= last; lnum = lnum_next + 1) | |
400 { | |
401 lnum_next = lnum; | |
402 /* Opening one level only: next fold to open is after the one going to | |
403 * be opened. */ | |
404 if (opening && !recurse) | |
405 (void)hasFolding(lnum, NULL, &lnum_next); | |
406 (void)setManualFold(lnum, opening, recurse, &done); | |
407 /* Closing one level only: next line to close a fold is after just | |
408 * closed fold. */ | |
409 if (!opening && !recurse) | |
410 (void)hasFolding(lnum, NULL, &lnum_next); | |
411 } | |
412 if (done == DONE_NOTHING) | |
413 EMSG(_(e_nofold)); | |
414 /* Force a redraw to remove the Visual highlighting. */ | |
415 if (had_visual) | |
416 redraw_curbuf_later(INVERTED); | |
417 } | |
418 | |
419 /* openFold() {{{2 */ | |
420 /* | |
421 * Open fold for current window at line "lnum". | |
422 * Repeat "count" times. | |
423 */ | |
424 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
425 openFold(linenr_T lnum, long count) |
7 | 426 { |
427 setFoldRepeat(lnum, count, TRUE); | |
428 } | |
429 | |
430 /* openFoldRecurse() {{{2 */ | |
431 /* | |
432 * Open fold for current window at line "lnum" recursively. | |
433 */ | |
434 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
435 openFoldRecurse(linenr_T lnum) |
7 | 436 { |
437 (void)setManualFold(lnum, TRUE, TRUE, NULL); | |
438 } | |
439 | |
440 /* foldOpenCursor() {{{2 */ | |
441 /* | |
442 * Open folds until the cursor line is not in a closed fold. | |
443 */ | |
444 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
445 foldOpenCursor(void) |
7 | 446 { |
447 int done; | |
448 | |
449 checkupdate(curwin); | |
450 if (hasAnyFolding(curwin)) | |
451 for (;;) | |
452 { | |
453 done = DONE_NOTHING; | |
454 (void)setManualFold(curwin->w_cursor.lnum, TRUE, FALSE, &done); | |
455 if (!(done & DONE_ACTION)) | |
456 break; | |
457 } | |
458 } | |
459 | |
460 /* newFoldLevel() {{{2 */ | |
461 /* | |
462 * Set new foldlevel for current window. | |
463 */ | |
464 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
465 newFoldLevel(void) |
7 | 466 { |
467 newFoldLevelWin(curwin); | |
468 | |
469 #ifdef FEAT_DIFF | |
470 if (foldmethodIsDiff(curwin) && curwin->w_p_scb) | |
471 { | |
472 win_T *wp; | |
473 | |
474 /* | |
475 * Set the same foldlevel in other windows in diff mode. | |
476 */ | |
477 FOR_ALL_WINDOWS(wp) | |
478 { | |
479 if (wp != curwin && foldmethodIsDiff(wp) && wp->w_p_scb) | |
480 { | |
481 wp->w_p_fdl = curwin->w_p_fdl; | |
482 newFoldLevelWin(wp); | |
483 } | |
484 } | |
485 } | |
486 #endif | |
487 } | |
488 | |
489 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
490 newFoldLevelWin(win_T *wp) |
7 | 491 { |
492 fold_T *fp; | |
493 int i; | |
494 | |
495 checkupdate(wp); | |
496 if (wp->w_fold_manual) | |
497 { | |
498 /* Set all flags for the first level of folds to FD_LEVEL. Following | |
499 * manual open/close will then change the flags to FD_OPEN or | |
500 * FD_CLOSED for those folds that don't use 'foldlevel'. */ | |
501 fp = (fold_T *)wp->w_folds.ga_data; | |
502 for (i = 0; i < wp->w_folds.ga_len; ++i) | |
503 fp[i].fd_flags = FD_LEVEL; | |
504 wp->w_fold_manual = FALSE; | |
505 } | |
506 changed_window_setting_win(wp); | |
507 } | |
508 | |
509 /* foldCheckClose() {{{2 */ | |
510 /* | |
511 * Apply 'foldlevel' to all folds that don't contain the cursor. | |
512 */ | |
513 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
514 foldCheckClose(void) |
7 | 515 { |
516 if (*p_fcl != NUL) /* can only be "all" right now */ | |
517 { | |
518 checkupdate(curwin); | |
519 if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum, | |
520 (int)curwin->w_p_fdl)) | |
521 changed_window_setting(); | |
522 } | |
523 } | |
524 | |
525 /* checkCloseRec() {{{2 */ | |
526 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
527 checkCloseRec(garray_T *gap, linenr_T lnum, int level) |
7 | 528 { |
529 fold_T *fp; | |
530 int retval = FALSE; | |
531 int i; | |
532 | |
533 fp = (fold_T *)gap->ga_data; | |
534 for (i = 0; i < gap->ga_len; ++i) | |
535 { | |
536 /* Only manually opened folds may need to be closed. */ | |
537 if (fp[i].fd_flags == FD_OPEN) | |
538 { | |
539 if (level <= 0 && (lnum < fp[i].fd_top | |
540 || lnum >= fp[i].fd_top + fp[i].fd_len)) | |
541 { | |
542 fp[i].fd_flags = FD_LEVEL; | |
543 retval = TRUE; | |
544 } | |
545 else | |
546 retval |= checkCloseRec(&fp[i].fd_nested, lnum - fp[i].fd_top, | |
547 level - 1); | |
548 } | |
549 } | |
550 return retval; | |
551 } | |
552 | |
553 /* foldCreateAllowed() {{{2 */ | |
554 /* | |
555 * Return TRUE if it's allowed to manually create or delete a fold. | |
556 * Give an error message and return FALSE if not. | |
557 */ | |
558 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
559 foldManualAllowed(int create) |
7 | 560 { |
561 if (foldmethodIsManual(curwin) || foldmethodIsMarker(curwin)) | |
562 return TRUE; | |
563 if (create) | |
564 EMSG(_("E350: Cannot create fold with current 'foldmethod'")); | |
565 else | |
566 EMSG(_("E351: Cannot delete fold with current 'foldmethod'")); | |
567 return FALSE; | |
568 } | |
569 | |
570 /* foldCreate() {{{2 */ | |
571 /* | |
572 * Create a fold from line "start" to line "end" (inclusive) in the current | |
573 * window. | |
574 */ | |
575 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
576 foldCreate(linenr_T start, linenr_T end) |
7 | 577 { |
578 fold_T *fp; | |
579 garray_T *gap; | |
580 garray_T fold_ga; | |
581 int i, j; | |
582 int cont; | |
583 int use_level = FALSE; | |
584 int closed = FALSE; | |
585 int level = 0; | |
586 linenr_T start_rel = start; | |
587 linenr_T end_rel = end; | |
588 | |
589 if (start > end) | |
590 { | |
591 /* reverse the range */ | |
592 end = start_rel; | |
593 start = end_rel; | |
594 start_rel = start; | |
595 end_rel = end; | |
596 } | |
597 | |
598 /* When 'foldmethod' is "marker" add markers, which creates the folds. */ | |
599 if (foldmethodIsMarker(curwin)) | |
600 { | |
601 foldCreateMarkers(start, end); | |
602 return; | |
603 } | |
604 | |
605 checkupdate(curwin); | |
606 | |
607 /* Find the place to insert the new fold. */ | |
608 gap = &curwin->w_folds; | |
609 for (;;) | |
610 { | |
611 if (!foldFind(gap, start_rel, &fp)) | |
612 break; | |
613 if (fp->fd_top + fp->fd_len > end_rel) | |
614 { | |
615 /* New fold is completely inside this fold: Go one level deeper. */ | |
616 gap = &fp->fd_nested; | |
617 start_rel -= fp->fd_top; | |
618 end_rel -= fp->fd_top; | |
619 if (use_level || fp->fd_flags == FD_LEVEL) | |
620 { | |
621 use_level = TRUE; | |
622 if (level >= curwin->w_p_fdl) | |
623 closed = TRUE; | |
624 } | |
625 else if (fp->fd_flags == FD_CLOSED) | |
626 closed = TRUE; | |
627 ++level; | |
628 } | |
629 else | |
630 { | |
631 /* This fold and new fold overlap: Insert here and move some folds | |
632 * inside the new fold. */ | |
633 break; | |
634 } | |
635 } | |
636 | |
637 i = (int)(fp - (fold_T *)gap->ga_data); | |
638 if (ga_grow(gap, 1) == OK) | |
639 { | |
640 fp = (fold_T *)gap->ga_data + i; | |
641 ga_init2(&fold_ga, (int)sizeof(fold_T), 10); | |
642 | |
643 /* Count number of folds that will be contained in the new fold. */ | |
644 for (cont = 0; i + cont < gap->ga_len; ++cont) | |
645 if (fp[cont].fd_top > end_rel) | |
646 break; | |
647 if (cont > 0 && ga_grow(&fold_ga, cont) == OK) | |
648 { | |
649 /* If the first fold starts before the new fold, let the new fold | |
650 * start there. Otherwise the existing fold would change. */ | |
651 if (start_rel > fp->fd_top) | |
652 start_rel = fp->fd_top; | |
653 | |
654 /* When last contained fold isn't completely contained, adjust end | |
655 * of new fold. */ | |
656 if (end_rel < fp[cont - 1].fd_top + fp[cont - 1].fd_len - 1) | |
657 end_rel = fp[cont - 1].fd_top + fp[cont - 1].fd_len - 1; | |
658 /* Move contained folds to inside new fold. */ | |
659 mch_memmove(fold_ga.ga_data, fp, sizeof(fold_T) * cont); | |
660 fold_ga.ga_len += cont; | |
661 i += cont; | |
662 | |
663 /* Adjust line numbers in contained folds to be relative to the | |
664 * new fold. */ | |
665 for (j = 0; j < cont; ++j) | |
666 ((fold_T *)fold_ga.ga_data)[j].fd_top -= start_rel; | |
667 } | |
668 /* Move remaining entries to after the new fold. */ | |
669 if (i < gap->ga_len) | |
670 mch_memmove(fp + 1, (fold_T *)gap->ga_data + i, | |
671 sizeof(fold_T) * (gap->ga_len - i)); | |
672 gap->ga_len = gap->ga_len + 1 - cont; | |
673 | |
674 /* insert new fold */ | |
675 fp->fd_nested = fold_ga; | |
676 fp->fd_top = start_rel; | |
677 fp->fd_len = end_rel - start_rel + 1; | |
678 | |
679 /* We want the new fold to be closed. If it would remain open because | |
680 * of using 'foldlevel', need to adjust fd_flags of containing folds. | |
681 */ | |
682 if (use_level && !closed && level < curwin->w_p_fdl) | |
683 closeFold(start, 1L); | |
684 if (!use_level) | |
685 curwin->w_fold_manual = TRUE; | |
686 fp->fd_flags = FD_CLOSED; | |
687 fp->fd_small = MAYBE; | |
688 | |
689 /* redraw */ | |
690 changed_window_setting(); | |
691 } | |
692 } | |
693 | |
694 /* deleteFold() {{{2 */ | |
695 /* | |
696 * Delete a fold at line "start" in the current window. | |
697 * When "end" is not 0, delete all folds from "start" to "end". | |
698 * When "recursive" is TRUE delete recursively. | |
699 */ | |
700 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
701 deleteFold( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
702 linenr_T start, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
703 linenr_T end, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
704 int recursive, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
705 int had_visual) /* TRUE when Visual selection used */ |
7 | 706 { |
707 garray_T *gap; | |
708 fold_T *fp; | |
709 garray_T *found_ga; | |
710 fold_T *found_fp = NULL; | |
711 linenr_T found_off = 0; | |
1780 | 712 int use_level; |
7 | 713 int maybe_small = FALSE; |
714 int level = 0; | |
715 linenr_T lnum = start; | |
716 linenr_T lnum_off; | |
717 int did_one = FALSE; | |
718 linenr_T first_lnum = MAXLNUM; | |
719 linenr_T last_lnum = 0; | |
720 | |
721 checkupdate(curwin); | |
722 | |
723 while (lnum <= end) | |
724 { | |
725 /* Find the deepest fold for "start". */ | |
726 gap = &curwin->w_folds; | |
727 found_ga = NULL; | |
728 lnum_off = 0; | |
1780 | 729 use_level = FALSE; |
7 | 730 for (;;) |
731 { | |
732 if (!foldFind(gap, lnum - lnum_off, &fp)) | |
733 break; | |
734 /* lnum is inside this fold, remember info */ | |
735 found_ga = gap; | |
736 found_fp = fp; | |
737 found_off = lnum_off; | |
738 | |
739 /* if "lnum" is folded, don't check nesting */ | |
740 if (check_closed(curwin, fp, &use_level, level, | |
741 &maybe_small, lnum_off)) | |
742 break; | |
743 | |
744 /* check nested folds */ | |
745 gap = &fp->fd_nested; | |
746 lnum_off += fp->fd_top; | |
747 ++level; | |
748 } | |
749 if (found_ga == NULL) | |
750 { | |
751 ++lnum; | |
752 } | |
753 else | |
754 { | |
755 lnum = found_fp->fd_top + found_fp->fd_len + found_off; | |
756 | |
757 if (foldmethodIsManual(curwin)) | |
758 deleteFoldEntry(found_ga, | |
759 (int)(found_fp - (fold_T *)found_ga->ga_data), recursive); | |
760 else | |
761 { | |
1780 | 762 if (first_lnum > found_fp->fd_top + found_off) |
763 first_lnum = found_fp->fd_top + found_off; | |
764 if (last_lnum < lnum) | |
7 | 765 last_lnum = lnum; |
1780 | 766 if (!did_one) |
767 parseMarker(curwin); | |
7 | 768 deleteFoldMarkers(found_fp, recursive, found_off); |
769 } | |
1780 | 770 did_one = TRUE; |
7 | 771 |
772 /* redraw window */ | |
773 changed_window_setting(); | |
774 } | |
775 } | |
776 if (!did_one) | |
777 { | |
778 EMSG(_(e_nofold)); | |
779 /* Force a redraw to remove the Visual highlighting. */ | |
780 if (had_visual) | |
781 redraw_curbuf_later(INVERTED); | |
782 } | |
1780 | 783 else |
784 /* Deleting markers may make cursor column invalid. */ | |
785 check_cursor_col(); | |
786 | |
7 | 787 if (last_lnum > 0) |
788 changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L); | |
789 } | |
790 | |
791 /* clearFolding() {{{2 */ | |
792 /* | |
793 * Remove all folding for window "win". | |
794 */ | |
795 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
796 clearFolding(win_T *win) |
7 | 797 { |
798 deleteFoldRecurse(&win->w_folds); | |
799 win->w_foldinvalid = FALSE; | |
800 } | |
801 | |
802 /* foldUpdate() {{{2 */ | |
803 /* | |
804 * Update folds for changes in the buffer of a window. | |
805 * Note that inserted/deleted lines must have already been taken care of by | |
806 * calling foldMarkAdjust(). | |
807 * The changes in lines from top to bot (inclusive). | |
808 */ | |
809 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
810 foldUpdate(win_T *wp, linenr_T top, linenr_T bot) |
7 | 811 { |
812 fold_T *fp; | |
813 | |
8891
d7ba3f9b9ba6
commit https://github.com/vim/vim/commit/429fcfbf9a9275367fe9441a50a3dcd773497d84
Christian Brabandt <cb@256bit.org>
parents:
7821
diff
changeset
|
814 if (disable_fold_update > 0) |
d7ba3f9b9ba6
commit https://github.com/vim/vim/commit/429fcfbf9a9275367fe9441a50a3dcd773497d84
Christian Brabandt <cb@256bit.org>
parents:
7821
diff
changeset
|
815 return; |
d7ba3f9b9ba6
commit https://github.com/vim/vim/commit/429fcfbf9a9275367fe9441a50a3dcd773497d84
Christian Brabandt <cb@256bit.org>
parents:
7821
diff
changeset
|
816 |
7 | 817 /* Mark all folds from top to bot as maybe-small. */ |
6755 | 818 (void)foldFind(&wp->w_folds, top, &fp); |
819 while (fp < (fold_T *)wp->w_folds.ga_data + wp->w_folds.ga_len | |
7 | 820 && fp->fd_top < bot) |
821 { | |
822 fp->fd_small = MAYBE; | |
823 ++fp; | |
824 } | |
825 | |
826 if (foldmethodIsIndent(wp) | |
827 || foldmethodIsExpr(wp) | |
828 || foldmethodIsMarker(wp) | |
829 #ifdef FEAT_DIFF | |
830 || foldmethodIsDiff(wp) | |
831 #endif | |
832 || foldmethodIsSyntax(wp)) | |
1424 | 833 { |
834 int save_got_int = got_int; | |
835 | |
836 /* reset got_int here, otherwise it won't work */ | |
837 got_int = FALSE; | |
7 | 838 foldUpdateIEMS(wp, top, bot); |
1424 | 839 got_int |= save_got_int; |
840 } | |
7 | 841 } |
842 | |
843 /* foldUpdateAll() {{{2 */ | |
844 /* | |
845 * Update all lines in a window for folding. | |
846 * Used when a fold setting changes or after reloading the buffer. | |
847 * The actual updating is postponed until fold info is used, to avoid doing | |
848 * every time a setting is changed or a syntax item is added. | |
849 */ | |
850 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
851 foldUpdateAll(win_T *win) |
7 | 852 { |
853 win->w_foldinvalid = TRUE; | |
854 redraw_win_later(win, NOT_VALID); | |
855 } | |
856 | |
857 /* foldMoveTo() {{{2 */ | |
858 /* | |
859 * If "updown" is FALSE: Move to the start or end of the fold. | |
860 * If "updown" is TRUE: move to fold at the same level. | |
861 * If not moved return FAIL. | |
862 */ | |
863 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
864 foldMoveTo( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
865 int updown, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
866 int dir, /* FORWARD or BACKWARD */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
867 long count) |
7 | 868 { |
869 long n; | |
870 int retval = FAIL; | |
871 linenr_T lnum_off; | |
872 linenr_T lnum_found; | |
873 linenr_T lnum; | |
874 int use_level; | |
875 int maybe_small; | |
876 garray_T *gap; | |
877 fold_T *fp; | |
878 int level; | |
879 int last; | |
880 | |
36 | 881 checkupdate(curwin); |
882 | |
7 | 883 /* Repeat "count" times. */ |
884 for (n = 0; n < count; ++n) | |
885 { | |
886 /* Find nested folds. Stop when a fold is closed. The deepest fold | |
887 * that moves the cursor is used. */ | |
888 lnum_off = 0; | |
889 gap = &curwin->w_folds; | |
890 use_level = FALSE; | |
891 maybe_small = FALSE; | |
892 lnum_found = curwin->w_cursor.lnum; | |
893 level = 0; | |
894 last = FALSE; | |
895 for (;;) | |
896 { | |
897 if (!foldFind(gap, curwin->w_cursor.lnum - lnum_off, &fp)) | |
898 { | |
899 if (!updown) | |
900 break; | |
901 | |
902 /* When moving up, consider a fold above the cursor; when | |
903 * moving down consider a fold below the cursor. */ | |
904 if (dir == FORWARD) | |
905 { | |
906 if (fp - (fold_T *)gap->ga_data >= gap->ga_len) | |
907 break; | |
908 --fp; | |
909 } | |
910 else | |
911 { | |
912 if (fp == (fold_T *)gap->ga_data) | |
913 break; | |
914 } | |
915 /* don't look for contained folds, they will always move | |
916 * the cursor too far. */ | |
917 last = TRUE; | |
918 } | |
919 | |
920 if (!last) | |
921 { | |
922 /* Check if this fold is closed. */ | |
923 if (check_closed(curwin, fp, &use_level, level, | |
924 &maybe_small, lnum_off)) | |
925 last = TRUE; | |
926 | |
927 /* "[z" and "]z" stop at closed fold */ | |
928 if (last && !updown) | |
929 break; | |
930 } | |
931 | |
932 if (updown) | |
933 { | |
934 if (dir == FORWARD) | |
935 { | |
936 /* to start of next fold if there is one */ | |
937 if (fp + 1 - (fold_T *)gap->ga_data < gap->ga_len) | |
938 { | |
939 lnum = fp[1].fd_top + lnum_off; | |
940 if (lnum > curwin->w_cursor.lnum) | |
941 lnum_found = lnum; | |
942 } | |
943 } | |
944 else | |
945 { | |
946 /* to end of previous fold if there is one */ | |
947 if (fp > (fold_T *)gap->ga_data) | |
948 { | |
949 lnum = fp[-1].fd_top + lnum_off + fp[-1].fd_len - 1; | |
950 if (lnum < curwin->w_cursor.lnum) | |
951 lnum_found = lnum; | |
952 } | |
953 } | |
954 } | |
955 else | |
956 { | |
957 /* Open fold found, set cursor to its start/end and then check | |
958 * nested folds. */ | |
959 if (dir == FORWARD) | |
960 { | |
961 lnum = fp->fd_top + lnum_off + fp->fd_len - 1; | |
962 if (lnum > curwin->w_cursor.lnum) | |
963 lnum_found = lnum; | |
964 } | |
965 else | |
966 { | |
967 lnum = fp->fd_top + lnum_off; | |
968 if (lnum < curwin->w_cursor.lnum) | |
969 lnum_found = lnum; | |
970 } | |
971 } | |
972 | |
973 if (last) | |
974 break; | |
975 | |
976 /* Check nested folds (if any). */ | |
977 gap = &fp->fd_nested; | |
978 lnum_off += fp->fd_top; | |
979 ++level; | |
980 } | |
981 if (lnum_found != curwin->w_cursor.lnum) | |
982 { | |
983 if (retval == FAIL) | |
984 setpcmark(); | |
985 curwin->w_cursor.lnum = lnum_found; | |
986 curwin->w_cursor.col = 0; | |
987 retval = OK; | |
988 } | |
989 else | |
990 break; | |
991 } | |
992 | |
993 return retval; | |
994 } | |
995 | |
996 /* foldInitWin() {{{2 */ | |
997 /* | |
998 * Init the fold info in a new window. | |
999 */ | |
1000 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1001 foldInitWin(win_T *new_win) |
7 | 1002 { |
3263 | 1003 ga_init2(&new_win->w_folds, (int)sizeof(fold_T), 10); |
7 | 1004 } |
1005 | |
1006 /* find_wl_entry() {{{2 */ | |
1007 /* | |
1008 * Find an entry in the win->w_lines[] array for buffer line "lnum". | |
1009 * Only valid entries are considered (for entries where wl_valid is FALSE the | |
1010 * line number can be wrong). | |
1011 * Returns index of entry or -1 if not found. | |
1012 */ | |
1013 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1014 find_wl_entry(win_T *win, linenr_T lnum) |
7 | 1015 { |
1016 int i; | |
1017 | |
2114
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1018 for (i = 0; i < win->w_lines_valid; ++i) |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1019 if (win->w_lines[i].wl_valid) |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1020 { |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1021 if (lnum < win->w_lines[i].wl_lnum) |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1022 return -1; |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1023 if (lnum <= win->w_lines[i].wl_lastlnum) |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1024 return i; |
5a97d0c03b59
updated for version 7.2.397
Bram Moolenaar <bram@zimbu.org>
parents:
2086
diff
changeset
|
1025 } |
7 | 1026 return -1; |
1027 } | |
1028 | |
1029 /* foldAdjustVisual() {{{2 */ | |
1030 /* | |
1031 * Adjust the Visual area to include any fold at the start or end completely. | |
1032 */ | |
1033 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1034 foldAdjustVisual(void) |
7 | 1035 { |
1036 pos_T *start, *end; | |
1037 char_u *ptr; | |
1038 | |
1039 if (!VIsual_active || !hasAnyFolding(curwin)) | |
1040 return; | |
1041 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11038
diff
changeset
|
1042 if (LTOREQ_POS(VIsual, curwin->w_cursor)) |
7 | 1043 { |
1044 start = &VIsual; | |
1045 end = &curwin->w_cursor; | |
1046 } | |
1047 else | |
1048 { | |
1049 start = &curwin->w_cursor; | |
1050 end = &VIsual; | |
1051 } | |
1052 if (hasFolding(start->lnum, &start->lnum, NULL)) | |
1053 start->col = 0; | |
1054 if (hasFolding(end->lnum, NULL, &end->lnum)) | |
1055 { | |
1056 ptr = ml_get(end->lnum); | |
1057 end->col = (colnr_T)STRLEN(ptr); | |
1058 if (end->col > 0 && *p_sel == 'o') | |
1059 --end->col; | |
1060 #ifdef FEAT_MBYTE | |
1061 /* prevent cursor from moving on the trail byte */ | |
1062 if (has_mbyte) | |
1063 mb_adjust_cursor(); | |
1064 #endif | |
1065 } | |
1066 } | |
1067 | |
1068 /* cursor_foldstart() {{{2 */ | |
1069 /* | |
1070 * Move the cursor to the first line of a closed fold. | |
1071 */ | |
1072 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1073 foldAdjustCursor(void) |
7 | 1074 { |
1075 (void)hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL); | |
1076 } | |
1077 | |
1078 /* Internal functions for "fold_T" {{{1 */ | |
1079 /* cloneFoldGrowArray() {{{2 */ | |
1080 /* | |
1081 * Will "clone" (i.e deep copy) a garray_T of folds. | |
1082 * | |
1083 * Return FAIL if the operation cannot be completed, otherwise OK. | |
1084 */ | |
1085 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1086 cloneFoldGrowArray(garray_T *from, garray_T *to) |
7 | 1087 { |
1088 int i; | |
1089 fold_T *from_p; | |
1090 fold_T *to_p; | |
1091 | |
1092 ga_init2(to, from->ga_itemsize, from->ga_growsize); | |
1093 if (from->ga_len == 0 || ga_grow(to, from->ga_len) == FAIL) | |
1094 return; | |
1095 | |
1096 from_p = (fold_T *)from->ga_data; | |
1097 to_p = (fold_T *)to->ga_data; | |
1098 | |
1099 for (i = 0; i < from->ga_len; i++) | |
1100 { | |
1101 to_p->fd_top = from_p->fd_top; | |
1102 to_p->fd_len = from_p->fd_len; | |
1103 to_p->fd_flags = from_p->fd_flags; | |
1104 to_p->fd_small = from_p->fd_small; | |
1105 cloneFoldGrowArray(&from_p->fd_nested, &to_p->fd_nested); | |
1106 ++to->ga_len; | |
1107 ++from_p; | |
1108 ++to_p; | |
1109 } | |
1110 } | |
1111 | |
1112 /* foldFind() {{{2 */ | |
1113 /* | |
1114 * Search for line "lnum" in folds of growarray "gap". | |
1115 * Set *fpp to the fold struct for the fold that contains "lnum" or | |
1116 * the first fold below it (careful: it can be beyond the end of the array!). | |
1117 * Returns FALSE when there is no fold that contains "lnum". | |
1118 */ | |
1119 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1120 foldFind(garray_T *gap, linenr_T lnum, fold_T **fpp) |
7 | 1121 { |
1122 linenr_T low, high; | |
1123 fold_T *fp; | |
1124 int i; | |
1125 | |
1126 /* | |
1127 * Perform a binary search. | |
1128 * "low" is lowest index of possible match. | |
1129 * "high" is highest index of possible match. | |
1130 */ | |
1131 fp = (fold_T *)gap->ga_data; | |
1132 low = 0; | |
1133 high = gap->ga_len - 1; | |
1134 while (low <= high) | |
1135 { | |
1136 i = (low + high) / 2; | |
1137 if (fp[i].fd_top > lnum) | |
1138 /* fold below lnum, adjust high */ | |
1139 high = i - 1; | |
1140 else if (fp[i].fd_top + fp[i].fd_len <= lnum) | |
1141 /* fold above lnum, adjust low */ | |
1142 low = i + 1; | |
1143 else | |
1144 { | |
1145 /* lnum is inside this fold */ | |
1146 *fpp = fp + i; | |
1147 return TRUE; | |
1148 } | |
1149 } | |
1150 *fpp = fp + low; | |
1151 return FALSE; | |
1152 } | |
1153 | |
1154 /* foldLevelWin() {{{2 */ | |
1155 /* | |
1156 * Return fold level at line number "lnum" in window "wp". | |
1157 */ | |
1158 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1159 foldLevelWin(win_T *wp, linenr_T lnum) |
7 | 1160 { |
1161 fold_T *fp; | |
1162 linenr_T lnum_rel = lnum; | |
1163 int level = 0; | |
1164 garray_T *gap; | |
1165 | |
1166 /* Recursively search for a fold that contains "lnum". */ | |
1167 gap = &wp->w_folds; | |
1168 for (;;) | |
1169 { | |
1170 if (!foldFind(gap, lnum_rel, &fp)) | |
1171 break; | |
1172 /* Check nested folds. Line number is relative to containing fold. */ | |
1173 gap = &fp->fd_nested; | |
1174 lnum_rel -= fp->fd_top; | |
1175 ++level; | |
1176 } | |
1177 | |
1178 return level; | |
1179 } | |
1180 | |
1181 /* checkupdate() {{{2 */ | |
1182 /* | |
1183 * Check if the folds in window "wp" are invalid and update them if needed. | |
1184 */ | |
1185 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1186 checkupdate(win_T *wp) |
7 | 1187 { |
1188 if (wp->w_foldinvalid) | |
1189 { | |
1190 foldUpdate(wp, (linenr_T)1, (linenr_T)MAXLNUM); /* will update all */ | |
1191 wp->w_foldinvalid = FALSE; | |
1192 } | |
1193 } | |
1194 | |
1195 /* setFoldRepeat() {{{2 */ | |
1196 /* | |
1197 * Open or close fold for current window at line "lnum". | |
1198 * Repeat "count" times. | |
1199 */ | |
1200 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1201 setFoldRepeat(linenr_T lnum, long count, int do_open) |
7 | 1202 { |
1203 int done; | |
1204 long n; | |
1205 | |
1206 for (n = 0; n < count; ++n) | |
1207 { | |
1208 done = DONE_NOTHING; | |
1757 | 1209 (void)setManualFold(lnum, do_open, FALSE, &done); |
7 | 1210 if (!(done & DONE_ACTION)) |
1211 { | |
1212 /* Only give an error message when no fold could be opened. */ | |
1213 if (n == 0 && !(done & DONE_FOLD)) | |
1214 EMSG(_(e_nofold)); | |
1215 break; | |
1216 } | |
1217 } | |
1218 } | |
1219 | |
1220 /* setManualFold() {{{2 */ | |
1221 /* | |
1222 * Open or close the fold in the current window which contains "lnum". | |
1223 * Also does this for other windows in diff mode when needed. | |
1224 */ | |
1225 static linenr_T | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1226 setManualFold( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1227 linenr_T lnum, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1228 int opening, /* TRUE when opening, FALSE when closing */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1229 int recurse, /* TRUE when closing/opening recursive */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1230 int *donep) |
7 | 1231 { |
1232 #ifdef FEAT_DIFF | |
1233 if (foldmethodIsDiff(curwin) && curwin->w_p_scb) | |
1234 { | |
1235 win_T *wp; | |
1236 linenr_T dlnum; | |
1237 | |
1238 /* | |
1239 * Do the same operation in other windows in diff mode. Calculate the | |
1240 * line number from the diffs. | |
1241 */ | |
1242 FOR_ALL_WINDOWS(wp) | |
1243 { | |
1244 if (wp != curwin && foldmethodIsDiff(wp) && wp->w_p_scb) | |
1245 { | |
1246 dlnum = diff_lnum_win(curwin->w_cursor.lnum, wp); | |
1247 if (dlnum != 0) | |
1248 (void)setManualFoldWin(wp, dlnum, opening, recurse, NULL); | |
1249 } | |
1250 } | |
1251 } | |
1252 #endif | |
1253 | |
1254 return setManualFoldWin(curwin, lnum, opening, recurse, donep); | |
1255 } | |
1256 | |
1257 /* setManualFoldWin() {{{2 */ | |
1258 /* | |
1259 * Open or close the fold in window "wp" which contains "lnum". | |
1260 * "donep", when not NULL, points to flag that is set to DONE_FOLD when some | |
1261 * fold was found and to DONE_ACTION when some fold was opened or closed. | |
1262 * When "donep" is NULL give an error message when no fold was found for | |
1263 * "lnum", but only if "wp" is "curwin". | |
1264 * Return the line number of the next line that could be closed. | |
1265 * It's only valid when "opening" is TRUE! | |
1266 */ | |
1267 static linenr_T | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1268 setManualFoldWin( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1269 win_T *wp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1270 linenr_T lnum, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1271 int opening, /* TRUE when opening, FALSE when closing */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1272 int recurse, /* TRUE when closing/opening recursive */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1273 int *donep) |
7 | 1274 { |
1275 fold_T *fp; | |
1276 fold_T *fp2; | |
1277 fold_T *found = NULL; | |
1278 int j; | |
1279 int level = 0; | |
1280 int use_level = FALSE; | |
1281 int found_fold = FALSE; | |
1282 garray_T *gap; | |
1283 linenr_T next = MAXLNUM; | |
1284 linenr_T off = 0; | |
1285 int done = 0; | |
1286 | |
1287 checkupdate(wp); | |
1288 | |
1289 /* | |
1290 * Find the fold, open or close it. | |
1291 */ | |
1292 gap = &wp->w_folds; | |
1293 for (;;) | |
1294 { | |
1295 if (!foldFind(gap, lnum, &fp)) | |
1296 { | |
1297 /* If there is a following fold, continue there next time. */ | |
1298 if (fp < (fold_T *)gap->ga_data + gap->ga_len) | |
1299 next = fp->fd_top + off; | |
1300 break; | |
1301 } | |
1302 | |
1303 /* lnum is inside this fold */ | |
1304 found_fold = TRUE; | |
1305 | |
1306 /* If there is a following fold, continue there next time. */ | |
1307 if (fp + 1 < (fold_T *)gap->ga_data + gap->ga_len) | |
1308 next = fp[1].fd_top + off; | |
1309 | |
1310 /* Change from level-dependent folding to manual. */ | |
1311 if (use_level || fp->fd_flags == FD_LEVEL) | |
1312 { | |
1313 use_level = TRUE; | |
1314 if (level >= wp->w_p_fdl) | |
1315 fp->fd_flags = FD_CLOSED; | |
1316 else | |
1317 fp->fd_flags = FD_OPEN; | |
1318 fp2 = (fold_T *)fp->fd_nested.ga_data; | |
1319 for (j = 0; j < fp->fd_nested.ga_len; ++j) | |
1320 fp2[j].fd_flags = FD_LEVEL; | |
1321 } | |
1322 | |
1323 /* Simple case: Close recursively means closing the fold. */ | |
1324 if (!opening && recurse) | |
1325 { | |
1326 if (fp->fd_flags != FD_CLOSED) | |
1327 { | |
1328 done |= DONE_ACTION; | |
1329 fp->fd_flags = FD_CLOSED; | |
1330 } | |
1331 } | |
1332 else if (fp->fd_flags == FD_CLOSED) | |
1333 { | |
1334 /* When opening, open topmost closed fold. */ | |
1335 if (opening) | |
1336 { | |
1337 fp->fd_flags = FD_OPEN; | |
1338 done |= DONE_ACTION; | |
1339 if (recurse) | |
1340 foldOpenNested(fp); | |
1341 } | |
1342 break; | |
1343 } | |
1344 | |
1345 /* fold is open, check nested folds */ | |
1346 found = fp; | |
1347 gap = &fp->fd_nested; | |
1348 lnum -= fp->fd_top; | |
1349 off += fp->fd_top; | |
1350 ++level; | |
1351 } | |
1352 if (found_fold) | |
1353 { | |
1354 /* When closing and not recurse, close deepest open fold. */ | |
1355 if (!opening && found != NULL) | |
1356 { | |
1357 found->fd_flags = FD_CLOSED; | |
1358 done |= DONE_ACTION; | |
1359 } | |
1360 wp->w_fold_manual = TRUE; | |
1361 if (done & DONE_ACTION) | |
1362 changed_window_setting_win(wp); | |
1363 done |= DONE_FOLD; | |
1364 } | |
1365 else if (donep == NULL && wp == curwin) | |
1366 EMSG(_(e_nofold)); | |
1367 | |
1368 if (donep != NULL) | |
1369 *donep |= done; | |
1370 | |
1371 return next; | |
1372 } | |
1373 | |
1374 /* foldOpenNested() {{{2 */ | |
1375 /* | |
1376 * Open all nested folds in fold "fpr" recursively. | |
1377 */ | |
1378 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1379 foldOpenNested(fold_T *fpr) |
7 | 1380 { |
1381 int i; | |
1382 fold_T *fp; | |
1383 | |
1384 fp = (fold_T *)fpr->fd_nested.ga_data; | |
1385 for (i = 0; i < fpr->fd_nested.ga_len; ++i) | |
1386 { | |
1387 foldOpenNested(&fp[i]); | |
1388 fp[i].fd_flags = FD_OPEN; | |
1389 } | |
1390 } | |
1391 | |
1392 /* deleteFoldEntry() {{{2 */ | |
1393 /* | |
1394 * Delete fold "idx" from growarray "gap". | |
1395 * When "recursive" is TRUE also delete all the folds contained in it. | |
1396 * When "recursive" is FALSE contained folds are moved one level up. | |
1397 */ | |
1398 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1399 deleteFoldEntry(garray_T *gap, int idx, int recursive) |
7 | 1400 { |
1401 fold_T *fp; | |
1402 int i; | |
1403 long moved; | |
1404 fold_T *nfp; | |
1405 | |
1406 fp = (fold_T *)gap->ga_data + idx; | |
1407 if (recursive || fp->fd_nested.ga_len == 0) | |
1408 { | |
1409 /* recursively delete the contained folds */ | |
1410 deleteFoldRecurse(&fp->fd_nested); | |
1411 --gap->ga_len; | |
1412 if (idx < gap->ga_len) | |
1413 mch_memmove(fp, fp + 1, sizeof(fold_T) * (gap->ga_len - idx)); | |
1414 } | |
1415 else | |
1416 { | |
3028 | 1417 /* Move nested folds one level up, to overwrite the fold that is |
7 | 1418 * deleted. */ |
1419 moved = fp->fd_nested.ga_len; | |
1420 if (ga_grow(gap, (int)(moved - 1)) == OK) | |
1421 { | |
3028 | 1422 /* Get "fp" again, the array may have been reallocated. */ |
1423 fp = (fold_T *)gap->ga_data + idx; | |
1424 | |
7 | 1425 /* adjust fd_top and fd_flags for the moved folds */ |
1426 nfp = (fold_T *)fp->fd_nested.ga_data; | |
1427 for (i = 0; i < moved; ++i) | |
1428 { | |
1429 nfp[i].fd_top += fp->fd_top; | |
1430 if (fp->fd_flags == FD_LEVEL) | |
1431 nfp[i].fd_flags = FD_LEVEL; | |
1432 if (fp->fd_small == MAYBE) | |
1433 nfp[i].fd_small = MAYBE; | |
1434 } | |
1435 | |
1436 /* move the existing folds down to make room */ | |
3028 | 1437 if (idx + 1 < gap->ga_len) |
7 | 1438 mch_memmove(fp + moved, fp + 1, |
3028 | 1439 sizeof(fold_T) * (gap->ga_len - (idx + 1))); |
7 | 1440 /* move the contained folds one level up */ |
1441 mch_memmove(fp, nfp, (size_t)(sizeof(fold_T) * moved)); | |
1442 vim_free(nfp); | |
1443 gap->ga_len += moved - 1; | |
1444 } | |
1445 } | |
1446 } | |
1447 | |
1448 /* deleteFoldRecurse() {{{2 */ | |
1449 /* | |
1450 * Delete nested folds in a fold. | |
1451 */ | |
1452 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1453 deleteFoldRecurse(garray_T *gap) |
7 | 1454 { |
1455 int i; | |
1456 | |
1457 for (i = 0; i < gap->ga_len; ++i) | |
1458 deleteFoldRecurse(&(((fold_T *)(gap->ga_data))[i].fd_nested)); | |
1459 ga_clear(gap); | |
1460 } | |
1461 | |
1462 /* foldMarkAdjust() {{{2 */ | |
1463 /* | |
1464 * Update line numbers of folds for inserted/deleted lines. | |
1465 */ | |
1466 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1467 foldMarkAdjust( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1468 win_T *wp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1469 linenr_T line1, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1470 linenr_T line2, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1471 long amount, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1472 long amount_after) |
7 | 1473 { |
1474 /* If deleting marks from line1 to line2, but not deleting all those | |
1475 * lines, set line2 so that only deleted lines have their folds removed. */ | |
1476 if (amount == MAXLNUM && line2 >= line1 && line2 - line1 >= -amount_after) | |
1477 line2 = line1 - amount_after - 1; | |
1478 /* If appending a line in Insert mode, it should be included in the fold | |
1479 * just above the line. */ | |
1480 if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) | |
1481 --line1; | |
1482 foldMarkAdjustRecurse(&wp->w_folds, line1, line2, amount, amount_after); | |
1483 } | |
1484 | |
1485 /* foldMarkAdjustRecurse() {{{2 */ | |
1486 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1487 foldMarkAdjustRecurse( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1488 garray_T *gap, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1489 linenr_T line1, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1490 linenr_T line2, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1491 long amount, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1492 long amount_after) |
7 | 1493 { |
1494 fold_T *fp; | |
1495 int i; | |
1496 linenr_T last; | |
1497 linenr_T top; | |
1498 | |
1499 /* In Insert mode an inserted line at the top of a fold is considered part | |
1500 * of the fold, otherwise it isn't. */ | |
1501 if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM) | |
1502 top = line1 + 1; | |
1503 else | |
1504 top = line1; | |
1505 | |
1506 /* Find the fold containing or just below "line1". */ | |
1507 (void)foldFind(gap, line1, &fp); | |
1508 | |
1509 /* | |
1510 * Adjust all folds below "line1" that are affected. | |
1511 */ | |
1512 for (i = (int)(fp - (fold_T *)gap->ga_data); i < gap->ga_len; ++i, ++fp) | |
1513 { | |
1514 /* | |
1515 * Check for these situations: | |
1516 * 1 2 3 | |
1517 * 1 2 3 | |
1518 * line1 2 3 4 5 | |
1519 * 2 3 4 5 | |
1520 * 2 3 4 5 | |
1521 * line2 2 3 4 5 | |
1522 * 3 5 6 | |
1523 * 3 5 6 | |
1524 */ | |
1525 | |
1526 last = fp->fd_top + fp->fd_len - 1; /* last line of fold */ | |
1527 | |
1528 /* 1. fold completely above line1: nothing to do */ | |
1529 if (last < line1) | |
1530 continue; | |
1531 | |
1532 /* 6. fold below line2: only adjust for amount_after */ | |
1533 if (fp->fd_top > line2) | |
1534 { | |
1535 if (amount_after == 0) | |
1536 break; | |
1537 fp->fd_top += amount_after; | |
1538 } | |
1539 else | |
1540 { | |
1541 if (fp->fd_top >= top && last <= line2) | |
1542 { | |
1543 /* 4. fold completely contained in range */ | |
1544 if (amount == MAXLNUM) | |
1545 { | |
1546 /* Deleting lines: delete the fold completely */ | |
1547 deleteFoldEntry(gap, i, TRUE); | |
1548 --i; /* adjust index for deletion */ | |
1549 --fp; | |
1550 } | |
1551 else | |
1552 fp->fd_top += amount; | |
1553 } | |
1554 else | |
1555 { | |
1556 if (fp->fd_top < top) | |
1557 { | |
1964 | 1558 /* 2 or 3: need to correct nested folds too */ |
1559 foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, | |
1560 line2 - fp->fd_top, amount, amount_after); | |
7 | 1561 if (last <= line2) |
1562 { | |
1563 /* 2. fold contains line1, line2 is below fold */ | |
1564 if (amount == MAXLNUM) | |
1565 fp->fd_len = line1 - fp->fd_top; | |
1566 else | |
1567 fp->fd_len += amount; | |
1568 } | |
1569 else | |
1570 { | |
1571 /* 3. fold contains line1 and line2 */ | |
1572 fp->fd_len += amount_after; | |
1573 } | |
1574 } | |
1575 else | |
1576 { | |
1964 | 1577 /* 5. fold is below line1 and contains line2; need to |
1578 * correct nested folds too */ | |
7 | 1579 if (amount == MAXLNUM) |
1580 { | |
10998
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1581 foldMarkAdjustRecurse(&fp->fd_nested, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1582 line1 - fp->fd_top, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1583 line2 - fp->fd_top, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1584 amount, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1585 amount_after + (fp->fd_top - top)); |
7 | 1586 fp->fd_len -= line2 - fp->fd_top + 1; |
1587 fp->fd_top = line1; | |
1588 } | |
1589 else | |
1590 { | |
10998
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1591 foldMarkAdjustRecurse(&fp->fd_nested, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1592 line1 - fp->fd_top, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1593 line2 - fp->fd_top, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1594 amount, |
2645a98217fa
patch 8.0.0388: filtering lines changes folds
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1595 amount_after - amount); |
7 | 1596 fp->fd_len += amount_after - amount; |
1597 fp->fd_top += amount; | |
1598 } | |
1599 } | |
1600 } | |
1601 } | |
1602 } | |
1603 } | |
1604 | |
1605 /* getDeepestNesting() {{{2 */ | |
1606 /* | |
1607 * Get the lowest 'foldlevel' value that makes the deepest nested fold in the | |
1608 * current window open. | |
1609 */ | |
1610 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1611 getDeepestNesting(void) |
7 | 1612 { |
1613 checkupdate(curwin); | |
1614 return getDeepestNestingRecurse(&curwin->w_folds); | |
1615 } | |
1616 | |
1617 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1618 getDeepestNestingRecurse(garray_T *gap) |
7 | 1619 { |
1620 int i; | |
1621 int level; | |
1622 int maxlevel = 0; | |
1623 fold_T *fp; | |
1624 | |
1625 fp = (fold_T *)gap->ga_data; | |
1626 for (i = 0; i < gap->ga_len; ++i) | |
1627 { | |
1628 level = getDeepestNestingRecurse(&fp[i].fd_nested) + 1; | |
1629 if (level > maxlevel) | |
1630 maxlevel = level; | |
1631 } | |
1632 | |
1633 return maxlevel; | |
1634 } | |
1635 | |
1636 /* check_closed() {{{2 */ | |
1637 /* | |
1638 * Check if a fold is closed and update the info needed to check nested folds. | |
1639 */ | |
1640 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1641 check_closed( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1642 win_T *win, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1643 fold_T *fp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1644 int *use_levelp, /* TRUE: outer fold had FD_LEVEL */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1645 int level, /* folding depth */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1646 int *maybe_smallp, /* TRUE: outer this had fd_small == MAYBE */ |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1647 linenr_T lnum_off) /* line number offset for fp->fd_top */ |
7 | 1648 { |
1649 int closed = FALSE; | |
1650 | |
1651 /* Check if this fold is closed. If the flag is FD_LEVEL this | |
1652 * fold and all folds it contains depend on 'foldlevel'. */ | |
1653 if (*use_levelp || fp->fd_flags == FD_LEVEL) | |
1654 { | |
1655 *use_levelp = TRUE; | |
1656 if (level >= win->w_p_fdl) | |
1657 closed = TRUE; | |
1658 } | |
1659 else if (fp->fd_flags == FD_CLOSED) | |
1660 closed = TRUE; | |
1661 | |
1662 /* Small fold isn't closed anyway. */ | |
1663 if (fp->fd_small == MAYBE) | |
1664 *maybe_smallp = TRUE; | |
1665 if (closed) | |
1666 { | |
1667 if (*maybe_smallp) | |
1668 fp->fd_small = MAYBE; | |
1669 checkSmall(win, fp, lnum_off); | |
1670 if (fp->fd_small == TRUE) | |
1671 closed = FALSE; | |
1672 } | |
1673 return closed; | |
1674 } | |
1675 | |
1676 /* checkSmall() {{{2 */ | |
1677 /* | |
1678 * Update fd_small field of fold "fp". | |
1679 */ | |
1680 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1681 checkSmall( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1682 win_T *wp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1683 fold_T *fp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1684 linenr_T lnum_off) /* offset for fp->fd_top */ |
7 | 1685 { |
1686 int count; | |
1687 int n; | |
1688 | |
1689 if (fp->fd_small == MAYBE) | |
1690 { | |
1691 /* Mark any nested folds to maybe-small */ | |
1692 setSmallMaybe(&fp->fd_nested); | |
1693 | |
1694 if (fp->fd_len > curwin->w_p_fml) | |
1695 fp->fd_small = FALSE; | |
1696 else | |
1697 { | |
1698 count = 0; | |
1699 for (n = 0; n < fp->fd_len; ++n) | |
1700 { | |
1701 count += plines_win_nofold(wp, fp->fd_top + lnum_off + n); | |
1702 if (count > curwin->w_p_fml) | |
1703 { | |
1704 fp->fd_small = FALSE; | |
1705 return; | |
1706 } | |
1707 } | |
1708 fp->fd_small = TRUE; | |
1709 } | |
1710 } | |
1711 } | |
1712 | |
1713 /* setSmallMaybe() {{{2 */ | |
1714 /* | |
1715 * Set small flags in "gap" to MAYBE. | |
1716 */ | |
1717 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1718 setSmallMaybe(garray_T *gap) |
7 | 1719 { |
1720 int i; | |
1721 fold_T *fp; | |
1722 | |
1723 fp = (fold_T *)gap->ga_data; | |
1724 for (i = 0; i < gap->ga_len; ++i) | |
1725 fp[i].fd_small = MAYBE; | |
1726 } | |
1727 | |
1728 /* foldCreateMarkers() {{{2 */ | |
1729 /* | |
1730 * Create a fold from line "start" to line "end" (inclusive) in the current | |
1731 * window by adding markers. | |
1732 */ | |
1733 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1734 foldCreateMarkers(linenr_T start, linenr_T end) |
7 | 1735 { |
1736 if (!curbuf->b_p_ma) | |
1737 { | |
1738 EMSG(_(e_modifiable)); | |
1739 return; | |
1740 } | |
1741 parseMarker(curwin); | |
1742 | |
1743 foldAddMarker(start, curwin->w_p_fmr, foldstartmarkerlen); | |
1744 foldAddMarker(end, foldendmarker, foldendmarkerlen); | |
1745 | |
1746 /* Update both changes here, to avoid all folds after the start are | |
1747 * changed when the start marker is inserted and the end isn't. */ | |
1748 changed_lines(start, (colnr_T)0, end, 0L); | |
1749 } | |
1750 | |
1751 /* foldAddMarker() {{{2 */ | |
1752 /* | |
1753 * Add "marker[markerlen]" in 'commentstring' to line "lnum". | |
1754 */ | |
1755 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1756 foldAddMarker(linenr_T lnum, char_u *marker, int markerlen) |
7 | 1757 { |
1758 char_u *cms = curbuf->b_p_cms; | |
1759 char_u *line; | |
1760 int line_len; | |
1761 char_u *newline; | |
1762 char_u *p = (char_u *)strstr((char *)curbuf->b_p_cms, "%s"); | |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1763 int line_is_comment = FALSE; |
7 | 1764 |
1765 /* Allocate a new line: old-line + 'cms'-start + marker + 'cms'-end */ | |
1766 line = ml_get(lnum); | |
1767 line_len = (int)STRLEN(line); | |
1768 | |
1769 if (u_save(lnum - 1, lnum + 1) == OK) | |
1770 { | |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1771 #if defined(FEAT_COMMENTS) |
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1772 /* Check if the line ends with an unclosed comment */ |
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1773 (void)skip_comment(line, FALSE, FALSE, &line_is_comment); |
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1774 #endif |
7 | 1775 newline = alloc((unsigned)(line_len + markerlen + STRLEN(cms) + 1)); |
1776 if (newline == NULL) | |
1777 return; | |
1778 STRCPY(newline, line); | |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1779 /* Append the marker to the end of the line */ |
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
1780 if (p == NULL || line_is_comment) |
419 | 1781 vim_strncpy(newline + line_len, marker, markerlen); |
7 | 1782 else |
1783 { | |
1784 STRCPY(newline + line_len, cms); | |
1785 STRNCPY(newline + line_len + (p - cms), marker, markerlen); | |
1786 STRCPY(newline + line_len + (p - cms) + markerlen, p + 2); | |
1787 } | |
1788 | |
1789 ml_replace(lnum, newline, FALSE); | |
1790 } | |
1791 } | |
1792 | |
1793 /* deleteFoldMarkers() {{{2 */ | |
1794 /* | |
1795 * Delete the markers for a fold, causing it to be deleted. | |
1796 */ | |
1797 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1798 deleteFoldMarkers( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1799 fold_T *fp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1800 int recursive, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1801 linenr_T lnum_off) /* offset for fp->fd_top */ |
7 | 1802 { |
1803 int i; | |
1804 | |
1805 if (recursive) | |
1806 for (i = 0; i < fp->fd_nested.ga_len; ++i) | |
1807 deleteFoldMarkers((fold_T *)fp->fd_nested.ga_data + i, TRUE, | |
1808 lnum_off + fp->fd_top); | |
1809 foldDelMarker(fp->fd_top + lnum_off, curwin->w_p_fmr, foldstartmarkerlen); | |
1810 foldDelMarker(fp->fd_top + lnum_off + fp->fd_len - 1, | |
1811 foldendmarker, foldendmarkerlen); | |
1812 } | |
1813 | |
1814 /* foldDelMarker() {{{2 */ | |
1815 /* | |
1816 * Delete marker "marker[markerlen]" at the end of line "lnum". | |
1817 * Delete 'commentstring' if it matches. | |
1818 * If the marker is not found, there is no error message. Could a missing | |
1819 * close-marker. | |
1820 */ | |
1821 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1822 foldDelMarker(linenr_T lnum, char_u *marker, int markerlen) |
7 | 1823 { |
1824 char_u *line; | |
1825 char_u *newline; | |
1826 char_u *p; | |
1827 int len; | |
1828 char_u *cms = curbuf->b_p_cms; | |
1829 char_u *cms2; | |
1830 | |
1831 line = ml_get(lnum); | |
1832 for (p = line; *p != NUL; ++p) | |
1833 if (STRNCMP(p, marker, markerlen) == 0) | |
1834 { | |
1835 /* Found the marker, include a digit if it's there. */ | |
1836 len = markerlen; | |
1837 if (VIM_ISDIGIT(p[len])) | |
1838 ++len; | |
1839 if (*cms != NUL) | |
1840 { | |
1841 /* Also delete 'commentstring' if it matches. */ | |
1842 cms2 = (char_u *)strstr((char *)cms, "%s"); | |
1843 if (p - line >= cms2 - cms | |
1844 && STRNCMP(p - (cms2 - cms), cms, cms2 - cms) == 0 | |
1845 && STRNCMP(p + len, cms2 + 2, STRLEN(cms2 + 2)) == 0) | |
1846 { | |
1847 p -= cms2 - cms; | |
1848 len += (int)STRLEN(cms) - 2; | |
1849 } | |
1850 } | |
1851 if (u_save(lnum - 1, lnum + 1) == OK) | |
1852 { | |
1853 /* Make new line: text-before-marker + text-after-marker */ | |
1854 newline = alloc((unsigned)(STRLEN(line) - len + 1)); | |
1855 if (newline != NULL) | |
1856 { | |
1857 STRNCPY(newline, line, p - line); | |
1858 STRCPY(newline + (p - line), p + len); | |
1859 ml_replace(lnum, newline, FALSE); | |
1860 } | |
1861 } | |
1862 break; | |
1863 } | |
1864 } | |
1865 | |
29 | 1866 /* get_foldtext() {{{2 */ |
1867 /* | |
1868 * Return the text for a closed fold at line "lnum", with last line "lnume". | |
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1869 * When 'foldtext' isn't set puts the result in "buf[FOLD_TEXT_LEN]". |
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1870 * Otherwise the result is in allocated memory. |
29 | 1871 */ |
1872 char_u * | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1873 get_foldtext( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1874 win_T *wp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1875 linenr_T lnum, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1876 linenr_T lnume, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1877 foldinfo_T *foldinfo, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1878 char_u *buf) |
29 | 1879 { |
1880 char_u *text = NULL; | |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1881 #ifdef FEAT_EVAL |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1882 /* an error occurred when evaluating 'fdt' setting */ |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1883 static int got_fdt_error = FALSE; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1884 int save_did_emsg = did_emsg; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1885 static win_T *last_wp = NULL; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1886 static linenr_T last_lnum = 0; |
29 | 1887 |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1888 if (last_wp != wp || last_wp == NULL |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1889 || last_lnum > lnum || last_lnum == 0) |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1890 /* window changed, try evaluating foldtext setting once again */ |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1891 got_fdt_error = FALSE; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1892 |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1893 if (!got_fdt_error) |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1894 /* a previous error should not abort evaluating 'foldexpr' */ |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1895 did_emsg = FALSE; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1896 |
29 | 1897 if (*wp->w_p_fdt != NUL) |
1898 { | |
1981 | 1899 char_u dashes[MAX_LEVEL + 2]; |
29 | 1900 win_T *save_curwin; |
1901 int level; | |
1902 char_u *p; | |
1903 | |
1904 /* Set "v:foldstart" and "v:foldend". */ | |
1905 set_vim_var_nr(VV_FOLDSTART, lnum); | |
1906 set_vim_var_nr(VV_FOLDEND, lnume); | |
1907 | |
1908 /* Set "v:folddashes" to a string of "level" dashes. */ | |
1909 /* Set "v:foldlevel" to "level". */ | |
1910 level = foldinfo->fi_level; | |
1981 | 1911 if (level > (int)sizeof(dashes) - 1) |
1912 level = (int)sizeof(dashes) - 1; | |
29 | 1913 vim_memset(dashes, '-', (size_t)level); |
1914 dashes[level] = NUL; | |
1915 set_vim_var_string(VV_FOLDDASHES, dashes, -1); | |
1916 set_vim_var_nr(VV_FOLDLEVEL, (long)level); | |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1917 |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1918 /* skip evaluating foldtext on errors */ |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1919 if (!got_fdt_error) |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1920 { |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1921 save_curwin = curwin; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1922 curwin = wp; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1923 curbuf = wp->w_buffer; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1924 |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1925 ++emsg_silent; /* handle exceptions, but don't display errors */ |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1926 text = eval_to_string_safe(wp->w_p_fdt, NULL, |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1927 was_set_insecurely((char_u *)"foldtext", OPT_LOCAL)); |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1928 --emsg_silent; |
29 | 1929 |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1930 if (text == NULL || did_emsg) |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1931 got_fdt_error = TRUE; |
29 | 1932 |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1933 curwin = save_curwin; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1934 curbuf = curwin->w_buffer; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1935 } |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1936 last_lnum = lnum; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1937 last_wp = wp; |
29 | 1938 set_vim_var_string(VV_FOLDDASHES, NULL, -1); |
1939 | |
4907
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1940 if (!did_emsg && save_did_emsg) |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1941 did_emsg = save_did_emsg; |
be2973afe770
updated for version 7.3.1199
Bram Moolenaar <bram@vim.org>
parents:
3766
diff
changeset
|
1942 |
29 | 1943 if (text != NULL) |
1944 { | |
1945 /* Replace unprintable characters, if there are any. But | |
1946 * replace a TAB with a space. */ | |
1947 for (p = text; *p != NUL; ++p) | |
1948 { | |
1949 # ifdef FEAT_MBYTE | |
33 | 1950 int len; |
1951 | |
474 | 1952 if (has_mbyte && (len = (*mb_ptr2len)(p)) > 1) |
29 | 1953 { |
1954 if (!vim_isprintc((*mb_ptr2char)(p))) | |
1955 break; | |
1956 p += len - 1; | |
1957 } | |
1958 else | |
1959 # endif | |
1960 if (*p == TAB) | |
1961 *p = ' '; | |
1962 else if (ptr2cells(p) > 1) | |
1963 break; | |
1964 } | |
1965 if (*p != NUL) | |
1966 { | |
1967 p = transstr(text); | |
1968 vim_free(text); | |
1969 text = p; | |
1970 } | |
1971 } | |
1972 } | |
1973 if (text == NULL) | |
1974 #endif | |
1975 { | |
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1976 long count = (long)(lnume - lnum + 1); |
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1977 |
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1978 vim_snprintf((char *)buf, FOLD_TEXT_LEN, |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
1979 NGETTEXT("+--%3ld line folded ", |
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1980 "+--%3ld lines folded ", count), |
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
1981 count); |
29 | 1982 text = buf; |
1983 } | |
1984 return text; | |
1985 } | |
1986 | |
7 | 1987 /* foldtext_cleanup() {{{2 */ |
1988 /* | |
1989 * Remove 'foldmarker' and 'commentstring' from "str" (in-place). | |
1990 */ | |
1991 void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
1992 foldtext_cleanup(char_u *str) |
7 | 1993 { |
1994 char_u *cms_start; /* first part or the whole comment */ | |
1995 int cms_slen = 0; /* length of cms_start */ | |
1996 char_u *cms_end; /* last part of the comment or NULL */ | |
1997 int cms_elen = 0; /* length of cms_end */ | |
1998 char_u *s; | |
45 | 1999 char_u *p; |
7 | 2000 int len; |
2001 int did1 = FALSE; | |
2002 int did2 = FALSE; | |
2003 | |
2004 /* Ignore leading and trailing white space in 'commentstring'. */ | |
2005 cms_start = skipwhite(curbuf->b_p_cms); | |
835 | 2006 cms_slen = (int)STRLEN(cms_start); |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2007 while (cms_slen > 0 && VIM_ISWHITE(cms_start[cms_slen - 1])) |
7 | 2008 --cms_slen; |
2009 | |
2010 /* locate "%s" in 'commentstring', use the part before and after it. */ | |
2011 cms_end = (char_u *)strstr((char *)cms_start, "%s"); | |
2012 if (cms_end != NULL) | |
2013 { | |
835 | 2014 cms_elen = cms_slen - (int)(cms_end - cms_start); |
2015 cms_slen = (int)(cms_end - cms_start); | |
7 | 2016 |
2017 /* exclude white space before "%s" */ | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2018 while (cms_slen > 0 && VIM_ISWHITE(cms_start[cms_slen - 1])) |
7 | 2019 --cms_slen; |
2020 | |
2021 /* skip "%s" and white space after it */ | |
2022 s = skipwhite(cms_end + 2); | |
835 | 2023 cms_elen -= (int)(s - cms_end); |
7 | 2024 cms_end = s; |
2025 } | |
2026 parseMarker(curwin); | |
2027 | |
2028 for (s = str; *s != NUL; ) | |
2029 { | |
2030 len = 0; | |
2031 if (STRNCMP(s, curwin->w_p_fmr, foldstartmarkerlen) == 0) | |
45 | 2032 len = foldstartmarkerlen; |
2033 else if (STRNCMP(s, foldendmarker, foldendmarkerlen) == 0) | |
2034 len = foldendmarkerlen; | |
2035 if (len > 0) | |
7 | 2036 { |
2037 if (VIM_ISDIGIT(s[len])) | |
2038 ++len; | |
45 | 2039 |
2040 /* May remove 'commentstring' start. Useful when it's a double | |
2041 * quote and we already removed a double quote. */ | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2042 for (p = s; p > str && VIM_ISWHITE(p[-1]); --p) |
45 | 2043 ; |
2044 if (p >= str + cms_slen | |
2045 && STRNCMP(p - cms_slen, cms_start, cms_slen) == 0) | |
2046 { | |
835 | 2047 len += (int)(s - p) + cms_slen; |
45 | 2048 s = p - cms_slen; |
2049 } | |
7 | 2050 } |
2051 else if (cms_end != NULL) | |
2052 { | |
45 | 2053 if (!did1 && cms_slen > 0 && STRNCMP(s, cms_start, cms_slen) == 0) |
7 | 2054 { |
2055 len = cms_slen; | |
2056 did1 = TRUE; | |
2057 } | |
45 | 2058 else if (!did2 && cms_elen > 0 |
2059 && STRNCMP(s, cms_end, cms_elen) == 0) | |
7 | 2060 { |
2061 len = cms_elen; | |
2062 did2 = TRUE; | |
2063 } | |
2064 } | |
2065 if (len != 0) | |
2066 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
2067 while (VIM_ISWHITE(s[len])) |
7 | 2068 ++len; |
1624 | 2069 STRMOVE(s, s + len); |
7 | 2070 } |
2071 else | |
2072 { | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
2073 MB_PTR_ADV(s); |
7 | 2074 } |
2075 } | |
2076 } | |
2077 | |
2078 /* Folding by indent, expr, marker and syntax. {{{1 */ | |
2079 /* Define "fline_T", passed to get fold level for a line. {{{2 */ | |
2080 typedef struct | |
2081 { | |
2082 win_T *wp; /* window */ | |
2083 linenr_T lnum; /* current line number */ | |
2084 linenr_T off; /* offset between lnum and real line number */ | |
2085 linenr_T lnum_save; /* line nr used by foldUpdateIEMSRecurse() */ | |
2086 int lvl; /* current level (-1 for undefined) */ | |
2087 int lvl_next; /* level used for next line */ | |
2088 int start; /* number of folds that are forced to start at | |
2089 this line. */ | |
2090 int end; /* level of fold that is forced to end below | |
2091 this line */ | |
2092 int had_end; /* level of fold that is forced to end above | |
2093 this line (copy of "end" of prev. line) */ | |
2094 } fline_T; | |
2095 | |
2096 /* Flag is set when redrawing is needed. */ | |
2097 static int fold_changed; | |
2098 | |
2099 /* Function declarations. {{{2 */ | |
7807
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7801
diff
changeset
|
2100 static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level, linenr_T startlnum, fline_T *flp, void (*getlevel)(fline_T *), linenr_T bot, int topflags); |
7801
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2101 static int foldInsert(garray_T *gap, int i); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2102 static void foldSplit(garray_T *gap, int i, linenr_T top, linenr_T bot); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2103 static void foldRemove(garray_T *gap, linenr_T top, linenr_T bot); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2104 static void foldMerge(fold_T *fp1, garray_T *gap, fold_T *fp2); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2105 static void foldlevelIndent(fline_T *flp); |
7 | 2106 #ifdef FEAT_DIFF |
7801
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2107 static void foldlevelDiff(fline_T *flp); |
7 | 2108 #endif |
7801
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2109 static void foldlevelExpr(fline_T *flp); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2110 static void foldlevelMarker(fline_T *flp); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
2111 static void foldlevelSyntax(fline_T *flp); |
7 | 2112 |
2113 /* foldUpdateIEMS() {{{2 */ | |
2114 /* | |
2115 * Update the folding for window "wp", at least from lines "top" to "bot". | |
2116 * Return TRUE if any folds did change. | |
2117 */ | |
2118 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2119 foldUpdateIEMS(win_T *wp, linenr_T top, linenr_T bot) |
7 | 2120 { |
2121 linenr_T start; | |
2122 linenr_T end; | |
2123 fline_T fline; | |
7807
1a5d34492798
commit https://github.com/vim/vim/commit/d99df423c559d85c17779b3685426c489554908c
Christian Brabandt <cb@256bit.org>
parents:
7801
diff
changeset
|
2124 void (*getlevel)(fline_T *); |
7 | 2125 int level; |
2126 fold_T *fp; | |
2127 | |
2128 /* Avoid problems when being called recursively. */ | |
2129 if (invalid_top != (linenr_T)0) | |
2130 return; | |
2131 | |
2132 if (wp->w_foldinvalid) | |
2133 { | |
2134 /* Need to update all folds. */ | |
2135 top = 1; | |
2136 bot = wp->w_buffer->b_ml.ml_line_count; | |
2137 wp->w_foldinvalid = FALSE; | |
2138 | |
2139 /* Mark all folds a maybe-small. */ | |
2140 setSmallMaybe(&wp->w_folds); | |
2141 } | |
2142 | |
2143 #ifdef FEAT_DIFF | |
2144 /* add the context for "diff" folding */ | |
2145 if (foldmethodIsDiff(wp)) | |
2146 { | |
2147 if (top > diff_context) | |
2148 top -= diff_context; | |
2149 else | |
2150 top = 1; | |
2151 bot += diff_context; | |
2152 } | |
2153 #endif | |
2154 | |
2155 /* When deleting lines at the end of the buffer "top" can be past the end | |
2156 * of the buffer. */ | |
2157 if (top > wp->w_buffer->b_ml.ml_line_count) | |
2158 top = wp->w_buffer->b_ml.ml_line_count; | |
2159 | |
2160 fold_changed = FALSE; | |
2161 fline.wp = wp; | |
2162 fline.off = 0; | |
2163 fline.lvl = 0; | |
2164 fline.lvl_next = -1; | |
2165 fline.start = 0; | |
2166 fline.end = MAX_LEVEL + 1; | |
2167 fline.had_end = MAX_LEVEL + 1; | |
2168 | |
2169 invalid_top = top; | |
2170 invalid_bot = bot; | |
2171 | |
2172 if (foldmethodIsMarker(wp)) | |
2173 { | |
2174 getlevel = foldlevelMarker; | |
2175 | |
2176 /* Init marker variables to speed up foldlevelMarker(). */ | |
2177 parseMarker(wp); | |
2178 | |
2179 /* Need to get the level of the line above top, it is used if there is | |
2180 * no marker at the top. */ | |
2181 if (top > 1) | |
2182 { | |
2183 /* Get the fold level at top - 1. */ | |
2184 level = foldLevelWin(wp, top - 1); | |
2185 | |
2186 /* The fold may end just above the top, check for that. */ | |
2187 fline.lnum = top - 1; | |
2188 fline.lvl = level; | |
2189 getlevel(&fline); | |
2190 | |
2191 /* If a fold started here, we already had the level, if it stops | |
2192 * here, we need to use lvl_next. Could also start and end a fold | |
2193 * in the same line. */ | |
2194 if (fline.lvl > level) | |
2195 fline.lvl = level - (fline.lvl - fline.lvl_next); | |
2196 else | |
2197 fline.lvl = fline.lvl_next; | |
2198 } | |
2199 fline.lnum = top; | |
2200 getlevel(&fline); | |
2201 } | |
2202 else | |
2203 { | |
2204 fline.lnum = top; | |
2205 if (foldmethodIsExpr(wp)) | |
2206 { | |
2207 getlevel = foldlevelExpr; | |
2208 /* start one line back, because a "<1" may indicate the end of a | |
2209 * fold in the topline */ | |
2210 if (top > 1) | |
2211 --fline.lnum; | |
2212 } | |
2213 else if (foldmethodIsSyntax(wp)) | |
2214 getlevel = foldlevelSyntax; | |
2215 #ifdef FEAT_DIFF | |
2216 else if (foldmethodIsDiff(wp)) | |
2217 getlevel = foldlevelDiff; | |
2218 #endif | |
2219 else | |
2220 getlevel = foldlevelIndent; | |
2221 | |
2222 /* Backup to a line for which the fold level is defined. Since it's | |
2223 * always defined for line one, we will stop there. */ | |
2224 fline.lvl = -1; | |
2225 for ( ; !got_int; --fline.lnum) | |
2226 { | |
2227 /* Reset lvl_next each time, because it will be set to a value for | |
2228 * the next line, but we search backwards here. */ | |
2229 fline.lvl_next = -1; | |
2230 getlevel(&fline); | |
2231 if (fline.lvl >= 0) | |
2232 break; | |
2233 } | |
2234 } | |
2235 | |
1977 | 2236 /* |
2237 * If folding is defined by the syntax, it is possible that a change in | |
2238 * one line will cause all sub-folds of the current fold to change (e.g., | |
2239 * closing a C-style comment can cause folds in the subsequent lines to | |
2240 * appear). To take that into account we should adjust the value of "bot" | |
2241 * to point to the end of the current fold: | |
2242 */ | |
2243 if (foldlevelSyntax == getlevel) | |
2244 { | |
2245 garray_T *gap = &wp->w_folds; | |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2246 fold_T *fpn = NULL; |
1977 | 2247 int current_fdl = 0; |
2248 linenr_T fold_start_lnum = 0; | |
2249 linenr_T lnum_rel = fline.lnum; | |
2250 | |
2251 while (current_fdl < fline.lvl) | |
2252 { | |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2253 if (!foldFind(gap, lnum_rel, &fpn)) |
1977 | 2254 break; |
2255 ++current_fdl; | |
2256 | |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2257 fold_start_lnum += fpn->fd_top; |
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2258 gap = &fpn->fd_nested; |
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2259 lnum_rel -= fpn->fd_top; |
1977 | 2260 } |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2261 if (fpn != NULL && current_fdl == fline.lvl) |
1977 | 2262 { |
2271
2b33a7678e7b
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
Bram Moolenaar <bram@vim.org>
parents:
2114
diff
changeset
|
2263 linenr_T fold_end_lnum = fold_start_lnum + fpn->fd_len; |
1977 | 2264 |
2265 if (fold_end_lnum > bot) | |
2266 bot = fold_end_lnum; | |
2267 } | |
2268 } | |
2269 | |
7 | 2270 start = fline.lnum; |
2271 end = bot; | |
2272 /* Do at least one line. */ | |
2273 if (start > end && end < wp->w_buffer->b_ml.ml_line_count) | |
2274 end = start; | |
2275 while (!got_int) | |
2276 { | |
2277 /* Always stop at the end of the file ("end" can be past the end of | |
2278 * the file). */ | |
2279 if (fline.lnum > wp->w_buffer->b_ml.ml_line_count) | |
2280 break; | |
2281 if (fline.lnum > end) | |
2282 { | |
2283 /* For "marker", "expr" and "syntax" methods: If a change caused | |
2284 * a fold to be removed, we need to continue at least until where | |
2285 * it ended. */ | |
2286 if (getlevel != foldlevelMarker | |
2287 && getlevel != foldlevelSyntax | |
2288 && getlevel != foldlevelExpr) | |
2289 break; | |
2290 if ((start <= end | |
2291 && foldFind(&wp->w_folds, end, &fp) | |
2292 && fp->fd_top + fp->fd_len - 1 > end) | |
2293 || (fline.lvl == 0 | |
2294 && foldFind(&wp->w_folds, fline.lnum, &fp) | |
2295 && fp->fd_top < fline.lnum)) | |
2296 end = fp->fd_top + fp->fd_len - 1; | |
2297 else if (getlevel == foldlevelSyntax | |
2298 && foldLevelWin(wp, fline.lnum) != fline.lvl) | |
2299 /* For "syntax" method: Compare the foldlevel that the syntax | |
2300 * tells us to the foldlevel from the existing folds. If they | |
2301 * don't match continue updating folds. */ | |
2302 end = fline.lnum; | |
2303 else | |
2304 break; | |
2305 } | |
2306 | |
2307 /* A level 1 fold starts at a line with foldlevel > 0. */ | |
2308 if (fline.lvl > 0) | |
2309 { | |
2310 invalid_top = fline.lnum; | |
2311 invalid_bot = end; | |
2312 end = foldUpdateIEMSRecurse(&wp->w_folds, | |
2313 1, start, &fline, getlevel, end, FD_LEVEL); | |
2314 start = fline.lnum; | |
2315 } | |
2316 else | |
2317 { | |
2318 if (fline.lnum == wp->w_buffer->b_ml.ml_line_count) | |
2319 break; | |
2320 ++fline.lnum; | |
2321 fline.lvl = fline.lvl_next; | |
2322 getlevel(&fline); | |
2323 } | |
2324 } | |
2325 | |
2326 /* There can't be any folds from start until end now. */ | |
2327 foldRemove(&wp->w_folds, start, end); | |
2328 | |
2329 /* If some fold changed, need to redraw and position cursor. */ | |
2330 if (fold_changed && wp->w_p_fen) | |
1554 | 2331 changed_window_setting_win(wp); |
7 | 2332 |
2333 /* If we updated folds past "bot", need to redraw more lines. Don't do | |
2334 * this in other situations, the changed lines will be redrawn anyway and | |
2335 * this method can cause the whole window to be updated. */ | |
2336 if (end != bot) | |
2337 { | |
2338 if (wp->w_redraw_top == 0 || wp->w_redraw_top > top) | |
2339 wp->w_redraw_top = top; | |
2340 if (wp->w_redraw_bot < end) | |
2341 wp->w_redraw_bot = end; | |
2342 } | |
2343 | |
2344 invalid_top = (linenr_T)0; | |
2345 } | |
2346 | |
2347 /* foldUpdateIEMSRecurse() {{{2 */ | |
2348 /* | |
2349 * Update a fold that starts at "flp->lnum". At this line there is always a | |
2350 * valid foldlevel, and its level >= "level". | |
2351 * "flp" is valid for "flp->lnum" when called and it's valid when returning. | |
2352 * "flp->lnum" is set to the lnum just below the fold, if it ends before | |
2353 * "bot", it's "bot" plus one if the fold continues and it's bigger when using | |
2354 * the marker method and a text change made following folds to change. | |
2355 * When returning, "flp->lnum_save" is the line number that was used to get | |
2356 * the level when the level at "flp->lnum" is invalid. | |
2357 * Remove any folds from "startlnum" up to here at this level. | |
2358 * Recursively update nested folds. | |
2359 * Below line "bot" there are no changes in the text. | |
2360 * "flp->lnum", "flp->lnum_save" and "bot" are relative to the start of the | |
2361 * outer fold. | |
2362 * "flp->off" is the offset to the real line number in the buffer. | |
2363 * | |
2364 * All this would be a lot simpler if all folds in the range would be deleted | |
1698 | 2365 * and then created again. But we would lose all information about the |
7 | 2366 * folds, even when making changes that don't affect the folding (e.g. "vj~"). |
2367 * | |
2368 * Returns bot, which may have been increased for lines that also need to be | |
2369 * updated as a result of a detected change in the fold. | |
2370 */ | |
2371 static linenr_T | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2372 foldUpdateIEMSRecurse( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2373 garray_T *gap, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2374 int level, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2375 linenr_T startlnum, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2376 fline_T *flp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2377 void (*getlevel)(fline_T *), |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2378 linenr_T bot, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2379 int topflags) /* flags used by containing fold */ |
7 | 2380 { |
2381 linenr_T ll; | |
2382 fold_T *fp = NULL; | |
2383 fold_T *fp2; | |
2384 int lvl = level; | |
2385 linenr_T startlnum2 = startlnum; | |
2386 linenr_T firstlnum = flp->lnum; /* first lnum we got */ | |
2387 int i; | |
2388 int finish = FALSE; | |
2389 linenr_T linecount = flp->wp->w_buffer->b_ml.ml_line_count - flp->off; | |
2390 int concat; | |
2391 | |
2392 /* | |
2393 * If using the marker method, the start line is not the start of a fold | |
2394 * at the level we're dealing with and the level is non-zero, we must use | |
2395 * the previous fold. But ignore a fold that starts at or below | |
2396 * startlnum, it must be deleted. | |
2397 */ | |
2398 if (getlevel == foldlevelMarker && flp->start <= flp->lvl - level | |
2399 && flp->lvl > 0) | |
2400 { | |
7009 | 2401 (void)foldFind(gap, startlnum - 1, &fp); |
7 | 2402 if (fp >= ((fold_T *)gap->ga_data) + gap->ga_len |
2403 || fp->fd_top >= startlnum) | |
2404 fp = NULL; | |
2405 } | |
2406 | |
2407 /* | |
2408 * Loop over all lines in this fold, or until "bot" is hit. | |
2409 * Handle nested folds inside of this fold. | |
2410 * "flp->lnum" is the current line. When finding the end of the fold, it | |
2411 * is just below the end of the fold. | |
2412 * "*flp" contains the level of the line "flp->lnum" or a following one if | |
2413 * there are lines with an invalid fold level. "flp->lnum_save" is the | |
2414 * line number that was used to get the fold level (below "flp->lnum" when | |
2415 * it has an invalid fold level). When called the fold level is always | |
2416 * valid, thus "flp->lnum_save" is equal to "flp->lnum". | |
2417 */ | |
2418 flp->lnum_save = flp->lnum; | |
2419 while (!got_int) | |
2420 { | |
2421 /* Updating folds can be slow, check for CTRL-C. */ | |
2422 line_breakcheck(); | |
2423 | |
2424 /* Set "lvl" to the level of line "flp->lnum". When flp->start is set | |
2425 * and after the first line of the fold, set the level to zero to | |
2426 * force the fold to end. Do the same when had_end is set: Previous | |
2427 * line was marked as end of a fold. */ | |
2428 lvl = flp->lvl; | |
2429 if (lvl > MAX_LEVEL) | |
2430 lvl = MAX_LEVEL; | |
2431 if (flp->lnum > firstlnum | |
2432 && (level > lvl - flp->start || level >= flp->had_end)) | |
2433 lvl = 0; | |
2434 | |
2435 if (flp->lnum > bot && !finish && fp != NULL) | |
2436 { | |
2437 /* For "marker" and "syntax" methods: | |
2438 * - If a change caused a nested fold to be removed, we need to | |
2439 * delete it and continue at least until where it ended. | |
2440 * - If a change caused a nested fold to be created, or this fold | |
2441 * to continue below its original end, need to finish this fold. | |
2442 */ | |
2443 if (getlevel != foldlevelMarker | |
2444 && getlevel != foldlevelExpr | |
2445 && getlevel != foldlevelSyntax) | |
2446 break; | |
2447 i = 0; | |
2448 fp2 = fp; | |
2449 if (lvl >= level) | |
2450 { | |
2451 /* Compute how deep the folds currently are, if it's deeper | |
2452 * than "lvl" then some must be deleted, need to update | |
2453 * at least one nested fold. */ | |
2454 ll = flp->lnum - fp->fd_top; | |
2455 while (foldFind(&fp2->fd_nested, ll, &fp2)) | |
2456 { | |
2457 ++i; | |
2458 ll -= fp2->fd_top; | |
2459 } | |
2460 } | |
2461 if (lvl < level + i) | |
2462 { | |
7009 | 2463 (void)foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2); |
7 | 2464 if (fp2 != NULL) |
2465 bot = fp2->fd_top + fp2->fd_len - 1 + fp->fd_top; | |
2466 } | |
2467 else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level) | |
2468 finish = TRUE; | |
2469 else | |
2470 break; | |
2471 } | |
2472 | |
2473 /* At the start of the first nested fold and at the end of the current | |
2474 * fold: check if existing folds at this level, before the current | |
2475 * one, need to be deleted or truncated. */ | |
2476 if (fp == NULL | |
2477 && (lvl != level | |
2478 || flp->lnum_save >= bot | |
2479 || flp->start != 0 | |
2480 || flp->had_end <= MAX_LEVEL | |
2481 || flp->lnum == linecount)) | |
2482 { | |
2483 /* | |
2484 * Remove or update folds that have lines between startlnum and | |
2485 * firstlnum. | |
2486 */ | |
2487 while (!got_int) | |
2488 { | |
2489 /* set concat to 1 if it's allowed to concatenated this fold | |
2490 * with a previous one that touches it. */ | |
2491 if (flp->start != 0 || flp->had_end <= MAX_LEVEL) | |
2492 concat = 0; | |
2493 else | |
2494 concat = 1; | |
2495 | |
2496 /* Find an existing fold to re-use. Preferably one that | |
2497 * includes startlnum, otherwise one that ends just before | |
2498 * startlnum or starts after it. */ | |
2499 if (foldFind(gap, startlnum, &fp) | |
2500 || (fp < ((fold_T *)gap->ga_data) + gap->ga_len | |
2501 && fp->fd_top <= firstlnum) | |
2502 || foldFind(gap, firstlnum - concat, &fp) | |
2503 || (fp < ((fold_T *)gap->ga_data) + gap->ga_len | |
2504 && ((lvl < level && fp->fd_top < flp->lnum) | |
2505 || (lvl >= level | |
2506 && fp->fd_top <= flp->lnum_save)))) | |
2507 { | |
2508 if (fp->fd_top + fp->fd_len + concat > firstlnum) | |
2509 { | |
2510 /* Use existing fold for the new fold. If it starts | |
2511 * before where we started looking, extend it. If it | |
2512 * starts at another line, update nested folds to keep | |
2513 * their position, compensating for the new fd_top. */ | |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2514 if (fp->fd_top == firstlnum) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2515 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2516 /* have found a fold beginning where we want */ |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2517 } |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2518 else if (fp->fd_top >= startlnum) |
7 | 2519 { |
2520 if (fp->fd_top > firstlnum) | |
2521 /* like lines are inserted */ | |
2522 foldMarkAdjustRecurse(&fp->fd_nested, | |
2523 (linenr_T)0, (linenr_T)MAXLNUM, | |
2524 (long)(fp->fd_top - firstlnum), 0L); | |
2525 else | |
2526 /* like lines are deleted */ | |
2527 foldMarkAdjustRecurse(&fp->fd_nested, | |
2528 (linenr_T)0, | |
2529 (long)(firstlnum - fp->fd_top - 1), | |
2530 (linenr_T)MAXLNUM, | |
2531 (long)(fp->fd_top - firstlnum)); | |
2532 fp->fd_len += fp->fd_top - firstlnum; | |
2533 fp->fd_top = firstlnum; | |
2534 fold_changed = TRUE; | |
2535 } | |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2536 else if ((flp->start != 0 && lvl == level) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2537 || firstlnum != startlnum) |
7 | 2538 { |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2539 linenr_T breakstart; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2540 linenr_T breakend; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2541 |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2542 /* |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2543 * Before there was a fold spanning from above |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2544 * startlnum to below firstlnum. This fold is valid |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2545 * above startlnum (because we are not updating |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2546 * that range), but there should now be a break in |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2547 * it. |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2548 * If the break is because we are now forced to |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2549 * start a new fold at the level "level" at line |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2550 * fline->lnum, then we need to split the fold at |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2551 * fline->lnum. |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2552 * If the break is because the range |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2553 * [startlnum, firstlnum) is now at a lower indent |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2554 * than "level", we need to split the fold in this |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2555 * range. |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2556 * Any splits have to be done recursively. |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2557 */ |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2558 if (firstlnum != startlnum) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2559 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2560 breakstart = startlnum; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2561 breakend = firstlnum; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2562 } |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2563 else |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2564 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2565 breakstart = flp->lnum; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2566 breakend = flp->lnum; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2567 } |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2568 foldRemove(&fp->fd_nested, breakstart - fp->fd_top, |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2569 breakend - fp->fd_top); |
7 | 2570 i = (int)(fp - (fold_T *)gap->ga_data); |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2571 foldSplit(gap, i, breakstart, breakend - 1); |
7 | 2572 fp = (fold_T *)gap->ga_data + i + 1; |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2573 |
7 | 2574 /* If using the "marker" or "syntax" method, we |
2575 * need to continue until the end of the fold is | |
2576 * found. */ | |
2577 if (getlevel == foldlevelMarker | |
2578 || getlevel == foldlevelExpr | |
2579 || getlevel == foldlevelSyntax) | |
2580 finish = TRUE; | |
2581 } | |
11038
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2582 |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2583 if (fp->fd_top == startlnum && concat) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2584 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2585 i = (int)(fp - (fold_T *)gap->ga_data); |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2586 if (i != 0) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2587 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2588 fp2 = fp - 1; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2589 if (fp2->fd_top + fp2->fd_len == fp->fd_top) |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2590 { |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2591 foldMerge(fp2, gap, fp); |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2592 fp = fp2; |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2593 } |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2594 } |
c8b49300c6b7
patch 8.0.0408: updating folds does not always work properly
Christian Brabandt <cb@256bit.org>
parents:
10998
diff
changeset
|
2595 } |
7 | 2596 break; |
2597 } | |
2598 if (fp->fd_top >= startlnum) | |
2599 { | |
2600 /* A fold that starts at or after startlnum and stops | |
2601 * before the new fold must be deleted. Continue | |
2602 * looking for the next one. */ | |
2603 deleteFoldEntry(gap, | |
2604 (int)(fp - (fold_T *)gap->ga_data), TRUE); | |
2605 } | |
2606 else | |
2607 { | |
2608 /* A fold has some lines above startlnum, truncate it | |
2609 * to stop just above startlnum. */ | |
2610 fp->fd_len = startlnum - fp->fd_top; | |
2611 foldMarkAdjustRecurse(&fp->fd_nested, | |
2612 (linenr_T)fp->fd_len, (linenr_T)MAXLNUM, | |
2613 (linenr_T)MAXLNUM, 0L); | |
2614 fold_changed = TRUE; | |
2615 } | |
2616 } | |
2617 else | |
2618 { | |
2619 /* Insert new fold. Careful: ga_data may be NULL and it | |
2620 * may change! */ | |
2621 i = (int)(fp - (fold_T *)gap->ga_data); | |
2622 if (foldInsert(gap, i) != OK) | |
2623 return bot; | |
2624 fp = (fold_T *)gap->ga_data + i; | |
2625 /* The new fold continues until bot, unless we find the | |
2626 * end earlier. */ | |
2627 fp->fd_top = firstlnum; | |
2628 fp->fd_len = bot - firstlnum + 1; | |
2629 /* When the containing fold is open, the new fold is open. | |
2630 * The new fold is closed if the fold above it is closed. | |
2631 * The first fold depends on the containing fold. */ | |
2632 if (topflags == FD_OPEN) | |
2633 { | |
2634 flp->wp->w_fold_manual = TRUE; | |
2635 fp->fd_flags = FD_OPEN; | |
2636 } | |
2637 else if (i <= 0) | |
2638 { | |
2639 fp->fd_flags = topflags; | |
2640 if (topflags != FD_LEVEL) | |
2641 flp->wp->w_fold_manual = TRUE; | |
2642 } | |
2643 else | |
2644 fp->fd_flags = (fp - 1)->fd_flags; | |
2645 fp->fd_small = MAYBE; | |
2646 /* If using the "marker", "expr" or "syntax" method, we | |
2647 * need to continue until the end of the fold is found. */ | |
2648 if (getlevel == foldlevelMarker | |
2649 || getlevel == foldlevelExpr | |
2650 || getlevel == foldlevelSyntax) | |
2651 finish = TRUE; | |
2652 fold_changed = TRUE; | |
2653 break; | |
2654 } | |
2655 } | |
2656 } | |
2657 | |
2658 if (lvl < level || flp->lnum > linecount) | |
2659 { | |
2660 /* | |
2661 * Found a line with a lower foldlevel, this fold ends just above | |
2662 * "flp->lnum". | |
2663 */ | |
2664 break; | |
2665 } | |
2666 | |
2667 /* | |
2668 * The fold includes the line "flp->lnum" and "flp->lnum_save". | |
840 | 2669 * Check "fp" for safety. |
7 | 2670 */ |
840 | 2671 if (lvl > level && fp != NULL) |
7 | 2672 { |
2673 /* | |
2674 * There is a nested fold, handle it recursively. | |
2675 */ | |
2676 /* At least do one line (can happen when finish is TRUE). */ | |
2677 if (bot < flp->lnum) | |
2678 bot = flp->lnum; | |
2679 | |
2680 /* Line numbers in the nested fold are relative to the start of | |
2681 * this fold. */ | |
2682 flp->lnum = flp->lnum_save - fp->fd_top; | |
2683 flp->off += fp->fd_top; | |
2684 i = (int)(fp - (fold_T *)gap->ga_data); | |
2685 bot = foldUpdateIEMSRecurse(&fp->fd_nested, level + 1, | |
2686 startlnum2 - fp->fd_top, flp, getlevel, | |
2687 bot - fp->fd_top, fp->fd_flags); | |
2688 fp = (fold_T *)gap->ga_data + i; | |
2689 flp->lnum += fp->fd_top; | |
2690 flp->lnum_save += fp->fd_top; | |
2691 flp->off -= fp->fd_top; | |
2692 bot += fp->fd_top; | |
2693 startlnum2 = flp->lnum; | |
2694 | |
2695 /* This fold may end at the same line, don't incr. flp->lnum. */ | |
2696 } | |
2697 else | |
2698 { | |
2699 /* | |
2700 * Get the level of the next line, then continue the loop to check | |
2701 * if it ends there. | |
2702 * Skip over undefined lines, to find the foldlevel after it. | |
2703 * For the last line in the file the foldlevel is always valid. | |
2704 */ | |
2705 flp->lnum = flp->lnum_save; | |
2706 ll = flp->lnum + 1; | |
2707 while (!got_int) | |
2708 { | |
2709 /* Make the previous level available to foldlevel(). */ | |
2710 prev_lnum = flp->lnum; | |
2711 prev_lnum_lvl = flp->lvl; | |
2712 | |
2713 if (++flp->lnum > linecount) | |
2714 break; | |
2715 flp->lvl = flp->lvl_next; | |
2716 getlevel(flp); | |
2717 if (flp->lvl >= 0 || flp->had_end <= MAX_LEVEL) | |
2718 break; | |
2719 } | |
2720 prev_lnum = 0; | |
2721 if (flp->lnum > linecount) | |
2722 break; | |
2723 | |
2724 /* leave flp->lnum_save to lnum of the line that was used to get | |
2725 * the level, flp->lnum to the lnum of the next line. */ | |
2726 flp->lnum_save = flp->lnum; | |
2727 flp->lnum = ll; | |
2728 } | |
2729 } | |
2730 | |
2731 if (fp == NULL) /* only happens when got_int is set */ | |
2732 return bot; | |
2733 | |
2734 /* | |
2735 * Get here when: | |
2736 * lvl < level: the folds ends just above "flp->lnum" | |
2737 * lvl >= level: fold continues below "bot" | |
2738 */ | |
2739 | |
2740 /* Current fold at least extends until lnum. */ | |
2741 if (fp->fd_len < flp->lnum - fp->fd_top) | |
2742 { | |
2743 fp->fd_len = flp->lnum - fp->fd_top; | |
1513 | 2744 fp->fd_small = MAYBE; |
7 | 2745 fold_changed = TRUE; |
2746 } | |
2747 | |
2748 /* Delete contained folds from the end of the last one found until where | |
2749 * we stopped looking. */ | |
2750 foldRemove(&fp->fd_nested, startlnum2 - fp->fd_top, | |
2751 flp->lnum - 1 - fp->fd_top); | |
2752 | |
2753 if (lvl < level) | |
2754 { | |
2755 /* End of fold found, update the length when it got shorter. */ | |
2756 if (fp->fd_len != flp->lnum - fp->fd_top) | |
2757 { | |
11234
8c153d400bf4
patch 8.0.0503: endless loop in updating folds with 32 bit ints
Christian Brabandt <cb@256bit.org>
parents:
11165
diff
changeset
|
2758 if (fp->fd_top + fp->fd_len - 1 > bot) |
7 | 2759 { |
1224 | 2760 /* fold continued below bot */ |
7 | 2761 if (getlevel == foldlevelMarker |
2762 || getlevel == foldlevelExpr | |
2763 || getlevel == foldlevelSyntax) | |
2764 { | |
2765 /* marker method: truncate the fold and make sure the | |
2766 * previously included lines are processed again */ | |
2767 bot = fp->fd_top + fp->fd_len - 1; | |
2768 fp->fd_len = flp->lnum - fp->fd_top; | |
2769 } | |
2770 else | |
2771 { | |
2772 /* indent or expr method: split fold to create a new one | |
2773 * below bot */ | |
2774 i = (int)(fp - (fold_T *)gap->ga_data); | |
2775 foldSplit(gap, i, flp->lnum, bot); | |
2776 fp = (fold_T *)gap->ga_data + i; | |
2777 } | |
2778 } | |
2779 else | |
2780 fp->fd_len = flp->lnum - fp->fd_top; | |
2781 fold_changed = TRUE; | |
2782 } | |
2783 } | |
2784 | |
2785 /* delete following folds that end before the current line */ | |
2786 for (;;) | |
2787 { | |
2788 fp2 = fp + 1; | |
2789 if (fp2 >= (fold_T *)gap->ga_data + gap->ga_len | |
2790 || fp2->fd_top > flp->lnum) | |
2791 break; | |
2792 if (fp2->fd_top + fp2->fd_len > flp->lnum) | |
2793 { | |
2794 if (fp2->fd_top < flp->lnum) | |
2795 { | |
2796 /* Make fold that includes lnum start at lnum. */ | |
2797 foldMarkAdjustRecurse(&fp2->fd_nested, | |
2798 (linenr_T)0, (long)(flp->lnum - fp2->fd_top - 1), | |
2799 (linenr_T)MAXLNUM, (long)(fp2->fd_top - flp->lnum)); | |
2800 fp2->fd_len -= flp->lnum - fp2->fd_top; | |
2801 fp2->fd_top = flp->lnum; | |
2802 fold_changed = TRUE; | |
2803 } | |
2804 | |
2805 if (lvl >= level) | |
2806 { | |
2807 /* merge new fold with existing fold that follows */ | |
2808 foldMerge(fp, gap, fp2); | |
2809 } | |
2810 break; | |
2811 } | |
2812 fold_changed = TRUE; | |
2813 deleteFoldEntry(gap, (int)(fp2 - (fold_T *)gap->ga_data), TRUE); | |
2814 } | |
2815 | |
2816 /* Need to redraw the lines we inspected, which might be further down than | |
2817 * was asked for. */ | |
2818 if (bot < flp->lnum - 1) | |
2819 bot = flp->lnum - 1; | |
2820 | |
2821 return bot; | |
2822 } | |
2823 | |
2824 /* foldInsert() {{{2 */ | |
2825 /* | |
2826 * Insert a new fold in "gap" at position "i". | |
2827 * Returns OK for success, FAIL for failure. | |
2828 */ | |
2829 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2830 foldInsert(garray_T *gap, int i) |
7 | 2831 { |
2832 fold_T *fp; | |
2833 | |
2834 if (ga_grow(gap, 1) != OK) | |
2835 return FAIL; | |
2836 fp = (fold_T *)gap->ga_data + i; | |
2837 if (i < gap->ga_len) | |
2838 mch_memmove(fp + 1, fp, sizeof(fold_T) * (gap->ga_len - i)); | |
2839 ++gap->ga_len; | |
2840 ga_init2(&fp->fd_nested, (int)sizeof(fold_T), 10); | |
2841 return OK; | |
2842 } | |
2843 | |
2844 /* foldSplit() {{{2 */ | |
2845 /* | |
2846 * Split the "i"th fold in "gap", which starts before "top" and ends below | |
2847 * "bot" in two pieces, one ending above "top" and the other starting below | |
2848 * "bot". | |
2849 * The caller must first have taken care of any nested folds from "top" to | |
2850 * "bot"! | |
2851 */ | |
2852 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2853 foldSplit( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2854 garray_T *gap, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2855 int i, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2856 linenr_T top, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2857 linenr_T bot) |
7 | 2858 { |
2859 fold_T *fp; | |
2860 fold_T *fp2; | |
2861 garray_T *gap1; | |
2862 garray_T *gap2; | |
2863 int idx; | |
2864 int len; | |
2865 | |
2866 /* The fold continues below bot, need to split it. */ | |
2867 if (foldInsert(gap, i + 1) == FAIL) | |
2868 return; | |
2869 fp = (fold_T *)gap->ga_data + i; | |
2870 fp[1].fd_top = bot + 1; | |
2871 fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top); | |
2872 fp[1].fd_flags = fp->fd_flags; | |
1985 | 2873 fp[1].fd_small = MAYBE; |
2874 fp->fd_small = MAYBE; | |
7 | 2875 |
2876 /* Move nested folds below bot to new fold. There can't be | |
2877 * any between top and bot, they have been removed by the caller. */ | |
2878 gap1 = &fp->fd_nested; | |
2879 gap2 = &fp[1].fd_nested; | |
2880 (void)(foldFind(gap1, bot + 1 - fp->fd_top, &fp2)); | |
2881 len = (int)((fold_T *)gap1->ga_data + gap1->ga_len - fp2); | |
2882 if (len > 0 && ga_grow(gap2, len) == OK) | |
2883 { | |
2884 for (idx = 0; idx < len; ++idx) | |
2885 { | |
2886 ((fold_T *)gap2->ga_data)[idx] = fp2[idx]; | |
2887 ((fold_T *)gap2->ga_data)[idx].fd_top | |
2888 -= fp[1].fd_top - fp->fd_top; | |
2889 } | |
2890 gap2->ga_len = len; | |
2891 gap1->ga_len -= len; | |
2892 } | |
2893 fp->fd_len = top - fp->fd_top; | |
2894 fold_changed = TRUE; | |
2895 } | |
2896 | |
2897 /* foldRemove() {{{2 */ | |
2898 /* | |
2899 * Remove folds within the range "top" to and including "bot". | |
2900 * Check for these situations: | |
2901 * 1 2 3 | |
2902 * 1 2 3 | |
2903 * top 2 3 4 5 | |
2904 * 2 3 4 5 | |
2905 * bot 2 3 4 5 | |
2906 * 3 5 6 | |
2907 * 3 5 6 | |
2908 * | |
2909 * 1: not changed | |
1224 | 2910 * 2: truncate to stop above "top" |
7 | 2911 * 3: split in two parts, one stops above "top", other starts below "bot". |
2912 * 4: deleted | |
2913 * 5: made to start below "bot". | |
2914 * 6: not changed | |
2915 */ | |
2916 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
2917 foldRemove(garray_T *gap, linenr_T top, linenr_T bot) |
7 | 2918 { |
2919 fold_T *fp = NULL; | |
2920 | |
2921 if (bot < top) | |
2922 return; /* nothing to do */ | |
2923 | |
2924 for (;;) | |
2925 { | |
2926 /* Find fold that includes top or a following one. */ | |
2927 if (foldFind(gap, top, &fp) && fp->fd_top < top) | |
2928 { | |
2929 /* 2: or 3: need to delete nested folds */ | |
2930 foldRemove(&fp->fd_nested, top - fp->fd_top, bot - fp->fd_top); | |
11396
e9924d19ee37
patch 8.0.0583: fold test hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11392
diff
changeset
|
2931 if (fp->fd_top + fp->fd_len - 1 > bot) |
7 | 2932 { |
2933 /* 3: need to split it. */ | |
2934 foldSplit(gap, (int)(fp - (fold_T *)gap->ga_data), top, bot); | |
2935 } | |
2936 else | |
2937 { | |
2938 /* 2: truncate fold at "top". */ | |
2939 fp->fd_len = top - fp->fd_top; | |
2940 } | |
2941 fold_changed = TRUE; | |
2942 continue; | |
2943 } | |
2944 if (fp >= (fold_T *)(gap->ga_data) + gap->ga_len | |
2945 || fp->fd_top > bot) | |
2946 { | |
2947 /* 6: Found a fold below bot, can stop looking. */ | |
2948 break; | |
2949 } | |
2950 if (fp->fd_top >= top) | |
2951 { | |
2952 /* Found an entry below top. */ | |
2953 fold_changed = TRUE; | |
36 | 2954 if (fp->fd_top + fp->fd_len - 1 > bot) |
7 | 2955 { |
2956 /* 5: Make fold that includes bot start below bot. */ | |
2957 foldMarkAdjustRecurse(&fp->fd_nested, | |
2958 (linenr_T)0, (long)(bot - fp->fd_top), | |
2959 (linenr_T)MAXLNUM, (long)(fp->fd_top - bot - 1)); | |
2960 fp->fd_len -= bot - fp->fd_top + 1; | |
2961 fp->fd_top = bot + 1; | |
2962 break; | |
2963 } | |
2964 | |
2965 /* 4: Delete completely contained fold. */ | |
2966 deleteFoldEntry(gap, (int)(fp - (fold_T *)gap->ga_data), TRUE); | |
2967 } | |
2968 } | |
2969 } | |
2970 | |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2971 /* foldReverseOrder() {{{2 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2972 static void |
11396
e9924d19ee37
patch 8.0.0583: fold test hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11392
diff
changeset
|
2973 foldReverseOrder(garray_T *gap, linenr_T start_arg, linenr_T end_arg) |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2974 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2975 fold_T *left, *right; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2976 fold_T tmp; |
11396
e9924d19ee37
patch 8.0.0583: fold test hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11392
diff
changeset
|
2977 linenr_T start = start_arg; |
e9924d19ee37
patch 8.0.0583: fold test hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11392
diff
changeset
|
2978 linenr_T end = end_arg; |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2979 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2980 for (; start < end; start++, end--) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2981 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2982 left = (fold_T *)gap->ga_data + start; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2983 right = (fold_T *)gap->ga_data + end; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2984 tmp = *left; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2985 *left = *right; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2986 *right = tmp; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2987 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2988 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2989 |
11148
87779062d706
patch 8.0.0461: test 45 hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
2990 /* foldMoveRange() {{{2 */ |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2991 /* |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2992 * Move folds within the inclusive range "line1" to "line2" to after "dest" |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2993 * requires "line1" <= "line2" <= "dest" |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2994 * |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2995 * There are the following situations for the first fold at or below line1 - 1. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2996 * 1 2 3 4 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2997 * 1 2 3 4 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2998 * line1 2 3 4 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
2999 * 2 3 4 5 6 7 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3000 * line2 3 4 5 6 7 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3001 * 3 4 6 7 8 9 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3002 * dest 4 7 8 9 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3003 * 4 7 8 10 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3004 * 4 7 8 10 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3005 * |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3006 * In the following descriptions, "moved" means moving in the buffer, *and* in |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3007 * the fold array. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3008 * Meanwhile, "shifted" just means moving in the buffer. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3009 * 1. not changed |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3010 * 2. truncated above line1 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3011 * 3. length reduced by line2 - line1, folds starting between the end of 3 and |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3012 * dest are truncated and shifted up |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3013 * 4. internal folds moved (from [line1, line2] to dest) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3014 * 5. moved to dest. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3015 * 6. truncated below line2 and moved. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3016 * 7. length reduced by line2 - dest, folds starting between line2 and dest are |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3017 * removed, top is moved down by move_len. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3018 * 8. truncated below dest and shifted up. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3019 * 9. shifted up |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3020 * 10. not changed |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3021 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3022 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3023 static void |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3024 truncate_fold(fold_T *fp, linenr_T end) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3025 { |
11156
80241603dd50
patch 8.0.0465: off-by-one error in using :move with folding
Christian Brabandt <cb@256bit.org>
parents:
11148
diff
changeset
|
3026 end += 1; |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3027 foldRemove(&fp->fd_nested, end - fp->fd_top, MAXLNUM); |
11156
80241603dd50
patch 8.0.0465: off-by-one error in using :move with folding
Christian Brabandt <cb@256bit.org>
parents:
11148
diff
changeset
|
3028 fp->fd_len = end - fp->fd_top; |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3029 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3030 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3031 #define fold_end(fp) ((fp)->fd_top + (fp)->fd_len - 1) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3032 #define valid_fold(fp, gap) ((fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len)) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3033 #define fold_index(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data))) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3034 |
11148
87779062d706
patch 8.0.0461: test 45 hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
3035 void |
87779062d706
patch 8.0.0461: test 45 hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
3036 foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest) |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3037 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3038 fold_T *fp; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3039 linenr_T range_len = line2 - line1 + 1; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3040 linenr_T move_len = dest - line2; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3041 int at_start = foldFind(gap, line1 - 1, &fp); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3042 size_t move_start = 0, move_end = 0, dest_index = 0; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3043 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3044 if (at_start) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3045 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3046 if (fold_end(fp) > dest) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3047 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3048 /* Case 4 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3049 * don't have to change this fold, but have to move nested folds. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3050 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3051 foldMoveRange(&fp->fd_nested, line1 - fp->fd_top, line2 - |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3052 fp->fd_top, dest - fp->fd_top); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3053 return; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3054 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3055 else if (fold_end(fp) > line2) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3056 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3057 /* Case 3 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3058 * Remove nested folds between line1 and line2 & reduce the |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3059 * length of fold by "range_len". |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3060 * Folds after this one must be dealt with. |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3061 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3062 foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, line2 - |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3063 fp->fd_top, MAXLNUM, -range_len); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3064 fp->fd_len -= range_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3065 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3066 else |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3067 /* Case 2 truncate fold, folds after this one must be dealt with. */ |
11156
80241603dd50
patch 8.0.0465: off-by-one error in using :move with folding
Christian Brabandt <cb@256bit.org>
parents:
11148
diff
changeset
|
3068 truncate_fold(fp, line1 - 1); |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3069 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3070 /* Look at the next fold, and treat that one as if it were the first |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3071 * after "line1" (because now it is). */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3072 fp = fp + 1; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3073 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3074 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3075 if (!valid_fold(fp, gap) || fp->fd_top > dest) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3076 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3077 /* Case 10 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3078 * No folds after "line1" and before "dest" |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3079 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3080 return; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3081 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3082 else if (fp->fd_top > line2) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3083 { |
11156
80241603dd50
patch 8.0.0465: off-by-one error in using :move with folding
Christian Brabandt <cb@256bit.org>
parents:
11148
diff
changeset
|
3084 for (; valid_fold(fp, gap) && fold_end(fp) <= dest; fp++) |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3085 /* Case 9. (for all case 9's) -- shift up. */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3086 fp->fd_top -= range_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3087 |
11156
80241603dd50
patch 8.0.0465: off-by-one error in using :move with folding
Christian Brabandt <cb@256bit.org>
parents:
11148
diff
changeset
|
3088 if (valid_fold(fp, gap) && fp->fd_top <= dest) |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3089 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3090 /* Case 8. -- ensure truncated at dest, shift up */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3091 truncate_fold(fp, dest); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3092 fp->fd_top -= range_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3093 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3094 return; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3095 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3096 else if (fold_end(fp) > dest) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3097 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3098 /* Case 7 -- remove nested folds and shrink */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3099 foldMarkAdjustRecurse(&fp->fd_nested, line2 + 1 - fp->fd_top, dest - |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3100 fp->fd_top, MAXLNUM, -move_len); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3101 fp->fd_len -= move_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3102 fp->fd_top += move_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3103 return; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3104 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3105 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3106 /* Case 5 or 6 |
11148
87779062d706
patch 8.0.0461: test 45 hangs on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11140
diff
changeset
|
3107 * changes rely on whether there are folds between the end of |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3108 * this fold and "dest". |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3109 */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3110 move_start = fold_index(fp, gap); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3111 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3112 for (; valid_fold(fp, gap) && fp->fd_top <= dest; fp++) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3113 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3114 if (fp->fd_top <= line2) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3115 { |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3116 /* 1. 2. or 3. */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3117 if (fold_end(fp) > line2) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3118 /* 2. or 3., truncate before moving */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3119 truncate_fold(fp, line2); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3120 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3121 fp->fd_top += move_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3122 continue; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3123 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3124 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3125 /* Record index of the first fold after the moved range. */ |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3126 if (move_end == 0) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3127 move_end = fold_index(fp, gap); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3128 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3129 if (fold_end(fp) > dest) |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3130 truncate_fold(fp, dest); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3131 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3132 fp->fd_top -= range_len; |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3133 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3134 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3135 dest_index = fold_index(fp, gap); |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3136 |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3137 /* |
11392
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3138 * All folds are now correct, but not necessarily in the correct order. We |
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3139 * must swap folds in the range [move_end, dest_index) with those in the |
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3140 * range [move_start, move_end). |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3141 */ |
11392
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3142 if (move_end == 0) |
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3143 /* There are no folds after those moved, hence no folds have been moved |
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3144 * out of order. */ |
dc2800c3572b
patch 8.0.0581: moving folded text is sometimes not correct
Christian Brabandt <cb@256bit.org>
parents:
11234
diff
changeset
|
3145 return; |
11165
f0602688b8ef
patch 8.0.0469: compiler warnings on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11156
diff
changeset
|
3146 foldReverseOrder(gap, (linenr_T)move_start, (linenr_T)dest_index - 1); |
f0602688b8ef
patch 8.0.0469: compiler warnings on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11156
diff
changeset
|
3147 foldReverseOrder(gap, (linenr_T)move_start, |
f0602688b8ef
patch 8.0.0469: compiler warnings on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11156
diff
changeset
|
3148 (linenr_T)(move_start + dest_index - move_end - 1)); |
f0602688b8ef
patch 8.0.0469: compiler warnings on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11156
diff
changeset
|
3149 foldReverseOrder(gap, (linenr_T)(move_start + dest_index - move_end), |
f0602688b8ef
patch 8.0.0469: compiler warnings on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
11156
diff
changeset
|
3150 (linenr_T)(dest_index - 1)); |
11140
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3151 } |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3152 #undef fold_end |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3153 #undef valid_fold |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3154 #undef fold_index |
6b26e044b6f5
patch 8.0.0457: using :move messes up manual folds
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
3155 |
7 | 3156 /* foldMerge() {{{2 */ |
3157 /* | |
1224 | 3158 * Merge two adjacent folds (and the nested ones in them). |
3159 * This only works correctly when the folds are really adjacent! Thus "fp1" | |
7 | 3160 * must end just above "fp2". |
3161 * The resulting fold is "fp1", nested folds are moved from "fp2" to "fp1". | |
3162 * Fold entry "fp2" in "gap" is deleted. | |
3163 */ | |
3164 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3165 foldMerge(fold_T *fp1, garray_T *gap, fold_T *fp2) |
7 | 3166 { |
3167 fold_T *fp3; | |
3168 fold_T *fp4; | |
3169 int idx; | |
3170 garray_T *gap1 = &fp1->fd_nested; | |
3171 garray_T *gap2 = &fp2->fd_nested; | |
3172 | |
3173 /* If the last nested fold in fp1 touches the first nested fold in fp2, | |
3174 * merge them recursively. */ | |
3175 if (foldFind(gap1, fp1->fd_len - 1L, &fp3) && foldFind(gap2, 0L, &fp4)) | |
3176 foldMerge(fp3, gap2, fp4); | |
3177 | |
3178 /* Move nested folds in fp2 to the end of fp1. */ | |
3179 if (gap2->ga_len > 0 && ga_grow(gap1, gap2->ga_len) == OK) | |
3180 { | |
3181 for (idx = 0; idx < gap2->ga_len; ++idx) | |
3182 { | |
3183 ((fold_T *)gap1->ga_data)[gap1->ga_len] | |
3184 = ((fold_T *)gap2->ga_data)[idx]; | |
3185 ((fold_T *)gap1->ga_data)[gap1->ga_len].fd_top += fp1->fd_len; | |
3186 ++gap1->ga_len; | |
3187 } | |
3188 gap2->ga_len = 0; | |
3189 } | |
3190 | |
3191 fp1->fd_len += fp2->fd_len; | |
3192 deleteFoldEntry(gap, (int)(fp2 - (fold_T *)gap->ga_data), TRUE); | |
3193 fold_changed = TRUE; | |
3194 } | |
3195 | |
3196 /* foldlevelIndent() {{{2 */ | |
3197 /* | |
3198 * Low level function to get the foldlevel for the "indent" method. | |
3199 * Doesn't use any caching. | |
3200 * Returns a level of -1 if the foldlevel depends on surrounding lines. | |
3201 */ | |
3202 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3203 foldlevelIndent(fline_T *flp) |
7 | 3204 { |
3205 char_u *s; | |
3206 buf_T *buf; | |
3207 linenr_T lnum = flp->lnum + flp->off; | |
3208 | |
3209 buf = flp->wp->w_buffer; | |
3210 s = skipwhite(ml_get_buf(buf, lnum, FALSE)); | |
3211 | |
3212 /* empty line or lines starting with a character in 'foldignore': level | |
3213 * depends on surrounding lines */ | |
3214 if (*s == NUL || vim_strchr(flp->wp->w_p_fdi, *s) != NULL) | |
3215 { | |
3216 /* first and last line can't be undefined, use level 0 */ | |
3217 if (lnum == 1 || lnum == buf->b_ml.ml_line_count) | |
3218 flp->lvl = 0; | |
3219 else | |
3220 flp->lvl = -1; | |
3221 } | |
3222 else | |
5438 | 3223 flp->lvl = get_indent_buf(buf, lnum) / get_sw_value(curbuf); |
7 | 3224 if (flp->lvl > flp->wp->w_p_fdn) |
1028 | 3225 { |
7 | 3226 flp->lvl = flp->wp->w_p_fdn; |
1028 | 3227 if (flp->lvl < 0) |
3228 flp->lvl = 0; | |
3229 } | |
7 | 3230 } |
3231 | |
3232 /* foldlevelDiff() {{{2 */ | |
3233 #ifdef FEAT_DIFF | |
3234 /* | |
3235 * Low level function to get the foldlevel for the "diff" method. | |
3236 * Doesn't use any caching. | |
3237 */ | |
3238 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3239 foldlevelDiff(fline_T *flp) |
7 | 3240 { |
3241 if (diff_infold(flp->wp, flp->lnum + flp->off)) | |
3242 flp->lvl = 1; | |
3243 else | |
3244 flp->lvl = 0; | |
3245 } | |
3246 #endif | |
3247 | |
3248 /* foldlevelExpr() {{{2 */ | |
3249 /* | |
3250 * Low level function to get the foldlevel for the "expr" method. | |
3251 * Doesn't use any caching. | |
3252 * Returns a level of -1 if the foldlevel depends on surrounding lines. | |
3253 */ | |
3254 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3255 foldlevelExpr(fline_T *flp) |
7 | 3256 { |
3257 #ifndef FEAT_EVAL | |
3258 flp->start = FALSE; | |
3259 flp->lvl = 0; | |
3260 #else | |
3261 win_T *win; | |
3262 int n; | |
3263 int c; | |
3264 linenr_T lnum = flp->lnum + flp->off; | |
3265 int save_keytyped; | |
3266 | |
3267 win = curwin; | |
3268 curwin = flp->wp; | |
3269 curbuf = flp->wp->w_buffer; | |
3270 set_vim_var_nr(VV_LNUM, lnum); | |
3271 | |
3272 flp->start = 0; | |
3273 flp->had_end = flp->end; | |
3274 flp->end = MAX_LEVEL + 1; | |
3275 if (lnum <= 1) | |
3276 flp->lvl = 0; | |
3277 | |
3278 /* KeyTyped may be reset to 0 when calling a function which invokes | |
3279 * do_cmdline(). To make 'foldopen' work correctly restore KeyTyped. */ | |
3280 save_keytyped = KeyTyped; | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9252
diff
changeset
|
3281 n = (int)eval_foldexpr(flp->wp->w_p_fde, &c); |
7 | 3282 KeyTyped = save_keytyped; |
3283 | |
3284 switch (c) | |
3285 { | |
3286 /* "a1", "a2", .. : add to the fold level */ | |
3287 case 'a': if (flp->lvl >= 0) | |
3288 { | |
3289 flp->lvl += n; | |
3290 flp->lvl_next = flp->lvl; | |
3291 } | |
3292 flp->start = n; | |
3293 break; | |
3294 | |
3295 /* "s1", "s2", .. : subtract from the fold level */ | |
3296 case 's': if (flp->lvl >= 0) | |
3297 { | |
3298 if (n > flp->lvl) | |
3299 flp->lvl_next = 0; | |
3300 else | |
3301 flp->lvl_next = flp->lvl - n; | |
3302 flp->end = flp->lvl_next + 1; | |
3303 } | |
3304 break; | |
3305 | |
3306 /* ">1", ">2", .. : start a fold with a certain level */ | |
3307 case '>': flp->lvl = n; | |
3308 flp->lvl_next = n; | |
3309 flp->start = 1; | |
3310 break; | |
3311 | |
3312 /* "<1", "<2", .. : end a fold with a certain level */ | |
3313 case '<': flp->lvl_next = n - 1; | |
3314 flp->end = n; | |
3315 break; | |
3316 | |
3317 /* "=": No change in level */ | |
3318 case '=': flp->lvl_next = flp->lvl; | |
3319 break; | |
3320 | |
3321 /* "-1", "0", "1", ..: set fold level */ | |
3322 default: if (n < 0) | |
3323 /* Use the current level for the next line, so that "a1" | |
3324 * will work there. */ | |
3325 flp->lvl_next = flp->lvl; | |
3326 else | |
3327 flp->lvl_next = n; | |
3328 flp->lvl = n; | |
3329 break; | |
3330 } | |
3331 | |
3332 /* If the level is unknown for the first or the last line in the file, use | |
3333 * level 0. */ | |
3334 if (flp->lvl < 0) | |
3335 { | |
3336 if (lnum <= 1) | |
3337 { | |
3338 flp->lvl = 0; | |
3339 flp->lvl_next = 0; | |
3340 } | |
3341 if (lnum == curbuf->b_ml.ml_line_count) | |
3342 flp->lvl_next = 0; | |
3343 } | |
3344 | |
3345 curwin = win; | |
3346 curbuf = curwin->w_buffer; | |
3347 #endif | |
3348 } | |
3349 | |
3350 /* parseMarker() {{{2 */ | |
3351 /* | |
3352 * Parse 'foldmarker' and set "foldendmarker", "foldstartmarkerlen" and | |
3353 * "foldendmarkerlen". | |
3354 * Relies on the option value to have been checked for correctness already. | |
3355 */ | |
3356 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3357 parseMarker(win_T *wp) |
7 | 3358 { |
3359 foldendmarker = vim_strchr(wp->w_p_fmr, ','); | |
3360 foldstartmarkerlen = (int)(foldendmarker++ - wp->w_p_fmr); | |
3361 foldendmarkerlen = (int)STRLEN(foldendmarker); | |
3362 } | |
3363 | |
3364 /* foldlevelMarker() {{{2 */ | |
3365 /* | |
3366 * Low level function to get the foldlevel for the "marker" method. | |
3367 * "foldendmarker", "foldstartmarkerlen" and "foldendmarkerlen" must have been | |
3368 * set before calling this. | |
3369 * Requires that flp->lvl is set to the fold level of the previous line! | |
3370 * Careful: This means you can't call this function twice on the same line. | |
3371 * Doesn't use any caching. | |
3372 * Sets flp->start when a start marker was found. | |
3373 */ | |
3374 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3375 foldlevelMarker(fline_T *flp) |
7 | 3376 { |
3377 char_u *startmarker; | |
3378 int cstart; | |
3379 int cend; | |
3380 int start_lvl = flp->lvl; | |
3381 char_u *s; | |
3382 int n; | |
3383 | |
3384 /* cache a few values for speed */ | |
3385 startmarker = flp->wp->w_p_fmr; | |
3386 cstart = *startmarker; | |
3387 ++startmarker; | |
3388 cend = *foldendmarker; | |
3389 | |
3390 /* Default: no start found, next level is same as current level */ | |
3391 flp->start = 0; | |
3392 flp->lvl_next = flp->lvl; | |
3393 | |
3394 s = ml_get_buf(flp->wp->w_buffer, flp->lnum + flp->off, FALSE); | |
3395 while (*s) | |
3396 { | |
3397 if (*s == cstart | |
3398 && STRNCMP(s + 1, startmarker, foldstartmarkerlen - 1) == 0) | |
3399 { | |
3400 /* found startmarker: set flp->lvl */ | |
3401 s += foldstartmarkerlen; | |
3402 if (VIM_ISDIGIT(*s)) | |
3403 { | |
3404 n = atoi((char *)s); | |
3405 if (n > 0) | |
3406 { | |
3407 flp->lvl = n; | |
3408 flp->lvl_next = n; | |
3409 if (n <= start_lvl) | |
3410 flp->start = 1; | |
3411 else | |
3412 flp->start = n - start_lvl; | |
3413 } | |
3414 } | |
3415 else | |
3416 { | |
3417 ++flp->lvl; | |
3418 ++flp->lvl_next; | |
3419 ++flp->start; | |
3420 } | |
3421 } | |
3422 else if (*s == cend | |
3423 && STRNCMP(s + 1, foldendmarker + 1, foldendmarkerlen - 1) == 0) | |
3424 { | |
3425 /* found endmarker: set flp->lvl_next */ | |
3426 s += foldendmarkerlen; | |
3427 if (VIM_ISDIGIT(*s)) | |
3428 { | |
3429 n = atoi((char *)s); | |
3430 if (n > 0) | |
3431 { | |
3432 flp->lvl = n; | |
3433 flp->lvl_next = n - 1; | |
3434 /* never start a fold with an end marker */ | |
2054
79b8d69a4588
updated for version 7.2.340
Bram Moolenaar <bram@zimbu.org>
parents:
1985
diff
changeset
|
3435 if (flp->lvl_next > start_lvl) |
79b8d69a4588
updated for version 7.2.340
Bram Moolenaar <bram@zimbu.org>
parents:
1985
diff
changeset
|
3436 flp->lvl_next = start_lvl; |
7 | 3437 } |
3438 } | |
3439 else | |
3440 --flp->lvl_next; | |
3441 } | |
3442 else | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3443 MB_PTR_ADV(s); |
7 | 3444 } |
3445 | |
3446 /* The level can't go negative, must be missing a start marker. */ | |
3447 if (flp->lvl_next < 0) | |
3448 flp->lvl_next = 0; | |
3449 } | |
3450 | |
3451 /* foldlevelSyntax() {{{2 */ | |
3452 /* | |
3453 * Low level function to get the foldlevel for the "syntax" method. | |
3454 * Doesn't use any caching. | |
3455 */ | |
3456 static void | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3457 foldlevelSyntax(fline_T *flp) |
7 | 3458 { |
3459 #ifndef FEAT_SYN_HL | |
3460 flp->start = 0; | |
3461 flp->lvl = 0; | |
3462 #else | |
3463 linenr_T lnum = flp->lnum + flp->off; | |
3464 int n; | |
3465 | |
3466 /* Use the maximum fold level at the start of this line and the next. */ | |
3467 flp->lvl = syn_get_foldlevel(flp->wp, lnum); | |
3468 flp->start = 0; | |
3469 if (lnum < flp->wp->w_buffer->b_ml.ml_line_count) | |
3470 { | |
3471 n = syn_get_foldlevel(flp->wp, lnum + 1); | |
3472 if (n > flp->lvl) | |
3473 { | |
3474 flp->start = n - flp->lvl; /* fold(s) start here */ | |
3475 flp->lvl = n; | |
3476 } | |
3477 } | |
3478 #endif | |
3479 } | |
3480 | |
3481 /* functions for storing the fold state in a View {{{1 */ | |
3482 /* put_folds() {{{2 */ | |
3483 #if defined(FEAT_SESSION) || defined(PROTO) | |
7801
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
3484 static int put_folds_recurse(FILE *fd, garray_T *gap, linenr_T off); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
3485 static int put_foldopen_recurse(FILE *fd, win_T *wp, garray_T *gap, linenr_T off); |
a1e71a01dbd6
commit https://github.com/vim/vim/commit/d25c16e2f2776d50245bf31d6e4d5364f12d188e
Christian Brabandt <cb@256bit.org>
parents:
7009
diff
changeset
|
3486 static int put_fold_open_close(FILE *fd, fold_T *fp, linenr_T off); |
7 | 3487 |
3488 /* | |
3489 * Write commands to "fd" to restore the manual folds in window "wp". | |
3490 * Return FAIL if writing fails. | |
3491 */ | |
3492 int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3493 put_folds(FILE *fd, win_T *wp) |
7 | 3494 { |
3495 if (foldmethodIsManual(wp)) | |
3496 { | |
3497 if (put_line(fd, "silent! normal! zE") == FAIL | |
3498 || put_folds_recurse(fd, &wp->w_folds, (linenr_T)0) == FAIL) | |
3499 return FAIL; | |
3500 } | |
3501 | |
3502 /* If some folds are manually opened/closed, need to restore that. */ | |
3503 if (wp->w_fold_manual) | |
3392 | 3504 return put_foldopen_recurse(fd, wp, &wp->w_folds, (linenr_T)0); |
7 | 3505 |
3506 return OK; | |
3507 } | |
3508 | |
3509 /* put_folds_recurse() {{{2 */ | |
3510 /* | |
3511 * Write commands to "fd" to recreate manually created folds. | |
3512 * Returns FAIL when writing failed. | |
3513 */ | |
3514 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3515 put_folds_recurse(FILE *fd, garray_T *gap, linenr_T off) |
7 | 3516 { |
3517 int i; | |
3518 fold_T *fp; | |
3519 | |
3520 fp = (fold_T *)gap->ga_data; | |
3521 for (i = 0; i < gap->ga_len; i++) | |
3522 { | |
3523 /* Do nested folds first, they will be created closed. */ | |
3524 if (put_folds_recurse(fd, &fp->fd_nested, off + fp->fd_top) == FAIL) | |
3525 return FAIL; | |
3526 if (fprintf(fd, "%ld,%ldfold", fp->fd_top + off, | |
3527 fp->fd_top + off + fp->fd_len - 1) < 0 | |
3528 || put_eol(fd) == FAIL) | |
3529 return FAIL; | |
3530 ++fp; | |
3531 } | |
3532 return OK; | |
3533 } | |
3534 | |
3535 /* put_foldopen_recurse() {{{2 */ | |
3536 /* | |
3537 * Write commands to "fd" to open and close manually opened/closed folds. | |
3538 * Returns FAIL when writing failed. | |
3539 */ | |
3540 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3541 put_foldopen_recurse( |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3542 FILE *fd, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3543 win_T *wp, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3544 garray_T *gap, |
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3545 linenr_T off) |
7 | 3546 { |
3547 int i; | |
3392 | 3548 int level; |
7 | 3549 fold_T *fp; |
3550 | |
3551 fp = (fold_T *)gap->ga_data; | |
3552 for (i = 0; i < gap->ga_len; i++) | |
3553 { | |
3554 if (fp->fd_flags != FD_LEVEL) | |
3555 { | |
3556 if (fp->fd_nested.ga_len > 0) | |
3557 { | |
3392 | 3558 /* open nested folds while this fold is open */ |
7 | 3559 if (fprintf(fd, "%ld", fp->fd_top + off) < 0 |
3560 || put_eol(fd) == FAIL | |
3766 | 3561 || put_line(fd, "normal! zo") == FAIL) |
7 | 3562 return FAIL; |
3392 | 3563 if (put_foldopen_recurse(fd, wp, &fp->fd_nested, |
3564 off + fp->fd_top) | |
7 | 3565 == FAIL) |
3566 return FAIL; | |
3392 | 3567 /* close the parent when needed */ |
3568 if (fp->fd_flags == FD_CLOSED) | |
3569 { | |
3570 if (put_fold_open_close(fd, fp, off) == FAIL) | |
3571 return FAIL; | |
3572 } | |
3573 } | |
3574 else | |
3575 { | |
3576 /* Open or close the leaf according to the window foldlevel. | |
3577 * Do not close a leaf that is already closed, as it will close | |
3578 * the parent. */ | |
3579 level = foldLevelWin(wp, off + fp->fd_top); | |
3580 if ((fp->fd_flags == FD_CLOSED && wp->w_p_fdl >= level) | |
3581 || (fp->fd_flags != FD_CLOSED && wp->w_p_fdl < level)) | |
3582 if (put_fold_open_close(fd, fp, off) == FAIL) | |
3583 return FAIL; | |
7 | 3584 } |
3585 } | |
3586 ++fp; | |
3587 } | |
3588 | |
3589 return OK; | |
3590 } | |
3392 | 3591 |
3592 /* put_fold_open_close() {{{2 */ | |
3593 /* | |
3594 * Write the open or close command to "fd". | |
3595 * Returns FAIL when writing failed. | |
3596 */ | |
3597 static int | |
7821
81794242a275
commit https://github.com/vim/vim/commit/66f948e928d5e0cd3123af902aa8ac1613534c94
Christian Brabandt <cb@256bit.org>
parents:
7807
diff
changeset
|
3598 put_fold_open_close(FILE *fd, fold_T *fp, linenr_T off) |
3392 | 3599 { |
3600 if (fprintf(fd, "%ld", fp->fd_top + off) < 0 | |
3601 || put_eol(fd) == FAIL | |
3766 | 3602 || fprintf(fd, "normal! z%c", |
3392 | 3603 fp->fd_flags == FD_CLOSED ? 'c' : 'o') < 0 |
3604 || put_eol(fd) == FAIL) | |
3605 return FAIL; | |
3606 | |
3607 return OK; | |
3608 } | |
7 | 3609 #endif /* FEAT_SESSION */ |
3610 | |
3611 /* }}}1 */ | |
3612 #endif /* defined(FEAT_FOLDING) || defined(PROTO) */ |