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