Mercurial > vim
annotate src/search.c @ 19977:545bdbc36f29 v8.2.0544
patch 8.2.0544: memory leak in search test
Commit: https://github.com/vim/vim/commit/880e4d9117ea990e66d867aefad0f73ba89bda82
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 11 21:31:28 2020 +0200
patch 8.2.0544: memory leak in search test
Problem: Memory leak in search test.
Solution: Free msgbuf. (Dominique Pelle, closes https://github.com/vim/vim/issues/5912)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Apr 2020 21:45:03 +0200 |
| parents | 5feb426d2ea1 |
| children | aadd1cae2ff5 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9913
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 /* | |
| 10 * search.c: code for normal mode searching commands | |
| 11 */ | |
| 12 | |
| 13 #include "vim.h" | |
| 14 | |
| 15 #ifdef FEAT_EVAL | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
16 static void set_vv_searchforward(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
17 static int first_submatch(regmmatch_T *rp); |
| 7 | 18 #endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
19 static int check_linecomment(char_u *line); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
20 static int cls(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
21 static int skip_chars(int, int); |
| 7 | 22 #ifdef FEAT_FIND_ID |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
23 static void show_pat_in_path(char_u *, int, |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
24 int, int, FILE *, linenr_T *, long); |
| 7 | 25 #endif |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
26 static void search_stat(int dirc, pos_T *pos, int show_top_bot_msg, char_u *msgbuf, int recompute); |
| 7 | 27 |
| 28 /* | |
| 29 * This file contains various searching-related routines. These fall into | |
| 30 * three groups: | |
| 31 * 1. string searches (for /, ?, n, and N) | |
| 32 * 2. character searches within a single line (for f, F, t, T, etc) | |
| 33 * 3. "other" kinds of searches like the '%' command, and 'word' searches. | |
| 34 */ | |
| 35 | |
| 36 /* | |
| 37 * String searches | |
| 38 * | |
| 39 * The string search functions are divided into two levels: | |
| 40 * lowest: searchit(); uses an pos_T for starting position and found match. | |
| 41 * Highest: do_search(); uses curwin->w_cursor; calls searchit(). | |
| 42 * | |
| 43 * The last search pattern is remembered for repeating the same search. | |
| 44 * This pattern is shared between the :g, :s, ? and / commands. | |
| 45 * This is in search_regcomp(). | |
| 46 * | |
| 47 * The actual string matching is done using a heavily modified version of | |
| 48 * Henry Spencer's regular expression library. See regexp.c. | |
| 49 */ | |
| 50 | |
| 51 /* | |
| 52 * Two search patterns are remembered: One for the :substitute command and | |
| 53 * one for other searches. last_idx points to the one that was used the last | |
| 54 * time. | |
| 55 */ | |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
56 static spat_T spats[2] = |
| 7 | 57 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
58 {NULL, TRUE, FALSE, {'/', 0, 0, 0L}}, // last used search pat |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
59 {NULL, TRUE, FALSE, {'/', 0, 0, 0L}} // last used substitute pat |
| 7 | 60 }; |
| 61 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
62 static int last_idx = 0; // index in spats[] for RE_LAST |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
63 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
64 static char_u lastc[2] = {NUL, NUL}; // last character searched for |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
65 static int lastcdir = FORWARD; // last direction of character search |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
66 static int last_t_cmd = TRUE; // last search t_cmd |
| 6991 | 67 static char_u lastc_bytes[MB_MAXBYTES + 1]; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
68 static int lastc_bytelen = 1; // >1 for multi-byte char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
69 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
70 // copy of spats[], for keeping the search patterns while executing autocmds |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
71 static spat_T saved_spats[2]; |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
72 # ifdef FEAT_SEARCH_EXTRA |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
73 static int saved_spats_last_idx = 0; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
74 static int saved_spats_no_hlsearch = 0; |
| 7 | 75 # endif |
| 76 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
77 static char_u *mr_pattern = NULL; // pattern used by search_regcomp() |
| 7 | 78 #ifdef FEAT_RIGHTLEFT |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
79 static int mr_pattern_alloced = FALSE; // mr_pattern was allocated |
| 7 | 80 #endif |
| 81 | |
| 82 #ifdef FEAT_FIND_ID | |
| 83 /* | |
| 84 * Type used by find_pattern_in_path() to remember which included files have | |
| 85 * been searched already. | |
| 86 */ | |
| 87 typedef struct SearchedFile | |
| 88 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
89 FILE *fp; // File pointer |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
90 char_u *name; // Full name of file |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
91 linenr_T lnum; // Line we were up to in file |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
92 int matched; // Found a match in this file |
| 7 | 93 } SearchedFile; |
| 94 #endif | |
| 95 | |
| 96 /* | |
| 97 * translate search pattern for vim_regcomp() | |
| 98 * | |
| 99 * pat_save == RE_SEARCH: save pat in spats[RE_SEARCH].pat (normal search cmd) | |
| 100 * pat_save == RE_SUBST: save pat in spats[RE_SUBST].pat (:substitute command) | |
| 101 * pat_save == RE_BOTH: save pat in both patterns (:global command) | |
| 102 * pat_use == RE_SEARCH: use previous search pattern if "pat" is NULL | |
| 1222 | 103 * pat_use == RE_SUBST: use previous substitute pattern if "pat" is NULL |
| 7 | 104 * pat_use == RE_LAST: use last used pattern if "pat" is NULL |
| 105 * options & SEARCH_HIS: put search string in history | |
| 106 * options & SEARCH_KEEP: keep previous search pattern | |
| 107 * | |
| 108 * returns FAIL if failed, OK otherwise. | |
| 109 */ | |
| 110 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
111 search_regcomp( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
112 char_u *pat, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
113 int pat_save, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
114 int pat_use, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
115 int options, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
116 regmmatch_T *regmatch) // return: pattern and ignore-case flag |
| 7 | 117 { |
| 118 int magic; | |
| 119 int i; | |
| 120 | |
| 121 rc_did_emsg = FALSE; | |
| 122 magic = p_magic; | |
| 123 | |
| 124 /* | |
| 125 * If no pattern given, use a previously defined pattern. | |
| 126 */ | |
| 127 if (pat == NULL || *pat == NUL) | |
| 128 { | |
| 129 if (pat_use == RE_LAST) | |
| 130 i = last_idx; | |
| 131 else | |
| 132 i = pat_use; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
133 if (spats[i].pat == NULL) // pattern was never defined |
| 7 | 134 { |
| 135 if (pat_use == RE_SUBST) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
136 emsg(_(e_nopresub)); |
| 7 | 137 else |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
138 emsg(_(e_noprevre)); |
| 7 | 139 rc_did_emsg = TRUE; |
| 140 return FAIL; | |
| 141 } | |
| 142 pat = spats[i].pat; | |
| 143 magic = spats[i].magic; | |
| 144 no_smartcase = spats[i].no_scs; | |
| 145 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
146 else if (options & SEARCH_HIS) // put new pattern in history |
| 7 | 147 add_to_history(HIST_SEARCH, pat, TRUE, NUL); |
| 148 | |
| 149 #ifdef FEAT_RIGHTLEFT | |
| 150 if (mr_pattern_alloced) | |
| 151 { | |
| 152 vim_free(mr_pattern); | |
| 153 mr_pattern_alloced = FALSE; | |
| 154 } | |
| 155 | |
| 156 if (curwin->w_p_rl && *curwin->w_p_rlc == 's') | |
| 157 { | |
| 158 char_u *rev_pattern; | |
| 159 | |
| 160 rev_pattern = reverse_text(pat); | |
| 161 if (rev_pattern == NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
162 mr_pattern = pat; // out of memory, keep normal pattern. |
| 7 | 163 else |
| 164 { | |
| 165 mr_pattern = rev_pattern; | |
| 166 mr_pattern_alloced = TRUE; | |
| 167 } | |
| 168 } | |
| 169 else | |
| 170 #endif | |
| 171 mr_pattern = pat; | |
| 172 | |
| 173 /* | |
| 174 * Save the currently used pattern in the appropriate place, | |
| 175 * unless the pattern should not be remembered. | |
| 176 */ | |
| 5606 | 177 if (!(options & SEARCH_KEEP) && !cmdmod.keeppatterns) |
| 7 | 178 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
179 // search or global command |
| 7 | 180 if (pat_save == RE_SEARCH || pat_save == RE_BOTH) |
| 181 save_re_pat(RE_SEARCH, pat, magic); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
182 // substitute or global command |
| 7 | 183 if (pat_save == RE_SUBST || pat_save == RE_BOTH) |
| 184 save_re_pat(RE_SUBST, pat, magic); | |
| 185 } | |
| 186 | |
| 187 regmatch->rmm_ic = ignorecase(pat); | |
| 410 | 188 regmatch->rmm_maxcol = 0; |
| 7 | 189 regmatch->regprog = vim_regcomp(pat, magic ? RE_MAGIC : 0); |
| 190 if (regmatch->regprog == NULL) | |
| 191 return FAIL; | |
| 192 return OK; | |
| 193 } | |
| 194 | |
| 195 /* | |
| 196 * Get search pattern used by search_regcomp(). | |
| 197 */ | |
| 198 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
199 get_search_pat(void) |
| 7 | 200 { |
| 201 return mr_pattern; | |
| 202 } | |
| 203 | |
| 1344 | 204 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 205 /* |
| 206 * Reverse text into allocated memory. | |
| 207 * Returns the allocated string, NULL when out of memory. | |
| 208 */ | |
| 1344 | 209 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
210 reverse_text(char_u *s) |
| 7 | 211 { |
| 212 unsigned len; | |
| 213 unsigned s_i, rev_i; | |
| 214 char_u *rev; | |
| 215 | |
| 216 /* | |
| 217 * Reverse the pattern. | |
| 218 */ | |
| 219 len = (unsigned)STRLEN(s); | |
| 220 rev = alloc(len + 1); | |
| 221 if (rev != NULL) | |
| 222 { | |
| 223 rev_i = len; | |
| 224 for (s_i = 0; s_i < len; ++s_i) | |
| 225 { | |
| 226 if (has_mbyte) | |
| 227 { | |
| 228 int mb_len; | |
| 229 | |
| 474 | 230 mb_len = (*mb_ptr2len)(s + s_i); |
| 7 | 231 rev_i -= mb_len; |
| 232 mch_memmove(rev + rev_i, s + s_i, mb_len); | |
| 233 s_i += mb_len - 1; | |
| 234 } | |
| 235 else | |
| 236 rev[--rev_i] = s[s_i]; | |
| 237 | |
| 238 } | |
| 239 rev[len] = NUL; | |
| 240 } | |
| 241 return rev; | |
| 242 } | |
| 243 #endif | |
| 244 | |
| 6426 | 245 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
246 save_re_pat(int idx, char_u *pat, int magic) |
| 7 | 247 { |
| 248 if (spats[idx].pat != pat) | |
| 249 { | |
| 250 vim_free(spats[idx].pat); | |
| 251 spats[idx].pat = vim_strsave(pat); | |
| 252 spats[idx].magic = magic; | |
| 253 spats[idx].no_scs = no_smartcase; | |
| 254 last_idx = idx; | |
| 255 #ifdef FEAT_SEARCH_EXTRA | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
256 // If 'hlsearch' set and search pat changed: need redraw. |
| 7 | 257 if (p_hls) |
| 745 | 258 redraw_all_later(SOME_VALID); |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13762
diff
changeset
|
259 set_no_hlsearch(FALSE); |
| 7 | 260 #endif |
| 261 } | |
| 262 } | |
| 263 | |
| 264 /* | |
| 265 * Save the search patterns, so they can be restored later. | |
| 266 * Used before/after executing autocommands and user functions. | |
| 267 */ | |
| 268 static int save_level = 0; | |
| 269 | |
| 270 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
271 save_search_patterns(void) |
| 7 | 272 { |
| 273 if (save_level++ == 0) | |
| 274 { | |
| 275 saved_spats[0] = spats[0]; | |
| 276 if (spats[0].pat != NULL) | |
| 277 saved_spats[0].pat = vim_strsave(spats[0].pat); | |
| 278 saved_spats[1] = spats[1]; | |
| 279 if (spats[1].pat != NULL) | |
| 280 saved_spats[1].pat = vim_strsave(spats[1].pat); | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
281 #ifdef FEAT_SEARCH_EXTRA |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
282 saved_spats_last_idx = last_idx; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
283 saved_spats_no_hlsearch = no_hlsearch; |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
284 #endif |
| 7 | 285 } |
| 286 } | |
| 287 | |
| 288 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
289 restore_search_patterns(void) |
| 7 | 290 { |
| 291 if (--save_level == 0) | |
| 292 { | |
| 293 vim_free(spats[0].pat); | |
| 294 spats[0] = saved_spats[0]; | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
295 #if defined(FEAT_EVAL) |
| 1624 | 296 set_vv_searchforward(); |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
297 #endif |
| 7 | 298 vim_free(spats[1].pat); |
| 299 spats[1] = saved_spats[1]; | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
300 #ifdef FEAT_SEARCH_EXTRA |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
301 last_idx = saved_spats_last_idx; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
302 set_no_hlsearch(saved_spats_no_hlsearch); |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
303 #endif |
| 7 | 304 } |
| 305 } | |
| 306 | |
| 359 | 307 #if defined(EXITFREE) || defined(PROTO) |
| 308 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
309 free_search_patterns(void) |
| 359 | 310 { |
| 311 vim_free(spats[0].pat); | |
| 312 vim_free(spats[1].pat); | |
| 1862 | 313 |
| 314 # ifdef FEAT_RIGHTLEFT | |
| 315 if (mr_pattern_alloced) | |
| 316 { | |
|
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
317 vim_free(mr_pattern); |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
318 mr_pattern_alloced = FALSE; |
|
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2302
diff
changeset
|
319 mr_pattern = NULL; |
| 1862 | 320 } |
| 321 # endif | |
| 359 | 322 } |
| 323 #endif | |
| 324 | |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
325 #ifdef FEAT_SEARCH_EXTRA |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
326 // copy of spats[RE_SEARCH], for keeping the search patterns while incremental |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
327 // searching |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
328 static spat_T saved_last_search_spat; |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
329 static int did_save_last_search_spat = 0; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
330 static int saved_last_idx = 0; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
331 static int saved_no_hlsearch = 0; |
|
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
332 |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
333 /* |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
334 * Save and restore the search pattern for incremental highlight search |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
335 * feature. |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
336 * |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
337 * It's similar to but different from save_search_patterns() and |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
338 * restore_search_patterns(), because the search pattern must be restored when |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
339 * canceling incremental searching even if it's called inside user functions. |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
340 */ |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
341 void |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
342 save_last_search_pattern(void) |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
343 { |
|
15083
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
344 if (did_save_last_search_spat != 0) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
345 iemsg("did_save_last_search_spat is not zero"); |
|
15083
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
346 else |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
347 ++did_save_last_search_spat; |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
348 |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
349 saved_last_search_spat = spats[RE_SEARCH]; |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
350 if (spats[RE_SEARCH].pat != NULL) |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
351 saved_last_search_spat.pat = vim_strsave(spats[RE_SEARCH].pat); |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
352 saved_last_idx = last_idx; |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
353 saved_no_hlsearch = no_hlsearch; |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
354 } |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
355 |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
356 void |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
357 restore_last_search_pattern(void) |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
358 { |
|
15083
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
359 if (did_save_last_search_spat != 1) |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
360 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
361 iemsg("did_save_last_search_spat is not one"); |
|
15083
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
362 return; |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
363 } |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
364 --did_save_last_search_spat; |
|
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
365 |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
366 vim_free(spats[RE_SEARCH].pat); |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
367 spats[RE_SEARCH] = saved_last_search_spat; |
|
15083
70aa5caa9f0d
patch 8.1.0552: saved last search pattern may not be restored
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
368 saved_last_search_spat.pat = NULL; |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
369 # if defined(FEAT_EVAL) |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
370 set_vv_searchforward(); |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
371 # endif |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
372 last_idx = saved_last_idx; |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13762
diff
changeset
|
373 set_no_hlsearch(saved_no_hlsearch); |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
374 } |
|
12855
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
375 |
|
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
376 char_u * |
|
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
377 last_search_pattern(void) |
|
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
378 { |
|
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
379 return spats[RE_SEARCH].pat; |
|
3c09e451af3a
patch 8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Christian Brabandt <cb@256bit.org>
parents:
12829
diff
changeset
|
380 } |
|
12720
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
381 #endif |
|
37c384802df4
patch 8.0.1238: incremental search only shows one match
Christian Brabandt <cb@256bit.org>
parents:
12539
diff
changeset
|
382 |
| 7 | 383 /* |
| 384 * Return TRUE when case should be ignored for search pattern "pat". | |
| 385 * Uses the 'ignorecase' and 'smartcase' options. | |
| 386 */ | |
| 387 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
388 ignorecase(char_u *pat) |
| 7 | 389 { |
|
9913
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
390 return ignorecase_opt(pat, p_ic, p_scs); |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
391 } |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
392 |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
393 /* |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
394 * As ignorecase() put pass the "ic" and "scs" flags. |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
395 */ |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
396 int |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
397 ignorecase_opt(char_u *pat, int ic_in, int scs) |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
398 { |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
399 int ic = ic_in; |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
400 |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
401 if (ic && !no_smartcase && scs |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
402 && !(ctrl_x_mode_not_default() && curbuf->b_p_inf)) |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
403 ic = !pat_has_uppercase(pat); |
| 7 | 404 no_smartcase = FALSE; |
| 405 | |
| 406 return ic; | |
| 407 } | |
| 408 | |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
409 /* |
| 6991 | 410 * Return TRUE if pattern "pat" has an uppercase character. |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
411 */ |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
412 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
413 pat_has_uppercase(char_u *pat) |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
414 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
415 char_u *p = pat; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
416 |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
417 while (*p != NUL) |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
418 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
419 int l; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
420 |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
421 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
422 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
423 if (enc_utf8 && utf_isupper(utf_ptr2char(p))) |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
424 return TRUE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
425 p += l; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
426 } |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
427 else if (*p == '\\') |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
428 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
429 if (p[1] == '_' && p[2] != NUL) // skip "\_X" |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
430 p += 3; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
431 else if (p[1] == '%' && p[2] != NUL) // skip "\%X" |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
432 p += 3; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
433 else if (p[1] != NUL) // skip "\X" |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
434 p += 2; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
435 else |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
436 p += 1; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
437 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
438 else if (MB_ISUPPER(*p)) |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
439 return TRUE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
440 else |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
441 ++p; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
442 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
443 return FALSE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
444 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
445 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
446 #if defined(FEAT_EVAL) || defined(PROTO) |
| 7 | 447 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
448 last_csearch(void) |
| 6991 | 449 { |
| 450 return lastc_bytes; | |
| 451 } | |
| 452 | |
| 453 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
454 last_csearch_forward(void) |
| 6991 | 455 { |
| 456 return lastcdir == FORWARD; | |
| 457 } | |
| 458 | |
| 459 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
460 last_csearch_until(void) |
| 6991 | 461 { |
| 462 return last_t_cmd == TRUE; | |
| 463 } | |
| 464 | |
| 465 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
466 set_last_csearch(int c, char_u *s UNUSED, int len UNUSED) |
| 6991 | 467 { |
| 468 *lastc = c; | |
| 469 lastc_bytelen = len; | |
| 470 if (len) | |
| 471 memcpy(lastc_bytes, s, len); | |
| 472 else | |
| 473 vim_memset(lastc_bytes, 0, sizeof(lastc_bytes)); | |
| 474 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
475 #endif |
| 6991 | 476 |
| 477 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
478 set_csearch_direction(int cdir) |
| 6991 | 479 { |
| 480 lastcdir = cdir; | |
| 481 } | |
| 482 | |
| 483 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
484 set_csearch_until(int t_cmd) |
| 6991 | 485 { |
| 486 last_t_cmd = t_cmd; | |
| 487 } | |
| 488 | |
| 489 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
490 last_search_pat(void) |
| 7 | 491 { |
| 492 return spats[last_idx].pat; | |
| 493 } | |
| 494 | |
| 495 /* | |
| 496 * Reset search direction to forward. For "gd" and "gD" commands. | |
| 497 */ | |
| 498 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
499 reset_search_dir(void) |
| 7 | 500 { |
| 501 spats[0].off.dir = '/'; | |
| 1624 | 502 #if defined(FEAT_EVAL) |
| 503 set_vv_searchforward(); | |
| 504 #endif | |
| 7 | 505 } |
| 506 | |
| 507 #if defined(FEAT_EVAL) || defined(FEAT_VIMINFO) | |
| 508 /* | |
| 509 * Set the last search pattern. For ":let @/ =" and viminfo. | |
| 510 * Also set the saved search pattern, so that this works in an autocommand. | |
| 511 */ | |
| 512 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
513 set_last_search_pat( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
514 char_u *s, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
515 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
516 int magic, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
517 int setlast) |
| 7 | 518 { |
| 519 vim_free(spats[idx].pat); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
520 // An empty string means that nothing should be matched. |
| 7 | 521 if (*s == NUL) |
| 522 spats[idx].pat = NULL; | |
| 523 else | |
| 524 spats[idx].pat = vim_strsave(s); | |
| 525 spats[idx].magic = magic; | |
| 526 spats[idx].no_scs = FALSE; | |
| 527 spats[idx].off.dir = '/'; | |
| 1624 | 528 #if defined(FEAT_EVAL) |
| 529 set_vv_searchforward(); | |
| 530 #endif | |
| 7 | 531 spats[idx].off.line = FALSE; |
| 532 spats[idx].off.end = FALSE; | |
| 533 spats[idx].off.off = 0; | |
| 534 if (setlast) | |
| 535 last_idx = idx; | |
| 536 if (save_level) | |
| 537 { | |
| 538 vim_free(saved_spats[idx].pat); | |
| 539 saved_spats[idx] = spats[0]; | |
| 540 if (spats[idx].pat == NULL) | |
| 541 saved_spats[idx].pat = NULL; | |
| 542 else | |
| 543 saved_spats[idx].pat = vim_strsave(spats[idx].pat); | |
|
15971
ced614446eaa
patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents:
15930
diff
changeset
|
544 # ifdef FEAT_SEARCH_EXTRA |
|
15091
e8fdc71f3ea0
patch 8.1.0556: saving/restoring search patterns share saved last_idx
Bram Moolenaar <Bram@vim.org>
parents:
15089
diff
changeset
|
545 saved_spats_last_idx = last_idx; |
|
15971
ced614446eaa
patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents:
15930
diff
changeset
|
546 # endif |
| 7 | 547 } |
| 548 # ifdef FEAT_SEARCH_EXTRA | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
549 // If 'hlsearch' set and search pat changed: need redraw. |
| 7 | 550 if (p_hls && idx == last_idx && !no_hlsearch) |
| 745 | 551 redraw_all_later(SOME_VALID); |
| 7 | 552 # endif |
| 553 } | |
| 554 #endif | |
| 555 | |
| 556 #ifdef FEAT_SEARCH_EXTRA | |
| 557 /* | |
| 558 * Get a regexp program for the last used search pattern. | |
| 559 * This is used for highlighting all matches in a window. | |
| 560 * Values returned in regmatch->regprog and regmatch->rmm_ic. | |
| 561 */ | |
| 562 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
563 last_pat_prog(regmmatch_T *regmatch) |
| 7 | 564 { |
| 565 if (spats[last_idx].pat == NULL) | |
| 566 { | |
| 567 regmatch->regprog = NULL; | |
| 568 return; | |
| 569 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
570 ++emsg_off; // So it doesn't beep if bad expr |
| 7 | 571 (void)search_regcomp((char_u *)"", 0, last_idx, SEARCH_KEEP, regmatch); |
| 572 --emsg_off; | |
| 573 } | |
| 574 #endif | |
| 575 | |
| 576 /* | |
| 5735 | 577 * Lowest level search function. |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
578 * Search for 'count'th occurrence of pattern "pat" in direction "dir". |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
579 * Start at position "pos" and return the found position in "pos". |
| 7 | 580 * |
| 581 * if (options & SEARCH_MSG) == 0 don't give any messages | |
| 582 * if (options & SEARCH_MSG) == SEARCH_NFMSG don't give 'notfound' messages | |
| 583 * if (options & SEARCH_MSG) == SEARCH_MSG give all messages | |
| 584 * if (options & SEARCH_HIS) put search pattern in history | |
| 585 * if (options & SEARCH_END) return position at end of match | |
| 586 * if (options & SEARCH_START) accept match at pos itself | |
| 587 * if (options & SEARCH_KEEP) keep previous search pattern | |
| 588 * if (options & SEARCH_FOLD) match only once in a closed fold | |
| 589 * if (options & SEARCH_PEEK) check for typed char, cancel search | |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
590 * if (options & SEARCH_COL) start at pos->col instead of zero |
| 7 | 591 * |
| 592 * Return FAIL (zero) for failure, non-zero for success. | |
| 593 * When FEAT_EVAL is defined, returns the index of the first matching | |
| 594 * subpattern plus one; one if there was none. | |
| 595 */ | |
| 596 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
597 searchit( |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
598 win_T *win, // window to search in; can be NULL for a |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
599 // buffer without a window! |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
600 buf_T *buf, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
601 pos_T *pos, |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
602 pos_T *end_pos, // set to end of the match, unless NULL |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
603 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
604 char_u *pat, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
605 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
606 int options, |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
607 int pat_use, // which pattern to use when "pat" is empty |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
608 searchit_arg_T *extra_arg) // optional extra arguments, can be NULL |
| 7 | 609 { |
| 610 int found; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
611 linenr_T lnum; // no init to shut up Apollo cc |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
612 colnr_T col; |
| 7 | 613 regmmatch_T regmatch; |
| 614 char_u *ptr; | |
| 615 colnr_T matchcol; | |
| 616 lpos_T endpos; | |
| 140 | 617 lpos_T matchpos; |
| 7 | 618 int loop; |
| 619 pos_T start_pos; | |
| 620 int at_first_line; | |
| 621 int extra_col; | |
| 6903 | 622 int start_char_len; |
| 7 | 623 int match_ok; |
| 624 long nmatched; | |
| 625 int submatch = 0; | |
| 6402 | 626 int first_match = TRUE; |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
627 int called_emsg_before = called_emsg; |
| 7 | 628 #ifdef FEAT_SEARCH_EXTRA |
| 629 int break_loop = FALSE; | |
| 630 #endif | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
631 linenr_T stop_lnum = 0; // stop after this line number when != 0 |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
632 #ifdef FEAT_RELTIME |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
633 proftime_T *tm = NULL; // timeout limit or NULL |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
634 int *timed_out = NULL; // set when timed out or NULL |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
635 #endif |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
636 |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
637 if (extra_arg != NULL) |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
638 { |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
639 stop_lnum = extra_arg->sa_stop_lnum; |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
640 #ifdef FEAT_RELTIME |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
641 tm = extra_arg->sa_tm; |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
642 timed_out = &extra_arg->sa_timed_out; |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
643 #endif |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
644 } |
| 7 | 645 |
| 646 if (search_regcomp(pat, RE_SEARCH, pat_use, | |
| 647 (options & (SEARCH_HIS + SEARCH_KEEP)), ®match) == FAIL) | |
| 648 { | |
| 649 if ((options & SEARCH_MSG) && !rc_did_emsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
650 semsg(_("E383: Invalid search string: %s"), mr_pattern); |
| 7 | 651 return FAIL; |
| 652 } | |
| 653 | |
| 648 | 654 /* |
| 655 * find the string | |
| 656 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
657 do // loop for count |
| 7 | 658 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
659 // When not accepting a match at the start position set "extra_col" to |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
660 // a non-zero value. Don't do that when starting at MAXCOL, since |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
661 // MAXCOL + 1 is zero. |
| 6903 | 662 if (pos->col == MAXCOL) |
| 663 start_char_len = 0; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
664 // Watch out for the "col" being MAXCOL - 2, used in a closed fold. |
| 6903 | 665 else if (has_mbyte |
| 666 && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count | |
| 667 && pos->col < MAXCOL - 2) | |
| 6402 | 668 { |
|
13223
e37327129859
patch 8.0.1486: accessing invalid memory with "it"
Christian Brabandt <cb@256bit.org>
parents:
13217
diff
changeset
|
669 ptr = ml_get_buf(buf, pos->lnum, FALSE); |
|
13225
1961162121c7
patch 8.0.1487: test 14 fails
Christian Brabandt <cb@256bit.org>
parents:
13223
diff
changeset
|
670 if ((int)STRLEN(ptr) <= pos->col) |
| 6903 | 671 start_char_len = 1; |
| 6402 | 672 else |
|
13223
e37327129859
patch 8.0.1486: accessing invalid memory with "it"
Christian Brabandt <cb@256bit.org>
parents:
13217
diff
changeset
|
673 start_char_len = (*mb_ptr2len)(ptr + pos->col); |
| 6402 | 674 } |
| 675 else | |
| 6903 | 676 start_char_len = 1; |
| 677 if (dir == FORWARD) | |
| 678 { | |
| 679 if (options & SEARCH_START) | |
| 680 extra_col = 0; | |
| 681 else | |
| 682 extra_col = start_char_len; | |
| 683 } | |
| 684 else | |
| 685 { | |
| 686 if (options & SEARCH_START) | |
| 687 extra_col = start_char_len; | |
| 688 else | |
| 689 extra_col = 0; | |
| 690 } | |
| 6402 | 691 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
692 start_pos = *pos; // remember start pos for detecting no match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
693 found = 0; // default: not found |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
694 at_first_line = TRUE; // default: start in first line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
695 if (pos->lnum == 0) // correct lnum for when starting in line 0 |
| 7 | 696 { |
| 697 pos->lnum = 1; | |
| 698 pos->col = 0; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
699 at_first_line = FALSE; // not in first line now |
| 7 | 700 } |
| 701 | |
| 702 /* | |
| 703 * Start searching in current line, unless searching backwards and | |
| 704 * we're in column 0. | |
| 1311 | 705 * If we are searching backwards, in column 0, and not including the |
| 706 * current position, gain some efficiency by skipping back a line. | |
| 707 * Otherwise begin the search in the current line. | |
| 7 | 708 */ |
| 1311 | 709 if (dir == BACKWARD && start_pos.col == 0 |
| 710 && (options & SEARCH_START) == 0) | |
| 7 | 711 { |
| 712 lnum = pos->lnum - 1; | |
| 713 at_first_line = FALSE; | |
| 714 } | |
| 715 else | |
| 716 lnum = pos->lnum; | |
| 717 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
718 for (loop = 0; loop <= 1; ++loop) // loop twice if 'wrapscan' set |
| 7 | 719 { |
| 720 for ( ; lnum > 0 && lnum <= buf->b_ml.ml_line_count; | |
| 721 lnum += dir, at_first_line = FALSE) | |
| 722 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
723 // Stop after checking "stop_lnum", if it's set. |
| 692 | 724 if (stop_lnum != 0 && (dir == FORWARD |
| 725 ? lnum > stop_lnum : lnum < stop_lnum)) | |
| 726 break; | |
| 1496 | 727 #ifdef FEAT_RELTIME |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
728 // Stop after passing the "tm" time limit. |
| 1496 | 729 if (tm != NULL && profile_passed_limit(tm)) |
| 730 break; | |
| 731 #endif | |
| 692 | 732 |
| 7 | 733 /* |
| 140 | 734 * Look for a match somewhere in line "lnum". |
| 7 | 735 */ |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
736 col = at_first_line && (options & SEARCH_COL) ? pos->col |
|
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
737 : (colnr_T)0; |
| 7 | 738 nmatched = vim_regexec_multi(®match, win, buf, |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
739 lnum, col, |
| 1521 | 740 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
741 tm, timed_out |
| 1521 | 742 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
743 NULL, NULL |
| 1521 | 744 #endif |
| 745 ); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
746 // Abort searching on an error (e.g., out of stack). |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
747 if (called_emsg > called_emsg_before |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
748 #ifdef FEAT_RELTIME |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
749 || (timed_out != NULL && *timed_out) |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
750 #endif |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
751 ) |
| 7 | 752 break; |
| 753 if (nmatched > 0) | |
| 754 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
755 // match may actually be in another line when using \zs |
| 140 | 756 matchpos = regmatch.startpos[0]; |
| 7 | 757 endpos = regmatch.endpos[0]; |
| 1521 | 758 #ifdef FEAT_EVAL |
| 7 | 759 submatch = first_submatch(®match); |
| 1521 | 760 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
761 // "lnum" may be past end of buffer for "\n\zs". |
| 685 | 762 if (lnum + matchpos.lnum > buf->b_ml.ml_line_count) |
| 763 ptr = (char_u *)""; | |
| 764 else | |
| 765 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); | |
| 7 | 766 |
| 767 /* | |
| 768 * Forward search in the first line: match should be after | |
| 769 * the start position. If not, continue at the end of the | |
| 770 * match (this is vi compatible) or on the next char. | |
| 771 */ | |
| 772 if (dir == FORWARD && at_first_line) | |
| 773 { | |
| 774 match_ok = TRUE; | |
| 775 /* | |
| 140 | 776 * When the match starts in a next line it's certainly |
| 777 * past the start position. | |
| 7 | 778 * When match lands on a NUL the cursor will be put |
| 779 * one back afterwards, compare with that position, | |
| 780 * otherwise "/$" will get stuck on end of line. | |
| 781 */ | |
| 140 | 782 while (matchpos.lnum == 0 |
| 6402 | 783 && ((options & SEARCH_END) && first_match |
| 140 | 784 ? (nmatched == 1 |
| 785 && (int)endpos.col - 1 | |
| 7 | 786 < (int)start_pos.col + extra_col) |
| 140 | 787 : ((int)matchpos.col |
| 788 - (ptr[matchpos.col] == NUL) | |
| 789 < (int)start_pos.col + extra_col))) | |
| 7 | 790 { |
| 791 /* | |
| 792 * If vi-compatible searching, continue at the end | |
| 793 * of the match, otherwise continue one position | |
| 794 * forward. | |
| 795 */ | |
| 796 if (vim_strchr(p_cpo, CPO_SEARCH) != NULL) | |
| 797 { | |
| 798 if (nmatched > 1) | |
| 799 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
800 // end is in next line, thus no match in |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
801 // this line |
| 7 | 802 match_ok = FALSE; |
| 803 break; | |
| 804 } | |
| 805 matchcol = endpos.col; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
806 // for empty match: advance one char |
| 140 | 807 if (matchcol == matchpos.col |
| 7 | 808 && ptr[matchcol] != NUL) |
| 809 { | |
| 810 if (has_mbyte) | |
| 811 matchcol += | |
| 474 | 812 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 813 else |
| 814 ++matchcol; | |
| 815 } | |
| 816 } | |
| 817 else | |
| 818 { | |
| 140 | 819 matchcol = matchpos.col; |
| 7 | 820 if (ptr[matchcol] != NUL) |
| 821 { | |
| 822 if (has_mbyte) | |
| 474 | 823 matchcol += (*mb_ptr2len)(ptr |
| 7 | 824 + matchcol); |
| 825 else | |
| 826 ++matchcol; | |
| 827 } | |
| 828 } | |
| 4252 | 829 if (matchcol == 0 && (options & SEARCH_START)) |
| 4240 | 830 break; |
| 7 | 831 if (ptr[matchcol] == NUL |
| 832 || (nmatched = vim_regexec_multi(®match, | |
| 140 | 833 win, buf, lnum + matchpos.lnum, |
| 1521 | 834 matchcol, |
| 835 #ifdef FEAT_RELTIME | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
836 tm, timed_out |
| 1521 | 837 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
838 NULL, NULL |
| 1521 | 839 #endif |
| 840 )) == 0) | |
| 7 | 841 { |
| 842 match_ok = FALSE; | |
| 843 break; | |
| 844 } | |
| 140 | 845 matchpos = regmatch.startpos[0]; |
| 7 | 846 endpos = regmatch.endpos[0]; |
| 847 # ifdef FEAT_EVAL | |
| 848 submatch = first_submatch(®match); | |
| 849 # endif | |
| 850 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
851 // Need to get the line pointer again, a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
852 // multi-line search may have made it invalid. |
| 140 | 853 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); |
| 7 | 854 } |
| 855 if (!match_ok) | |
| 856 continue; | |
| 857 } | |
| 858 if (dir == BACKWARD) | |
| 859 { | |
| 860 /* | |
| 861 * Now, if there are multiple matches on this line, | |
| 862 * we have to get the last one. Or the last one before | |
| 863 * the cursor, if we're on that line. | |
| 864 * When putting the new cursor at the end, compare | |
| 865 * relative to the end of the match. | |
| 866 */ | |
| 867 match_ok = FALSE; | |
| 868 for (;;) | |
| 869 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
870 // Remember a position that is before the start |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
871 // position, we use it if it's the last match in |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
872 // the line. Always accept a position after |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
873 // wrapping around. |
| 140 | 874 if (loop |
| 875 || ((options & SEARCH_END) | |
| 876 ? (lnum + regmatch.endpos[0].lnum | |
| 877 < start_pos.lnum | |
| 878 || (lnum + regmatch.endpos[0].lnum | |
| 879 == start_pos.lnum | |
| 880 && (int)regmatch.endpos[0].col - 1 | |
| 6903 | 881 < (int)start_pos.col |
| 882 + extra_col)) | |
| 140 | 883 : (lnum + regmatch.startpos[0].lnum |
| 884 < start_pos.lnum | |
| 885 || (lnum + regmatch.startpos[0].lnum | |
| 886 == start_pos.lnum | |
| 887 && (int)regmatch.startpos[0].col | |
| 6903 | 888 < (int)start_pos.col |
| 889 + extra_col)))) | |
| 7 | 890 { |
| 891 match_ok = TRUE; | |
| 140 | 892 matchpos = regmatch.startpos[0]; |
| 7 | 893 endpos = regmatch.endpos[0]; |
| 894 # ifdef FEAT_EVAL | |
| 895 submatch = first_submatch(®match); | |
| 896 # endif | |
| 897 } | |
| 898 else | |
| 899 break; | |
| 900 | |
| 901 /* | |
| 902 * We found a valid match, now check if there is | |
| 903 * another one after it. | |
| 904 * If vi-compatible searching, continue at the end | |
| 905 * of the match, otherwise continue one position | |
| 906 * forward. | |
| 907 */ | |
| 908 if (vim_strchr(p_cpo, CPO_SEARCH) != NULL) | |
| 909 { | |
| 910 if (nmatched > 1) | |
| 911 break; | |
| 912 matchcol = endpos.col; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
913 // for empty match: advance one char |
| 140 | 914 if (matchcol == matchpos.col |
| 7 | 915 && ptr[matchcol] != NUL) |
| 916 { | |
| 917 if (has_mbyte) | |
| 918 matchcol += | |
| 474 | 919 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 920 else |
| 921 ++matchcol; | |
| 922 } | |
| 923 } | |
| 924 else | |
| 925 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
926 // Stop when the match is in a next line. |
| 140 | 927 if (matchpos.lnum > 0) |
| 928 break; | |
| 929 matchcol = matchpos.col; | |
| 7 | 930 if (ptr[matchcol] != NUL) |
| 931 { | |
| 932 if (has_mbyte) | |
| 933 matchcol += | |
| 474 | 934 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 935 else |
| 936 ++matchcol; | |
| 937 } | |
| 938 } | |
| 939 if (ptr[matchcol] == NUL | |
| 940 || (nmatched = vim_regexec_multi(®match, | |
| 140 | 941 win, buf, lnum + matchpos.lnum, |
| 1521 | 942 matchcol, |
| 943 #ifdef FEAT_RELTIME | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
944 tm, timed_out |
| 1521 | 945 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
946 NULL, NULL |
| 1521 | 947 #endif |
| 948 )) == 0) | |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
949 { |
|
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
950 #ifdef FEAT_RELTIME |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
951 // If the search timed out, we did find a match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
952 // but it might be the wrong one, so that's not |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
953 // OK. |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
954 if (timed_out != NULL && *timed_out) |
|
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
955 match_ok = FALSE; |
|
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
956 #endif |
| 7 | 957 break; |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
958 } |
| 7 | 959 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
960 // Need to get the line pointer again, a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
961 // multi-line search may have made it invalid. |
| 140 | 962 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); |
| 7 | 963 } |
| 964 | |
| 965 /* | |
| 966 * If there is only a match after the cursor, skip | |
| 967 * this match. | |
| 968 */ | |
| 969 if (!match_ok) | |
| 970 continue; | |
| 971 } | |
| 972 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
973 // With the SEARCH_END option move to the last character |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
974 // of the match. Don't do it for an empty match, end |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
975 // should be same as start then. |
| 4252 | 976 if ((options & SEARCH_END) && !(options & SEARCH_NOOF) |
| 1544 | 977 && !(matchpos.lnum == endpos.lnum |
| 978 && matchpos.col == endpos.col)) | |
| 7 | 979 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
980 // For a match in the first column, set the position |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
981 // on the NUL in the previous line. |
| 140 | 982 pos->lnum = lnum + endpos.lnum; |
| 1544 | 983 pos->col = endpos.col; |
| 984 if (endpos.col == 0) | |
| 819 | 985 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
986 if (pos->lnum > 1) // just in case |
| 1544 | 987 { |
| 988 --pos->lnum; | |
| 989 pos->col = (colnr_T)STRLEN(ml_get_buf(buf, | |
| 990 pos->lnum, FALSE)); | |
| 991 } | |
| 992 } | |
| 993 else | |
| 994 { | |
| 995 --pos->col; | |
| 996 if (has_mbyte | |
| 997 && pos->lnum <= buf->b_ml.ml_line_count) | |
| 998 { | |
| 1060 | 999 ptr = ml_get_buf(buf, pos->lnum, FALSE); |
| 1544 | 1000 pos->col -= (*mb_head_off)(ptr, ptr + pos->col); |
| 1001 } | |
| 819 | 1002 } |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1003 if (end_pos != NULL) |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1004 { |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1005 end_pos->lnum = lnum + matchpos.lnum; |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1006 end_pos->col = matchpos.col; |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1007 } |
| 7 | 1008 } |
| 1009 else | |
| 1010 { | |
| 140 | 1011 pos->lnum = lnum + matchpos.lnum; |
| 1012 pos->col = matchpos.col; | |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1013 if (end_pos != NULL) |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1014 { |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1015 end_pos->lnum = lnum + endpos.lnum; |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1016 end_pos->col = endpos.col; |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1017 } |
| 7 | 1018 } |
| 1019 pos->coladd = 0; | |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1020 if (end_pos != NULL) |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1021 end_pos->coladd = 0; |
| 7 | 1022 found = 1; |
| 6402 | 1023 first_match = FALSE; |
| 7 | 1024 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1025 // Set variables used for 'incsearch' highlighting. |
| 140 | 1026 search_match_lines = endpos.lnum - matchpos.lnum; |
| 7 | 1027 search_match_endcol = endpos.col; |
| 1028 break; | |
| 1029 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1030 line_breakcheck(); // stop if ctrl-C typed |
| 7 | 1031 if (got_int) |
| 1032 break; | |
| 1033 | |
| 1034 #ifdef FEAT_SEARCH_EXTRA | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1035 // Cancel searching if a character was typed. Used for |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1036 // 'incsearch'. Don't check too often, that would slowdown |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1037 // searching too much. |
| 7 | 1038 if ((options & SEARCH_PEEK) |
| 1039 && ((lnum - pos->lnum) & 0x3f) == 0 | |
| 1040 && char_avail()) | |
| 1041 { | |
| 1042 break_loop = TRUE; | |
| 1043 break; | |
| 1044 } | |
| 1045 #endif | |
| 1046 | |
| 1047 if (loop && lnum == start_pos.lnum) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1048 break; // if second loop, stop where started |
| 7 | 1049 } |
| 1050 at_first_line = FALSE; | |
| 1051 | |
| 1052 /* | |
| 692 | 1053 * Stop the search if wrapscan isn't set, "stop_lnum" is |
| 1054 * specified, after an interrupt, after a match and after looping | |
| 1055 * twice. | |
| 7 | 1056 */ |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
1057 if (!p_ws || stop_lnum != 0 || got_int |
|
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
1058 || called_emsg > called_emsg_before |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1059 #ifdef FEAT_RELTIME |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1060 || (timed_out != NULL && *timed_out) |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1061 #endif |
| 1877 | 1062 #ifdef FEAT_SEARCH_EXTRA |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1063 || break_loop |
| 1877 | 1064 #endif |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1065 || found || loop) |
| 7 | 1066 break; |
| 1067 | |
| 1068 /* | |
| 1069 * If 'wrapscan' is set we continue at the other end of the file. | |
| 1070 * If 'shortmess' does not contain 's', we give a message. | |
| 1071 * This message is also remembered in keep_msg for when the screen | |
| 1072 * is redrawn. The keep_msg is cleared whenever another message is | |
| 1073 * written. | |
| 1074 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1075 if (dir == BACKWARD) // start second loop at the other end |
| 7 | 1076 lnum = buf->b_ml.ml_line_count; |
| 1077 else | |
| 1078 lnum = 1; | |
| 504 | 1079 if (!shortmess(SHM_SEARCH) && (options & SEARCH_MSG)) |
| 1080 give_warning((char_u *)_(dir == BACKWARD | |
| 1081 ? top_bot_msg : bot_top_msg), TRUE); | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1082 if (extra_arg != NULL) |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1083 extra_arg->sa_wrapped = TRUE; |
| 7 | 1084 } |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
1085 if (got_int || called_emsg > called_emsg_before |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1086 #ifdef FEAT_RELTIME |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1087 || (timed_out != NULL && *timed_out) |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
1088 #endif |
| 1877 | 1089 #ifdef FEAT_SEARCH_EXTRA |
| 1090 || break_loop | |
| 1091 #endif | |
| 1092 ) | |
| 7 | 1093 break; |
| 1094 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1095 while (--count > 0 && found); // stop after count matches or no match |
| 7 | 1096 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1097 vim_regfree(regmatch.regprog); |
| 7 | 1098 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1099 if (!found) // did not find it |
| 7 | 1100 { |
| 1101 if (got_int) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1102 emsg(_(e_interr)); |
| 7 | 1103 else if ((options & SEARCH_MSG) == SEARCH_MSG) |
| 1104 { | |
| 1105 if (p_ws) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1106 semsg(_(e_patnotf2), mr_pattern); |
| 7 | 1107 else if (lnum == 0) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1108 semsg(_("E384: search hit TOP without match for: %s"), |
| 7 | 1109 mr_pattern); |
| 1110 else | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1111 semsg(_("E385: search hit BOTTOM without match for: %s"), |
| 7 | 1112 mr_pattern); |
| 1113 } | |
| 1114 return FAIL; | |
| 1115 } | |
| 1116 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1117 // A pattern like "\n\zs" may go past the last line. |
| 685 | 1118 if (pos->lnum > buf->b_ml.ml_line_count) |
| 1119 { | |
| 1120 pos->lnum = buf->b_ml.ml_line_count; | |
| 835 | 1121 pos->col = (int)STRLEN(ml_get_buf(buf, pos->lnum, FALSE)); |
| 685 | 1122 if (pos->col > 0) |
| 1123 --pos->col; | |
| 1124 } | |
| 1125 | |
| 7 | 1126 return submatch + 1; |
| 1127 } | |
| 1128 | |
| 1129 #ifdef FEAT_EVAL | |
| 1624 | 1130 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1131 set_search_direction(int cdir) |
| 1624 | 1132 { |
| 1133 spats[0].off.dir = cdir; | |
| 1134 } | |
| 1135 | |
| 1136 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1137 set_vv_searchforward(void) |
| 1624 | 1138 { |
| 1139 set_vim_var_nr(VV_SEARCHFORWARD, (long)(spats[0].off.dir == '/')); | |
| 1140 } | |
| 1141 | |
| 7 | 1142 /* |
| 1143 * Return the number of the first subpat that matched. | |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
1144 * Return zero if none of them matched. |
| 7 | 1145 */ |
| 1146 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1147 first_submatch(regmmatch_T *rp) |
| 7 | 1148 { |
| 1149 int submatch; | |
| 1150 | |
| 1151 for (submatch = 1; ; ++submatch) | |
| 1152 { | |
| 1153 if (rp->startpos[submatch].lnum >= 0) | |
| 1154 break; | |
| 1155 if (submatch == 9) | |
| 1156 { | |
| 1157 submatch = 0; | |
| 1158 break; | |
| 1159 } | |
| 1160 } | |
| 1161 return submatch; | |
| 1162 } | |
| 1163 #endif | |
| 1164 | |
| 1165 /* | |
| 1166 * Highest level string search function. | |
| 1222 | 1167 * Search for the 'count'th occurrence of pattern 'pat' in direction 'dirc' |
| 7 | 1168 * If 'dirc' is 0: use previous dir. |
| 1169 * If 'pat' is NULL or empty : use previous string. | |
| 1170 * If 'options & SEARCH_REV' : go in reverse of previous dir. | |
| 1171 * If 'options & SEARCH_ECHO': echo the search command and handle options | |
| 1172 * If 'options & SEARCH_MSG' : may give error message | |
| 1173 * If 'options & SEARCH_OPT' : interpret optional flags | |
| 1174 * If 'options & SEARCH_HIS' : put search pattern in history | |
| 1175 * If 'options & SEARCH_NOOF': don't add offset to position | |
| 1176 * If 'options & SEARCH_MARK': set previous context mark | |
| 1177 * If 'options & SEARCH_KEEP': keep previous search pattern | |
| 1178 * If 'options & SEARCH_START': accept match at curpos itself | |
| 1179 * If 'options & SEARCH_PEEK': check for typed char, cancel search | |
| 1180 * | |
| 1181 * Careful: If spats[0].off.line == TRUE and spats[0].off.off == 0 this | |
| 1182 * makes the movement linewise without moving the match position. | |
| 1183 * | |
| 6661 | 1184 * Return 0 for failure, 1 for found, 2 for found and line offset added. |
| 7 | 1185 */ |
| 1186 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1187 do_search( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1188 oparg_T *oap, // can be NULL |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1189 int dirc, // '/' or '?' |
|
19475
5512aa74cb62
patch 8.2.0295: highlighting for :s wrong when using different separator
Bram Moolenaar <Bram@vim.org>
parents:
19384
diff
changeset
|
1190 int search_delim, // the delimiter for the search, e.g. '%' in s%regex%replacement% |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1191 char_u *pat, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1192 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1193 int options, |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1194 searchit_arg_T *sia) // optional arguments or NULL |
| 7 | 1195 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1196 pos_T pos; // position of the last match |
| 7 | 1197 char_u *searchstr; |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
1198 soffset_T old_off; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1199 int retval; // Return value |
| 7 | 1200 char_u *p; |
| 1201 long c; | |
| 1202 char_u *dircp; | |
| 1203 char_u *strcopy = NULL; | |
| 1204 char_u *ps; | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1205 char_u *msgbuf = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1206 size_t len; |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1207 int has_offset = FALSE; |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
1208 #define SEARCH_STAT_BUF_LEN 12 |
| 7 | 1209 |
| 1210 /* | |
| 1211 * A line offset is not remembered, this is vi compatible. | |
| 1212 */ | |
| 1213 if (spats[0].off.line && vim_strchr(p_cpo, CPO_LINEOFF) != NULL) | |
| 1214 { | |
| 1215 spats[0].off.line = FALSE; | |
| 1216 spats[0].off.off = 0; | |
| 1217 } | |
| 1218 | |
| 1219 /* | |
| 1220 * Save the values for when (options & SEARCH_KEEP) is used. | |
| 1221 * (there is no "if ()" around this because gcc wants them initialized) | |
| 1222 */ | |
| 1223 old_off = spats[0].off; | |
| 1224 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1225 pos = curwin->w_cursor; // start searching at the cursor position |
| 7 | 1226 |
| 1227 /* | |
| 1228 * Find out the direction of the search. | |
| 1229 */ | |
| 1230 if (dirc == 0) | |
| 1231 dirc = spats[0].off.dir; | |
| 1232 else | |
| 1624 | 1233 { |
| 7 | 1234 spats[0].off.dir = dirc; |
| 1624 | 1235 #if defined(FEAT_EVAL) |
| 1236 set_vv_searchforward(); | |
| 1237 #endif | |
| 1238 } | |
| 7 | 1239 if (options & SEARCH_REV) |
| 1240 { | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
1241 #ifdef MSWIN |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1242 // There is a bug in the Visual C++ 2.2 compiler which means that |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1243 // dirc always ends up being '/' |
| 7 | 1244 dirc = (dirc == '/') ? '?' : '/'; |
| 1245 #else | |
| 1246 if (dirc == '/') | |
| 1247 dirc = '?'; | |
| 1248 else | |
| 1249 dirc = '/'; | |
| 1250 #endif | |
| 1251 } | |
| 1252 | |
| 1253 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1254 // If the cursor is in a closed fold, don't find another match in the same |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1255 // fold. |
| 7 | 1256 if (dirc == '/') |
| 1257 { | |
| 1258 if (hasFolding(pos.lnum, NULL, &pos.lnum)) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1259 pos.col = MAXCOL - 2; // avoid overflow when adding 1 |
| 7 | 1260 } |
| 1261 else | |
| 1262 { | |
| 1263 if (hasFolding(pos.lnum, &pos.lnum, NULL)) | |
| 1264 pos.col = 0; | |
| 1265 } | |
| 1266 #endif | |
| 1267 | |
| 1268 #ifdef FEAT_SEARCH_EXTRA | |
| 1269 /* | |
| 1270 * Turn 'hlsearch' highlighting back on. | |
| 1271 */ | |
| 1272 if (no_hlsearch && !(options & SEARCH_KEEP)) | |
| 1273 { | |
| 745 | 1274 redraw_all_later(SOME_VALID); |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13762
diff
changeset
|
1275 set_no_hlsearch(FALSE); |
| 7 | 1276 } |
| 1277 #endif | |
| 1278 | |
| 1279 /* | |
| 1280 * Repeat the search when pattern followed by ';', e.g. "/foo/;?bar". | |
| 1281 */ | |
| 1282 for (;;) | |
| 1283 { | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1284 int show_top_bot_msg = FALSE; |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
1285 |
| 7 | 1286 searchstr = pat; |
| 1287 dircp = NULL; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1288 // use previous pattern |
|
19475
5512aa74cb62
patch 8.2.0295: highlighting for :s wrong when using different separator
Bram Moolenaar <Bram@vim.org>
parents:
19384
diff
changeset
|
1289 if (pat == NULL || *pat == NUL || *pat == search_delim) |
| 7 | 1290 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1291 if (spats[RE_SEARCH].pat == NULL) // no previous pattern |
| 7 | 1292 { |
|
10172
ab45de65977b
commit https://github.com/vim/vim/commit/ea683da58cf9ecf3afab9d650d3d2da76e5298d3
Christian Brabandt <cb@256bit.org>
parents:
10064
diff
changeset
|
1293 searchstr = spats[RE_SUBST].pat; |
|
ab45de65977b
commit https://github.com/vim/vim/commit/ea683da58cf9ecf3afab9d650d3d2da76e5298d3
Christian Brabandt <cb@256bit.org>
parents:
10064
diff
changeset
|
1294 if (searchstr == NULL) |
| 2719 | 1295 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1296 emsg(_(e_noprevre)); |
| 2719 | 1297 retval = 0; |
| 1298 goto end_do_search; | |
| 1299 } | |
| 7 | 1300 } |
| 2719 | 1301 else |
| 1302 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1303 // make search_regcomp() use spats[RE_SEARCH].pat |
| 2719 | 1304 searchstr = (char_u *)""; |
| 1305 } | |
| 7 | 1306 } |
| 1307 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1308 if (pat != NULL && *pat != NUL) // look for (new) offset |
| 7 | 1309 { |
| 1310 /* | |
| 1311 * Find end of regular expression. | |
| 1312 * If there is a matching '/' or '?', toss it. | |
| 1313 */ | |
| 1314 ps = strcopy; | |
|
19892
5feb426d2ea1
patch 8.2.0502: Vim9: some code is not tested
Bram Moolenaar <Bram@vim.org>
parents:
19475
diff
changeset
|
1315 p = skip_regexp_ex(pat, search_delim, (int)p_magic, &strcopy, NULL); |
| 7 | 1316 if (strcopy != ps) |
| 1317 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1318 // made a copy of "pat" to change "\?" to "?" |
| 835 | 1319 searchcmdlen += (int)(STRLEN(pat) - STRLEN(strcopy)); |
| 7 | 1320 pat = strcopy; |
| 1321 searchstr = strcopy; | |
| 1322 } | |
|
19475
5512aa74cb62
patch 8.2.0295: highlighting for :s wrong when using different separator
Bram Moolenaar <Bram@vim.org>
parents:
19384
diff
changeset
|
1323 if (*p == search_delim) |
| 7 | 1324 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1325 dircp = p; // remember where we put the NUL |
| 7 | 1326 *p++ = NUL; |
| 1327 } | |
| 1328 spats[0].off.line = FALSE; | |
| 1329 spats[0].off.end = FALSE; | |
| 1330 spats[0].off.off = 0; | |
| 1331 /* | |
| 1332 * Check for a line offset or a character offset. | |
| 1333 * For get_address (echo off) we don't check for a character | |
| 1334 * offset, because it is meaningless and the 's' could be a | |
| 1335 * substitute command. | |
| 1336 */ | |
| 1337 if (*p == '+' || *p == '-' || VIM_ISDIGIT(*p)) | |
| 1338 spats[0].off.line = TRUE; | |
| 1339 else if ((options & SEARCH_OPT) && | |
| 1340 (*p == 'e' || *p == 's' || *p == 'b')) | |
| 1341 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1342 if (*p == 'e') // end |
| 7 | 1343 spats[0].off.end = SEARCH_END; |
| 1344 ++p; | |
| 1345 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1346 if (VIM_ISDIGIT(*p) || *p == '+' || *p == '-') // got an offset |
| 7 | 1347 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1348 // 'nr' or '+nr' or '-nr' |
| 7 | 1349 if (VIM_ISDIGIT(*p) || VIM_ISDIGIT(*(p + 1))) |
| 1350 spats[0].off.off = atol((char *)p); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1351 else if (*p == '-') // single '-' |
| 7 | 1352 spats[0].off.off = -1; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1353 else // single '+' |
| 7 | 1354 spats[0].off.off = 1; |
| 1355 ++p; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1356 while (VIM_ISDIGIT(*p)) // skip number |
| 7 | 1357 ++p; |
| 1358 } | |
| 1359 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1360 // compute length of search command for get_address() |
| 7 | 1361 searchcmdlen += (int)(p - pat); |
| 1362 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1363 pat = p; // put pat after search command |
| 7 | 1364 } |
| 1365 | |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1366 if ((options & SEARCH_ECHO) && messaging() && |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1367 !msg_silent && |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1368 (!cmd_silent || !shortmess(SHM_SEARCHCOUNT))) |
| 7 | 1369 { |
| 1370 char_u *trunc; | |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1371 char_u off_buf[40]; |
|
16762
97ad98d95214
patch 8.1.1383: warning for size_t/int mixup
Bram Moolenaar <Bram@vim.org>
parents:
16748
diff
changeset
|
1372 size_t off_len = 0; |
| 7 | 1373 |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1374 // Compute msg_row early. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1375 msg_start(); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1376 |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1377 // Get the offset, so we know how long it is. |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1378 if (!cmd_silent && |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1379 (spats[0].off.line || spats[0].off.end || spats[0].off.off)) |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1380 { |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1381 p = off_buf; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1382 *p++ = dirc; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1383 if (spats[0].off.end) |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1384 *p++ = 'e'; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1385 else if (!spats[0].off.line) |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1386 *p++ = 's'; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1387 if (spats[0].off.off > 0 || spats[0].off.line) |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1388 *p++ = '+'; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1389 *p = NUL; |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1390 if (spats[0].off.off != 0 || spats[0].off.line) |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1391 sprintf((char *)p, "%ld", spats[0].off.off); |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1392 off_len = STRLEN(off_buf); |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1393 } |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1394 |
| 7 | 1395 if (*searchstr == NUL) |
|
15089
e428882d6ffb
patch 8.1.0555: crash when last search pat is set but not last substitute pat
Bram Moolenaar <Bram@vim.org>
parents:
15083
diff
changeset
|
1396 p = spats[0].pat; |
| 7 | 1397 else |
| 1398 p = searchstr; | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1399 |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1400 if (!shortmess(SHM_SEARCHCOUNT) || cmd_silent) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1401 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1402 // Reserve enough space for the search pattern + offset + |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1403 // search stat. Use all the space available, so that the |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1404 // search state is right aligned. If there is not enough space |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1405 // msg_strtrunc() will shorten in the middle. |
|
17948
c77a41ea0365
patch 8.1.1970: search stat space wrong, no test for 8.1.1965
Bram Moolenaar <Bram@vim.org>
parents:
17938
diff
changeset
|
1406 if (msg_scrolled != 0 && !cmd_silent) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1407 // Use all the columns. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1408 len = (int)(Rows - msg_row) * Columns - 1; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1409 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1410 // Use up to 'showcmd' column. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1411 len = (int)(Rows - msg_row - 1) * Columns + sc_col - 1; |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1412 if (len < STRLEN(p) + off_len + SEARCH_STAT_BUF_LEN + 3) |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1413 len = STRLEN(p) + off_len + SEARCH_STAT_BUF_LEN + 3; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1414 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1415 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1416 // Reserve enough space for the search pattern + offset. |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1417 len = STRLEN(p) + off_len + 3; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1418 |
|
19977
545bdbc36f29
patch 8.2.0544: memory leak in search test
Bram Moolenaar <Bram@vim.org>
parents:
19892
diff
changeset
|
1419 vim_free(msgbuf); |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16776
diff
changeset
|
1420 msgbuf = alloc(len); |
| 7 | 1421 if (msgbuf != NULL) |
| 1422 { | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1423 vim_memset(msgbuf, ' ', len); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1424 msgbuf[len - 1] = NUL; |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1425 // do not fill the msgbuf buffer, if cmd_silent is set, leave it |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1426 // empty for the search_stat feature. |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1427 if (!cmd_silent) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1428 { |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1429 msgbuf[0] = dirc; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1430 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1431 if (enc_utf8 && utf_iscomposing(utf_ptr2char(p))) |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1432 { |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1433 // Use a space to draw the composing char on. |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1434 msgbuf[1] = ' '; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1435 mch_memmove(msgbuf + 2, p, STRLEN(p)); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1436 } |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1437 else |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1438 mch_memmove(msgbuf + 1, p, STRLEN(p)); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1439 if (off_len > 0) |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1440 mch_memmove(msgbuf + STRLEN(p) + 1, off_buf, off_len); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1441 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1442 trunc = msg_strtrunc(msgbuf, TRUE); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1443 if (trunc != NULL) |
| 7 | 1444 { |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1445 vim_free(msgbuf); |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1446 msgbuf = trunc; |
| 7 | 1447 } |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1448 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1449 #ifdef FEAT_RIGHTLEFT |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1450 // The search pattern could be shown on the right in rightleft |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1451 // mode, but the 'ruler' and 'showcmd' area use it too, thus |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1452 // it would be blanked out again very soon. Show it on the |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1453 // left, but do reverse the text. |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1454 if (curwin->w_p_rl && *curwin->w_p_rlc == 's') |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1455 { |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1456 char_u *r; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1457 size_t pat_len; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1458 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1459 r = reverse_text(msgbuf); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1460 if (r != NULL) |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1461 { |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1462 vim_free(msgbuf); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1463 msgbuf = r; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1464 // move reversed text to beginning of buffer |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1465 while (*r != NUL && *r == ' ') |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1466 r++; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1467 pat_len = msgbuf + STRLEN(msgbuf) - r; |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1468 mch_memmove(msgbuf, r, pat_len); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1469 // overwrite old text |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1470 if ((size_t)(r - msgbuf) >= pat_len) |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1471 vim_memset(r, ' ', pat_len); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1472 else |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1473 vim_memset(msgbuf + pat_len, ' ', r - msgbuf); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1474 } |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1475 } |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1476 #endif |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1477 msg_outtrans(msgbuf); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1478 msg_clr_eos(); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1479 msg_check(); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1480 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1481 gotocmdline(FALSE); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1482 out_flush(); |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1483 msg_nowait = TRUE; // don't wait for this message |
| 7 | 1484 } |
| 1485 } | |
| 1486 } | |
| 1487 | |
| 1488 /* | |
| 1489 * If there is a character offset, subtract it from the current | |
| 1490 * position, so we don't get stuck at "?pat?e+2" or "/pat/s-2". | |
| 8 | 1491 * Skip this if pos.col is near MAXCOL (closed fold). |
| 7 | 1492 * This is not done for a line offset, because then we would not be vi |
| 1493 * compatible. | |
| 1494 */ | |
| 8 | 1495 if (!spats[0].off.line && spats[0].off.off && pos.col < MAXCOL - 2) |
| 7 | 1496 { |
| 1497 if (spats[0].off.off > 0) | |
| 1498 { | |
| 1499 for (c = spats[0].off.off; c; --c) | |
| 1500 if (decl(&pos) == -1) | |
| 1501 break; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1502 if (c) // at start of buffer |
| 7 | 1503 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1504 pos.lnum = 0; // allow lnum == 0 here |
| 7 | 1505 pos.col = MAXCOL; |
| 1506 } | |
| 1507 } | |
| 1508 else | |
| 1509 { | |
| 1510 for (c = spats[0].off.off; c; ++c) | |
| 1511 if (incl(&pos) == -1) | |
| 1512 break; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1513 if (c) // at end of buffer |
| 7 | 1514 { |
| 1515 pos.lnum = curbuf->b_ml.ml_line_count + 1; | |
| 1516 pos.col = 0; | |
| 1517 } | |
| 1518 } | |
| 1519 } | |
| 1520 | |
|
15850
a6ca8cf07a98
patch 8.1.0932: Farsi support is outdated and unused
Bram Moolenaar <Bram@vim.org>
parents:
15758
diff
changeset
|
1521 c = searchit(curwin, curbuf, &pos, NULL, |
|
a6ca8cf07a98
patch 8.1.0932: Farsi support is outdated and unused
Bram Moolenaar <Bram@vim.org>
parents:
15758
diff
changeset
|
1522 dirc == '/' ? FORWARD : BACKWARD, |
| 7 | 1523 searchstr, count, spats[0].off.end + (options & |
| 1524 (SEARCH_KEEP + SEARCH_PEEK + SEARCH_HIS | |
| 1525 + SEARCH_MSG + SEARCH_START | |
| 1526 + ((pat != NULL && *pat == ';') ? 0 : SEARCH_NOOF))), | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1527 RE_LAST, sia); |
| 7 | 1528 |
| 1529 if (dircp != NULL) | |
|
19475
5512aa74cb62
patch 8.2.0295: highlighting for :s wrong when using different separator
Bram Moolenaar <Bram@vim.org>
parents:
19384
diff
changeset
|
1530 *dircp = search_delim; // restore second '/' or '?' for normal_cmd() |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1531 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1532 if (!shortmess(SHM_SEARCH) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1533 && ((dirc == '/' && LT_POS(pos, curwin->w_cursor)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1534 || (dirc == '?' && LT_POS(curwin->w_cursor, pos)))) |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
1535 show_top_bot_msg = TRUE; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1536 |
| 7 | 1537 if (c == FAIL) |
| 1538 { | |
| 1539 retval = 0; | |
| 1540 goto end_do_search; | |
| 1541 } | |
| 1542 if (spats[0].off.end && oap != NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1543 oap->inclusive = TRUE; // 'e' includes last character |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1544 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1545 retval = 1; // pattern found |
| 7 | 1546 |
| 1547 /* | |
| 1548 * Add character and/or line offset | |
| 1549 */ | |
| 945 | 1550 if (!(options & SEARCH_NOOF) || (pat != NULL && *pat == ';')) |
| 7 | 1551 { |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1552 pos_T org_pos = pos; |
|
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1553 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1554 if (spats[0].off.line) // Add the offset to the line number. |
| 7 | 1555 { |
| 1556 c = pos.lnum + spats[0].off.off; | |
| 1557 if (c < 1) | |
| 1558 pos.lnum = 1; | |
| 1559 else if (c > curbuf->b_ml.ml_line_count) | |
| 1560 pos.lnum = curbuf->b_ml.ml_line_count; | |
| 1561 else | |
| 1562 pos.lnum = c; | |
| 1563 pos.col = 0; | |
| 1564 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1565 retval = 2; // pattern found, line offset added |
| 7 | 1566 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1567 else if (pos.col < MAXCOL - 2) // just in case |
| 7 | 1568 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1569 // to the right, check for end of file |
| 1624 | 1570 c = spats[0].off.off; |
| 1571 if (c > 0) | |
| 7 | 1572 { |
| 1624 | 1573 while (c-- > 0) |
| 7 | 1574 if (incl(&pos) == -1) |
| 1575 break; | |
| 1576 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1577 // to the left, check for start of file |
| 7 | 1578 else |
| 1579 { | |
| 1624 | 1580 while (c++ < 0) |
| 1581 if (decl(&pos) == -1) | |
| 1582 break; | |
| 7 | 1583 } |
| 1584 } | |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1585 if (!EQUAL_POS(pos, org_pos)) |
|
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1586 has_offset = TRUE; |
| 7 | 1587 } |
| 1588 | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1589 // Show [1/15] if 'S' is not in 'shortmess'. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1590 if ((options & SEARCH_ECHO) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1591 && messaging() |
|
17938
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1592 && !msg_silent |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1593 && c != FAIL |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1594 && !shortmess(SHM_SEARCHCOUNT) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1595 && msgbuf != NULL) |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1596 search_stat(dirc, &pos, show_top_bot_msg, msgbuf, |
|
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1597 (count != 1 || has_offset)); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1598 |
| 7 | 1599 /* |
| 1600 * The search command can be followed by a ';' to do another search. | |
| 1601 * For example: "/pat/;/foo/+3;?bar" | |
| 1602 * This is like doing another search command, except: | |
| 1603 * - The remembered direction '/' or '?' is from the first search. | |
| 1604 * - When an error happens the cursor isn't moved at all. | |
| 1605 * Don't do this when called by get_address() (it handles ';' itself). | |
| 1606 */ | |
| 1607 if (!(options & SEARCH_OPT) || pat == NULL || *pat != ';') | |
| 1608 break; | |
| 1609 | |
| 1610 dirc = *++pat; | |
|
19475
5512aa74cb62
patch 8.2.0295: highlighting for :s wrong when using different separator
Bram Moolenaar <Bram@vim.org>
parents:
19384
diff
changeset
|
1611 search_delim = dirc; |
| 7 | 1612 if (dirc != '?' && dirc != '/') |
| 1613 { | |
| 1614 retval = 0; | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1615 emsg(_("E386: Expected '?' or '/' after ';'")); |
| 7 | 1616 goto end_do_search; |
| 1617 } | |
| 1618 ++pat; | |
| 1619 } | |
| 1620 | |
| 1621 if (options & SEARCH_MARK) | |
| 1622 setpcmark(); | |
| 1623 curwin->w_cursor = pos; | |
| 1624 curwin->w_set_curswant = TRUE; | |
| 1625 | |
| 1626 end_do_search: | |
| 5616 | 1627 if ((options & SEARCH_KEEP) || cmdmod.keeppatterns) |
| 7 | 1628 spats[0].off = old_off; |
| 1629 vim_free(strcopy); | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1630 vim_free(msgbuf); |
| 7 | 1631 |
| 1632 return retval; | |
| 1633 } | |
| 1634 | |
| 1635 /* | |
| 1636 * search_for_exact_line(buf, pos, dir, pat) | |
| 1637 * | |
| 1638 * Search for a line starting with the given pattern (ignoring leading | |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
1639 * white-space), starting from pos and going in direction "dir". "pos" will |
| 7 | 1640 * contain the position of the match found. Blank lines match only if |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
1641 * ADDING is set. If p_ic is set then the pattern must be in lowercase. |
| 7 | 1642 * Return OK for success, or FAIL if no line found. |
| 1643 */ | |
| 1644 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1645 search_for_exact_line( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1646 buf_T *buf, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1647 pos_T *pos, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1648 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1649 char_u *pat) |
| 7 | 1650 { |
| 1651 linenr_T start = 0; | |
| 1652 char_u *ptr; | |
| 1653 char_u *p; | |
| 1654 | |
| 1655 if (buf->b_ml.ml_line_count == 0) | |
| 1656 return FAIL; | |
| 1657 for (;;) | |
| 1658 { | |
| 1659 pos->lnum += dir; | |
| 1660 if (pos->lnum < 1) | |
| 1661 { | |
| 1662 if (p_ws) | |
| 1663 { | |
| 1664 pos->lnum = buf->b_ml.ml_line_count; | |
| 1665 if (!shortmess(SHM_SEARCH)) | |
| 1666 give_warning((char_u *)_(top_bot_msg), TRUE); | |
| 1667 } | |
| 1668 else | |
| 1669 { | |
| 1670 pos->lnum = 1; | |
| 1671 break; | |
| 1672 } | |
| 1673 } | |
| 1674 else if (pos->lnum > buf->b_ml.ml_line_count) | |
| 1675 { | |
| 1676 if (p_ws) | |
| 1677 { | |
| 1678 pos->lnum = 1; | |
| 1679 if (!shortmess(SHM_SEARCH)) | |
| 1680 give_warning((char_u *)_(bot_top_msg), TRUE); | |
| 1681 } | |
| 1682 else | |
| 1683 { | |
| 1684 pos->lnum = 1; | |
| 1685 break; | |
| 1686 } | |
| 1687 } | |
| 1688 if (pos->lnum == start) | |
| 1689 break; | |
| 1690 if (start == 0) | |
| 1691 start = pos->lnum; | |
| 1692 ptr = ml_get_buf(buf, pos->lnum, FALSE); | |
| 1693 p = skipwhite(ptr); | |
| 1694 pos->col = (colnr_T) (p - ptr); | |
| 1695 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1696 // when adding lines the matching line may be empty but it is not |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1697 // ignored because we are interested in the next line -- Acevedo |
| 449 | 1698 if ((compl_cont_status & CONT_ADDING) |
| 1699 && !(compl_cont_status & CONT_SOL)) | |
| 7 | 1700 { |
| 1701 if ((p_ic ? MB_STRICMP(p, pat) : STRCMP(p, pat)) == 0) | |
| 1702 return OK; | |
| 1703 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1704 else if (*p != NUL) // ignore empty lines |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1705 { // expanding lines or words |
| 449 | 1706 if ((p_ic ? MB_STRNICMP(p, pat, compl_length) |
| 1707 : STRNCMP(p, pat, compl_length)) == 0) | |
| 7 | 1708 return OK; |
| 1709 } | |
| 1710 } | |
| 1711 return FAIL; | |
| 1712 } | |
| 1713 | |
| 1714 /* | |
| 1715 * Character Searches | |
| 1716 */ | |
| 1717 | |
| 1718 /* | |
| 1719 * Search for a character in a line. If "t_cmd" is FALSE, move to the | |
| 1720 * position of the character, otherwise move to just before the char. | |
| 1721 * Do this "cap->count1" times. | |
| 1722 * Return FAIL or OK. | |
| 1723 */ | |
| 1724 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1725 searchc(cmdarg_T *cap, int t_cmd) |
| 7 | 1726 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1727 int c = cap->nchar; // char to search for |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1728 int dir = cap->arg; // TRUE for searching forward |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1729 long count = cap->count1; // repeat count |
| 7 | 1730 int col; |
| 1731 char_u *p; | |
| 1732 int len; | |
| 2925 | 1733 int stop = TRUE; |
| 7 | 1734 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1735 if (c != NUL) // normal search: remember args for repeat |
| 7 | 1736 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1737 if (!KeyStuffed) // don't remember when redoing |
| 7 | 1738 { |
| 6991 | 1739 *lastc = c; |
| 1740 set_csearch_direction(dir); | |
| 1741 set_csearch_until(t_cmd); | |
| 1742 lastc_bytelen = (*mb_char2bytes)(c, lastc_bytes); | |
| 7 | 1743 if (cap->ncharC1 != 0) |
| 1744 { | |
| 6991 | 1745 lastc_bytelen += (*mb_char2bytes)(cap->ncharC1, |
| 1746 lastc_bytes + lastc_bytelen); | |
| 7 | 1747 if (cap->ncharC2 != 0) |
| 6991 | 1748 lastc_bytelen += (*mb_char2bytes)(cap->ncharC2, |
| 1749 lastc_bytes + lastc_bytelen); | |
| 7 | 1750 } |
| 1751 } | |
| 1752 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1753 else // repeat previous search |
| 7 | 1754 { |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
1755 if (*lastc == NUL && lastc_bytelen == 1) |
| 7 | 1756 return FAIL; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1757 if (dir) // repeat in opposite direction |
| 7 | 1758 dir = -lastcdir; |
| 1759 else | |
| 1760 dir = lastcdir; | |
| 1761 t_cmd = last_t_cmd; | |
| 6991 | 1762 c = *lastc; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1763 // For multi-byte re-use last lastc_bytes[] and lastc_bytelen. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1764 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1765 // Force a move of at least one char, so ";" and "," will move the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1766 // cursor, even if the cursor is right in front of char we are looking |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1767 // at. |
| 2947 | 1768 if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1 && t_cmd) |
| 2925 | 1769 stop = FALSE; |
| 7 | 1770 } |
| 1771 | |
| 530 | 1772 if (dir == BACKWARD) |
| 1773 cap->oap->inclusive = FALSE; | |
| 1774 else | |
| 1775 cap->oap->inclusive = TRUE; | |
| 1776 | |
| 7 | 1777 p = ml_get_curline(); |
| 1778 col = curwin->w_cursor.col; | |
| 1779 len = (int)STRLEN(p); | |
| 1780 | |
| 1781 while (count--) | |
| 1782 { | |
| 1783 if (has_mbyte) | |
| 1784 { | |
| 1785 for (;;) | |
| 1786 { | |
| 1787 if (dir > 0) | |
| 1788 { | |
| 474 | 1789 col += (*mb_ptr2len)(p + col); |
| 7 | 1790 if (col >= len) |
| 1791 return FAIL; | |
| 1792 } | |
| 1793 else | |
| 1794 { | |
| 1795 if (col == 0) | |
| 1796 return FAIL; | |
| 1797 col -= (*mb_head_off)(p, p + col - 1) + 1; | |
| 1798 } | |
| 6991 | 1799 if (lastc_bytelen == 1) |
| 7 | 1800 { |
| 2925 | 1801 if (p[col] == c && stop) |
| 7 | 1802 break; |
| 1803 } | |
|
11018
654fc5636b37
patch 8.0.0398: illegal memory access with "t"
Christian Brabandt <cb@256bit.org>
parents:
10900
diff
changeset
|
1804 else if (STRNCMP(p + col, lastc_bytes, lastc_bytelen) == 0 |
|
10430
37a441352da2
commit https://github.com/vim/vim/commit/b129a447f3b580d4c941869672b0557c52c37e4d
Christian Brabandt <cb@256bit.org>
parents:
10277
diff
changeset
|
1805 && stop) |
|
11018
654fc5636b37
patch 8.0.0398: illegal memory access with "t"
Christian Brabandt <cb@256bit.org>
parents:
10900
diff
changeset
|
1806 break; |
| 2925 | 1807 stop = TRUE; |
| 7 | 1808 } |
| 1809 } | |
| 1810 else | |
| 1811 { | |
| 1812 for (;;) | |
| 1813 { | |
| 1814 if ((col += dir) < 0 || col >= len) | |
| 1815 return FAIL; | |
| 2925 | 1816 if (p[col] == c && stop) |
| 7 | 1817 break; |
| 2925 | 1818 stop = TRUE; |
| 7 | 1819 } |
| 1820 } | |
| 1821 } | |
| 1822 | |
| 1823 if (t_cmd) | |
| 1824 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1825 // backup to before the character (possibly double-byte) |
| 7 | 1826 col -= dir; |
| 1827 if (has_mbyte) | |
| 1828 { | |
| 1829 if (dir < 0) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1830 // Landed on the search char which is lastc_bytelen long |
| 6991 | 1831 col += lastc_bytelen - 1; |
| 7 | 1832 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1833 // To previous char, which may be multi-byte. |
| 7 | 1834 col -= (*mb_head_off)(p, p + col); |
| 1835 } | |
| 1836 } | |
| 1837 curwin->w_cursor.col = col; | |
| 1838 | |
| 1839 return OK; | |
| 1840 } | |
| 1841 | |
| 1842 /* | |
| 1843 * "Other" Searches | |
| 1844 */ | |
| 1845 | |
| 1846 /* | |
| 1847 * findmatch - find the matching paren or brace | |
| 1848 * | |
| 1849 * Improvement over vi: Braces inside quotes are ignored. | |
| 1850 */ | |
| 1851 pos_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1852 findmatch(oparg_T *oap, int initc) |
| 7 | 1853 { |
| 1854 return findmatchlimit(oap, initc, 0, 0); | |
| 1855 } | |
| 1856 | |
| 1857 /* | |
| 1858 * Return TRUE if the character before "linep[col]" equals "ch". | |
| 1859 * Return FALSE if "col" is zero. | |
| 1860 * Update "*prevcol" to the column of the previous character, unless "prevcol" | |
| 1861 * is NULL. | |
| 1862 * Handles multibyte string correctly. | |
| 1863 */ | |
| 1864 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1865 check_prevcol( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1866 char_u *linep, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1867 int col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1868 int ch, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1869 int *prevcol) |
| 7 | 1870 { |
| 1871 --col; | |
| 1872 if (col > 0 && has_mbyte) | |
| 1873 col -= (*mb_head_off)(linep, linep + col); | |
| 1874 if (prevcol) | |
| 1875 *prevcol = col; | |
| 1876 return (col >= 0 && linep[col] == ch) ? TRUE : FALSE; | |
| 1877 } | |
| 1878 | |
| 6971 | 1879 /* |
| 1880 * Raw string start is found at linep[startpos.col - 1]. | |
| 1881 * Return TRUE if the matching end can be found between startpos and endpos. | |
| 1882 */ | |
| 1883 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1884 find_rawstring_end(char_u *linep, pos_T *startpos, pos_T *endpos) |
| 6971 | 1885 { |
| 1886 char_u *p; | |
| 1887 char_u *delim_copy; | |
| 1888 size_t delim_len; | |
| 1889 linenr_T lnum; | |
| 1890 int found = FALSE; | |
| 1891 | |
| 1892 for (p = linep + startpos->col + 1; *p && *p != '('; ++p) | |
| 1893 ; | |
| 1894 delim_len = (p - linep) - startpos->col - 1; | |
|
7054
3a1a6d6fb9b3
commit https://github.com/vim/vim/commit/6ed535dbc0981d328c02e139d6505207cbef4835
Christian Brabandt <cb@256bit.org>
parents:
7019
diff
changeset
|
1895 delim_copy = vim_strnsave(linep + startpos->col + 1, (int)delim_len); |
| 6971 | 1896 if (delim_copy == NULL) |
| 1897 return FALSE; | |
| 1898 for (lnum = startpos->lnum; lnum <= endpos->lnum; ++lnum) | |
| 1899 { | |
| 1900 char_u *line = ml_get(lnum); | |
| 1901 | |
| 1902 for (p = line + (lnum == startpos->lnum | |
| 1903 ? startpos->col + 1 : 0); *p; ++p) | |
| 1904 { | |
| 1905 if (lnum == endpos->lnum && (colnr_T)(p - line) >= endpos->col) | |
| 1906 break; | |
| 1907 if (*p == ')' && p[delim_len + 1] == '"' | |
| 1908 && STRNCMP(delim_copy, p + 1, delim_len) == 0) | |
| 1909 { | |
| 1910 found = TRUE; | |
| 1911 break; | |
| 1912 } | |
| 1913 } | |
| 1914 if (found) | |
| 1915 break; | |
| 1916 } | |
| 1917 vim_free(delim_copy); | |
| 1918 return found; | |
| 1919 } | |
| 1920 | |
| 7 | 1921 /* |
|
18681
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1922 * Check matchpairs option for "*initc". |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1923 * If there is a match set "*initc" to the matching character and "*findc" to |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1924 * the opposite character. Set "*backwards" to the direction. |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1925 * When "switchit" is TRUE swap the direction. |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1926 */ |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1927 static void |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1928 find_mps_values( |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1929 int *initc, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1930 int *findc, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1931 int *backwards, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1932 int switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1933 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1934 char_u *ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1935 |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1936 ptr = curbuf->b_p_mps; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1937 while (*ptr != NUL) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1938 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1939 if (has_mbyte) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1940 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1941 char_u *prev; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1942 |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1943 if (mb_ptr2char(ptr) == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1944 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1945 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1946 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1947 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1948 *initc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1949 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1950 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1951 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1952 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1953 *findc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1954 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1955 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1956 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1957 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1958 prev = ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1959 ptr += mb_ptr2len(ptr) + 1; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1960 if (mb_ptr2char(ptr) == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1961 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1962 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1963 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1964 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1965 *initc = mb_ptr2char(prev); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1966 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1967 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1968 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1969 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1970 *findc = mb_ptr2char(prev); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1971 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1972 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1973 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1974 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1975 ptr += mb_ptr2len(ptr); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1976 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1977 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1978 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1979 if (*ptr == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1980 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1981 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1982 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1983 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1984 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1985 *initc = ptr[2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1986 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1987 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1988 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1989 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1990 *findc = ptr[2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1991 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1992 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1993 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1994 ptr += 2; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1995 if (*ptr == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1996 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1997 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1998 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1999 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2000 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2001 *initc = ptr[-2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2002 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2003 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2004 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2005 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2006 *findc = ptr[-2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2007 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2008 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2009 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2010 ++ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2011 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2012 if (*ptr == ',') |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2013 ++ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2014 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2015 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2016 |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2017 /* |
| 7 | 2018 * findmatchlimit -- find the matching paren or brace, if it exists within |
| 6971 | 2019 * maxtravel lines of the cursor. A maxtravel of 0 means search until falling |
| 2020 * off the edge of the file. | |
| 7 | 2021 * |
| 2022 * "initc" is the character to find a match for. NUL means to find the | |
| 6971 | 2023 * character at or after the cursor. Special values: |
| 2024 * '*' look for C-style comment / * | |
| 2025 * '/' look for C-style comment / *, ignoring comment-end | |
| 2026 * '#' look for preprocessor directives | |
| 2027 * 'R' look for raw string start: R"delim(text)delim" (only backwards) | |
| 7 | 2028 * |
| 2029 * flags: FM_BACKWARD search backwards (when initc is '/', '*' or '#') | |
| 2030 * FM_FORWARD search forwards (when initc is '/', '*' or '#') | |
| 2031 * FM_BLOCKSTOP stop at start/end of block ({ or } in column 0) | |
| 2032 * FM_SKIPCOMM skip comments (not implemented yet!) | |
| 523 | 2033 * |
| 6971 | 2034 * "oap" is only used to set oap->motion_type for a linewise motion, it can be |
| 523 | 2035 * NULL |
| 7 | 2036 */ |
| 2037 | |
| 2038 pos_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2039 findmatchlimit( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2040 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2041 int initc, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2042 int flags, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2043 int maxtravel) |
| 7 | 2044 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2045 static pos_T pos; // current search position |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2046 int findc = 0; // matching brace |
| 7 | 2047 int c; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2048 int count = 0; // cumulative number of braces |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2049 int backwards = FALSE; // init for gcc |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2050 int raw_string = FALSE; // search for raw string |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2051 int inquote = FALSE; // TRUE when inside quotes |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2052 char_u *linep; // pointer to current line |
| 7 | 2053 char_u *ptr; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2054 int do_quotes; // check for quotes in current line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2055 int at_start; // do_quotes value at start position |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2056 int hash_dir = 0; // Direction searched for # things |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2057 int comment_dir = 0; // Direction searched for comments |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2058 pos_T match_pos; // Where last slash-star was found |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2059 int start_in_quotes; // start position is in quotes |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2060 int traveled = 0; // how far we've searched so far |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2061 int ignore_cend = FALSE; // ignore comment end |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2062 int cpo_match; // vi compatible matching |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2063 int cpo_bsl; // don't recognize backslashes |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2064 int match_escaped = 0; // search for escaped match |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2065 int dir; // Direction to search |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2066 int comment_col = MAXCOL; // start of / / comment |
| 14 | 2067 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2068 int lispcomm = FALSE; // inside of Lisp-style comment |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2069 int lisp = curbuf->b_p_lisp; // engage Lisp-specific hacks ;) |
| 14 | 2070 #endif |
| 7 | 2071 |
| 2072 pos = curwin->w_cursor; | |
| 5304 | 2073 pos.coladd = 0; |
| 7 | 2074 linep = ml_get(pos.lnum); |
| 2075 | |
| 2076 cpo_match = (vim_strchr(p_cpo, CPO_MATCH) != NULL); | |
| 2077 cpo_bsl = (vim_strchr(p_cpo, CPO_MATCHBSL) != NULL); | |
| 2078 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2079 // Direction to search when initc is '/', '*' or '#' |
| 7 | 2080 if (flags & FM_BACKWARD) |
| 2081 dir = BACKWARD; | |
| 2082 else if (flags & FM_FORWARD) | |
| 2083 dir = FORWARD; | |
| 2084 else | |
| 2085 dir = 0; | |
| 2086 | |
| 2087 /* | |
| 2088 * if initc given, look in the table for the matching character | |
| 2089 * '/' and '*' are special cases: look for start or end of comment. | |
| 2090 * When '/' is used, we ignore running backwards into an star-slash, for | |
| 2091 * "[*" command, we just want to find any comment. | |
| 2092 */ | |
| 6971 | 2093 if (initc == '/' || initc == '*' || initc == 'R') |
| 7 | 2094 { |
| 2095 comment_dir = dir; | |
| 2096 if (initc == '/') | |
| 2097 ignore_cend = TRUE; | |
| 2098 backwards = (dir == FORWARD) ? FALSE : TRUE; | |
| 6971 | 2099 raw_string = (initc == 'R'); |
| 7 | 2100 initc = NUL; |
| 2101 } | |
| 2102 else if (initc != '#' && initc != NUL) | |
| 2103 { | |
| 4029 | 2104 find_mps_values(&initc, &findc, &backwards, TRUE); |
| 2105 if (findc == NUL) | |
| 7 | 2106 return NULL; |
| 2107 } | |
| 2108 else | |
| 2109 { | |
| 6971 | 2110 /* |
| 2111 * Either initc is '#', or no initc was given and we need to look | |
| 2112 * under the cursor. | |
| 2113 */ | |
| 7 | 2114 if (initc == '#') |
| 2115 { | |
| 2116 hash_dir = dir; | |
| 2117 } | |
| 2118 else | |
| 2119 { | |
| 2120 /* | |
| 2121 * initc was not given, must look for something to match under | |
| 2122 * or near the cursor. | |
| 2123 * Only check for special things when 'cpo' doesn't have '%'. | |
| 2124 */ | |
| 2125 if (!cpo_match) | |
| 2126 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2127 // Are we before or at #if, #else etc.? |
| 7 | 2128 ptr = skipwhite(linep); |
| 2129 if (*ptr == '#' && pos.col <= (colnr_T)(ptr - linep)) | |
| 2130 { | |
| 2131 ptr = skipwhite(ptr + 1); | |
| 2132 if ( STRNCMP(ptr, "if", 2) == 0 | |
| 2133 || STRNCMP(ptr, "endif", 5) == 0 | |
| 2134 || STRNCMP(ptr, "el", 2) == 0) | |
| 2135 hash_dir = 1; | |
| 2136 } | |
| 2137 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2138 // Are we on a comment? |
| 7 | 2139 else if (linep[pos.col] == '/') |
| 2140 { | |
| 2141 if (linep[pos.col + 1] == '*') | |
| 2142 { | |
| 2143 comment_dir = FORWARD; | |
| 2144 backwards = FALSE; | |
| 2145 pos.col++; | |
| 2146 } | |
| 2147 else if (pos.col > 0 && linep[pos.col - 1] == '*') | |
| 2148 { | |
| 2149 comment_dir = BACKWARD; | |
| 2150 backwards = TRUE; | |
| 2151 pos.col--; | |
| 2152 } | |
| 2153 } | |
| 2154 else if (linep[pos.col] == '*') | |
| 2155 { | |
| 2156 if (linep[pos.col + 1] == '/') | |
| 2157 { | |
| 2158 comment_dir = BACKWARD; | |
| 2159 backwards = TRUE; | |
| 2160 } | |
| 2161 else if (pos.col > 0 && linep[pos.col - 1] == '/') | |
| 2162 { | |
| 2163 comment_dir = FORWARD; | |
| 2164 backwards = FALSE; | |
| 2165 } | |
| 2166 } | |
| 2167 } | |
| 2168 | |
| 2169 /* | |
| 2170 * If we are not on a comment or the # at the start of a line, then | |
| 2171 * look for brace anywhere on this line after the cursor. | |
| 2172 */ | |
| 2173 if (!hash_dir && !comment_dir) | |
| 2174 { | |
| 2175 /* | |
| 2176 * Find the brace under or after the cursor. | |
| 2177 * If beyond the end of the line, use the last character in | |
| 2178 * the line. | |
| 2179 */ | |
| 2180 if (linep[pos.col] == NUL && pos.col) | |
| 2181 --pos.col; | |
| 2182 for (;;) | |
| 2183 { | |
| 4029 | 2184 initc = PTR2CHAR(linep + pos.col); |
| 7 | 2185 if (initc == NUL) |
| 2186 break; | |
| 2187 | |
| 4029 | 2188 find_mps_values(&initc, &findc, &backwards, FALSE); |
| 7 | 2189 if (findc) |
| 2190 break; | |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2191 pos.col += mb_ptr2len(linep + pos.col); |
| 7 | 2192 } |
| 2193 if (!findc) | |
| 2194 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2195 // no brace in the line, maybe use " #if" then |
| 7 | 2196 if (!cpo_match && *skipwhite(linep) == '#') |
| 2197 hash_dir = 1; | |
| 2198 else | |
| 2199 return NULL; | |
| 2200 } | |
| 2201 else if (!cpo_bsl) | |
| 2202 { | |
| 2203 int col, bslcnt = 0; | |
| 2204 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2205 // Set "match_escaped" if there are an odd number of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2206 // backslashes. |
| 7 | 2207 for (col = pos.col; check_prevcol(linep, col, '\\', &col);) |
| 2208 bslcnt++; | |
| 2209 match_escaped = (bslcnt & 1); | |
| 2210 } | |
| 2211 } | |
| 2212 } | |
| 2213 if (hash_dir) | |
| 2214 { | |
| 2215 /* | |
| 2216 * Look for matching #if, #else, #elif, or #endif | |
| 2217 */ | |
| 2218 if (oap != NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2219 oap->motion_type = MLINE; // Linewise for this case only |
| 7 | 2220 if (initc != '#') |
| 2221 { | |
| 2222 ptr = skipwhite(skipwhite(linep) + 1); | |
| 2223 if (STRNCMP(ptr, "if", 2) == 0 || STRNCMP(ptr, "el", 2) == 0) | |
| 2224 hash_dir = 1; | |
| 2225 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2226 hash_dir = -1; | |
| 2227 else | |
| 2228 return NULL; | |
| 2229 } | |
| 2230 pos.col = 0; | |
| 2231 while (!got_int) | |
| 2232 { | |
| 2233 if (hash_dir > 0) | |
| 2234 { | |
| 2235 if (pos.lnum == curbuf->b_ml.ml_line_count) | |
| 2236 break; | |
| 2237 } | |
| 2238 else if (pos.lnum == 1) | |
| 2239 break; | |
| 2240 pos.lnum += hash_dir; | |
| 2241 linep = ml_get(pos.lnum); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2242 line_breakcheck(); // check for CTRL-C typed |
| 7 | 2243 ptr = skipwhite(linep); |
| 2244 if (*ptr != '#') | |
| 2245 continue; | |
| 2246 pos.col = (colnr_T) (ptr - linep); | |
| 2247 ptr = skipwhite(ptr + 1); | |
| 2248 if (hash_dir > 0) | |
| 2249 { | |
| 2250 if (STRNCMP(ptr, "if", 2) == 0) | |
| 2251 count++; | |
| 2252 else if (STRNCMP(ptr, "el", 2) == 0) | |
| 2253 { | |
| 2254 if (count == 0) | |
| 2255 return &pos; | |
| 2256 } | |
| 2257 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2258 { | |
| 2259 if (count == 0) | |
| 2260 return &pos; | |
| 2261 count--; | |
| 2262 } | |
| 2263 } | |
| 2264 else | |
| 2265 { | |
| 2266 if (STRNCMP(ptr, "if", 2) == 0) | |
| 2267 { | |
| 2268 if (count == 0) | |
| 2269 return &pos; | |
| 2270 count--; | |
| 2271 } | |
| 2272 else if (initc == '#' && STRNCMP(ptr, "el", 2) == 0) | |
| 2273 { | |
| 2274 if (count == 0) | |
| 2275 return &pos; | |
| 2276 } | |
| 2277 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2278 count++; | |
| 2279 } | |
| 2280 } | |
| 2281 return NULL; | |
| 2282 } | |
| 2283 } | |
| 2284 | |
| 2285 #ifdef FEAT_RIGHTLEFT | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2286 // This is just guessing: when 'rightleft' is set, search for a matching |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2287 // paren/brace in the other direction. |
| 7 | 2288 if (curwin->w_p_rl && vim_strchr((char_u *)"()[]{}<>", initc) != NULL) |
| 2289 backwards = !backwards; | |
| 2290 #endif | |
| 2291 | |
| 2292 do_quotes = -1; | |
| 2293 start_in_quotes = MAYBE; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
2294 CLEAR_POS(&match_pos); |
| 699 | 2295 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2296 // backward search: Check if this line contains a single-line comment |
| 14 | 2297 if ((backwards && comment_dir) |
| 2298 #ifdef FEAT_LISP | |
| 2299 || lisp | |
| 2300 #endif | |
| 2301 ) | |
| 7 | 2302 comment_col = check_linecomment(linep); |
| 14 | 2303 #ifdef FEAT_LISP |
| 2304 if (lisp && comment_col != MAXCOL && pos.col > (colnr_T)comment_col) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2305 lispcomm = TRUE; // find match inside this comment |
| 14 | 2306 #endif |
| 7 | 2307 while (!got_int) |
| 2308 { | |
| 2309 /* | |
| 2310 * Go to the next position, forward or backward. We could use | |
| 2311 * inc() and dec() here, but that is much slower | |
| 2312 */ | |
| 2313 if (backwards) | |
| 2314 { | |
| 14 | 2315 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2316 // char to match is inside of comment, don't search outside |
| 14 | 2317 if (lispcomm && pos.col < (colnr_T)comment_col) |
| 2318 break; | |
| 2319 #endif | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2320 if (pos.col == 0) // at start of line, go to prev. one |
| 7 | 2321 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2322 if (pos.lnum == 1) // start of file |
| 7 | 2323 break; |
| 2324 --pos.lnum; | |
| 2325 | |
| 829 | 2326 if (maxtravel > 0 && ++traveled > maxtravel) |
| 7 | 2327 break; |
| 2328 | |
| 2329 linep = ml_get(pos.lnum); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2330 pos.col = (colnr_T)STRLEN(linep); // pos.col on trailing NUL |
| 7 | 2331 do_quotes = -1; |
| 2332 line_breakcheck(); | |
| 2333 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2334 // Check if this line contains a single-line comment |
| 14 | 2335 if (comment_dir |
| 2336 #ifdef FEAT_LISP | |
| 2337 || lisp | |
| 2338 #endif | |
| 2339 ) | |
| 7 | 2340 comment_col = check_linecomment(linep); |
| 14 | 2341 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2342 // skip comment |
| 14 | 2343 if (lisp && comment_col != MAXCOL) |
| 2344 pos.col = comment_col; | |
| 2345 #endif | |
| 7 | 2346 } |
| 2347 else | |
| 2348 { | |
| 2349 --pos.col; | |
| 2350 if (has_mbyte) | |
| 2351 pos.col -= (*mb_head_off)(linep, linep + pos.col); | |
| 2352 } | |
| 2353 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2354 else // forward search |
| 7 | 2355 { |
| 14 | 2356 if (linep[pos.col] == NUL |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2357 // at end of line, go to next one |
| 14 | 2358 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2359 // don't search for match in comment |
| 14 | 2360 || (lisp && comment_col != MAXCOL |
| 2361 && pos.col == (colnr_T)comment_col) | |
| 2362 #endif | |
| 2363 ) | |
| 7 | 2364 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2365 if (pos.lnum == curbuf->b_ml.ml_line_count // end of file |
| 14 | 2366 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2367 // line is exhausted and comment with it, |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2368 // don't search for match in code |
| 14 | 2369 || lispcomm |
| 2370 #endif | |
| 2371 ) | |
| 7 | 2372 break; |
| 2373 ++pos.lnum; | |
| 2374 | |
| 2375 if (maxtravel && traveled++ > maxtravel) | |
| 2376 break; | |
| 2377 | |
| 2378 linep = ml_get(pos.lnum); | |
| 2379 pos.col = 0; | |
| 2380 do_quotes = -1; | |
| 2381 line_breakcheck(); | |
| 14 | 2382 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2383 if (lisp) // find comment pos in new line |
| 14 | 2384 comment_col = check_linecomment(linep); |
| 2385 #endif | |
| 7 | 2386 } |
| 2387 else | |
| 2388 { | |
| 2389 if (has_mbyte) | |
| 474 | 2390 pos.col += (*mb_ptr2len)(linep + pos.col); |
| 7 | 2391 else |
| 2392 ++pos.col; | |
| 2393 } | |
| 2394 } | |
| 2395 | |
| 2396 /* | |
| 2397 * If FM_BLOCKSTOP given, stop at a '{' or '}' in column 0. | |
| 2398 */ | |
| 2399 if (pos.col == 0 && (flags & FM_BLOCKSTOP) && | |
| 2400 (linep[0] == '{' || linep[0] == '}')) | |
| 2401 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2402 if (linep[0] == findc && count == 0) // match! |
| 7 | 2403 return &pos; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2404 break; // out of scope |
| 7 | 2405 } |
| 2406 | |
| 2407 if (comment_dir) | |
| 2408 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2409 // Note: comments do not nest, and we ignore quotes in them |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2410 // TODO: ignore comment brackets inside strings |
| 7 | 2411 if (comment_dir == FORWARD) |
| 2412 { | |
| 2413 if (linep[pos.col] == '*' && linep[pos.col + 1] == '/') | |
| 2414 { | |
| 2415 pos.col++; | |
| 2416 return &pos; | |
| 2417 } | |
| 2418 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2419 else // Searching backwards |
| 7 | 2420 { |
| 2421 /* | |
| 2422 * A comment may contain / * or / /, it may also start or end | |
|
12829
91222b3123ba
patch 8.0.1291: C indent wrong when * immediately follows comment
Christian Brabandt <cb@256bit.org>
parents:
12722
diff
changeset
|
2423 * with / * /. Ignore a / * after / / and after *. |
| 7 | 2424 */ |
| 2425 if (pos.col == 0) | |
| 2426 continue; | |
| 6971 | 2427 else if (raw_string) |
| 2428 { | |
| 2429 if (linep[pos.col - 1] == 'R' | |
| 2430 && linep[pos.col] == '"' | |
| 2431 && vim_strchr(linep + pos.col + 1, '(') != NULL) | |
| 2432 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2433 // Possible start of raw string. Now that we have the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2434 // delimiter we can check if it ends before where we |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2435 // started searching, or before the previously found |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2436 // raw string start. |
| 6971 | 2437 if (!find_rawstring_end(linep, &pos, |
| 2438 count > 0 ? &match_pos : &curwin->w_cursor)) | |
| 2439 { | |
| 2440 count++; | |
| 2441 match_pos = pos; | |
| 2442 match_pos.col--; | |
| 2443 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2444 linep = ml_get(pos.lnum); // may have been released |
| 6971 | 2445 } |
| 2446 } | |
| 7 | 2447 else if ( linep[pos.col - 1] == '/' |
| 2448 && linep[pos.col] == '*' | |
|
12829
91222b3123ba
patch 8.0.1291: C indent wrong when * immediately follows comment
Christian Brabandt <cb@256bit.org>
parents:
12722
diff
changeset
|
2449 && (pos.col == 1 || linep[pos.col - 2] != '*') |
| 7 | 2450 && (int)pos.col < comment_col) |
| 2451 { | |
| 2452 count++; | |
| 2453 match_pos = pos; | |
| 2454 match_pos.col--; | |
| 2455 } | |
| 2456 else if (linep[pos.col - 1] == '*' && linep[pos.col] == '/') | |
| 2457 { | |
| 2458 if (count > 0) | |
| 2459 pos = match_pos; | |
| 2460 else if (pos.col > 1 && linep[pos.col - 2] == '/' | |
| 2461 && (int)pos.col <= comment_col) | |
| 2462 pos.col -= 2; | |
| 2463 else if (ignore_cend) | |
| 2464 continue; | |
| 2465 else | |
| 2466 return NULL; | |
| 2467 return &pos; | |
| 2468 } | |
| 2469 } | |
| 2470 continue; | |
| 2471 } | |
| 2472 | |
| 2473 /* | |
| 2474 * If smart matching ('cpoptions' does not contain '%'), braces inside | |
| 2475 * of quotes are ignored, but only if there is an even number of | |
| 2476 * quotes in the line. | |
| 2477 */ | |
| 2478 if (cpo_match) | |
| 2479 do_quotes = 0; | |
| 2480 else if (do_quotes == -1) | |
| 2481 { | |
| 2482 /* | |
| 2483 * Count the number of quotes in the line, skipping \" and '"'. | |
| 2484 * Watch out for "\\". | |
| 2485 */ | |
| 2486 at_start = do_quotes; | |
| 2487 for (ptr = linep; *ptr; ++ptr) | |
| 2488 { | |
| 2489 if (ptr == linep + pos.col + backwards) | |
| 2490 at_start = (do_quotes & 1); | |
| 2491 if (*ptr == '"' | |
| 2492 && (ptr == linep || ptr[-1] != '\'' || ptr[1] != '\'')) | |
| 2493 ++do_quotes; | |
| 2494 if (*ptr == '\\' && ptr[1] != NUL) | |
| 2495 ++ptr; | |
| 2496 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2497 do_quotes &= 1; // result is 1 with even number of quotes |
| 7 | 2498 |
| 2499 /* | |
| 2500 * If we find an uneven count, check current line and previous | |
| 2501 * one for a '\' at the end. | |
| 2502 */ | |
| 2503 if (!do_quotes) | |
| 2504 { | |
| 2505 inquote = FALSE; | |
| 2506 if (ptr[-1] == '\\') | |
| 2507 { | |
| 2508 do_quotes = 1; | |
| 2509 if (start_in_quotes == MAYBE) | |
| 2510 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2511 // Do we need to use at_start here? |
| 7 | 2512 inquote = TRUE; |
| 2513 start_in_quotes = TRUE; | |
| 2514 } | |
| 2515 else if (backwards) | |
| 2516 inquote = TRUE; | |
| 2517 } | |
| 2518 if (pos.lnum > 1) | |
| 2519 { | |
| 2520 ptr = ml_get(pos.lnum - 1); | |
| 2521 if (*ptr && *(ptr + STRLEN(ptr) - 1) == '\\') | |
| 2522 { | |
| 2523 do_quotes = 1; | |
| 2524 if (start_in_quotes == MAYBE) | |
| 2525 { | |
| 2526 inquote = at_start; | |
| 2527 if (inquote) | |
| 2528 start_in_quotes = TRUE; | |
| 2529 } | |
| 2530 else if (!backwards) | |
| 2531 inquote = TRUE; | |
| 2532 } | |
| 1310 | 2533 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2534 // ml_get() only keeps one line, need to get linep again |
| 1310 | 2535 linep = ml_get(pos.lnum); |
| 7 | 2536 } |
| 2537 } | |
| 2538 } | |
| 2539 if (start_in_quotes == MAYBE) | |
| 2540 start_in_quotes = FALSE; | |
| 2541 | |
| 2542 /* | |
| 2543 * If 'smartmatch' is set: | |
| 2544 * Things inside quotes are ignored by setting 'inquote'. If we | |
| 2545 * find a quote without a preceding '\' invert 'inquote'. At the | |
| 2546 * end of a line not ending in '\' we reset 'inquote'. | |
| 2547 * | |
| 2548 * In lines with an uneven number of quotes (without preceding '\') | |
| 2549 * we do not know which part to ignore. Therefore we only set | |
| 2550 * inquote if the number of quotes in a line is even, unless this | |
| 2551 * line or the previous one ends in a '\'. Complicated, isn't it? | |
| 2552 */ | |
| 4029 | 2553 c = PTR2CHAR(linep + pos.col); |
| 2554 switch (c) | |
| 7 | 2555 { |
| 2556 case NUL: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2557 // at end of line without trailing backslash, reset inquote |
| 7 | 2558 if (pos.col == 0 || linep[pos.col - 1] != '\\') |
| 2559 { | |
| 2560 inquote = FALSE; | |
| 2561 start_in_quotes = FALSE; | |
| 2562 } | |
| 2563 break; | |
| 2564 | |
| 2565 case '"': | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2566 // a quote that is preceded with an odd number of backslashes is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2567 // ignored |
| 7 | 2568 if (do_quotes) |
| 2569 { | |
| 2570 int col; | |
| 2571 | |
| 2572 for (col = pos.col - 1; col >= 0; --col) | |
| 2573 if (linep[col] != '\\') | |
| 2574 break; | |
| 2575 if ((((int)pos.col - 1 - col) & 1) == 0) | |
| 2576 { | |
| 2577 inquote = !inquote; | |
| 2578 start_in_quotes = FALSE; | |
| 2579 } | |
| 2580 } | |
| 2581 break; | |
| 2582 | |
| 2583 /* | |
| 2584 * If smart matching ('cpoptions' does not contain '%'): | |
| 2585 * Skip things in single quotes: 'x' or '\x'. Be careful for single | |
| 2586 * single quotes, eg jon's. Things like '\233' or '\x3f' are not | |
| 2587 * skipped, there is never a brace in them. | |
| 2588 * Ignore this when finding matches for `'. | |
| 2589 */ | |
| 2590 case '\'': | |
| 2591 if (!cpo_match && initc != '\'' && findc != '\'') | |
| 2592 { | |
| 2593 if (backwards) | |
| 2594 { | |
| 2595 if (pos.col > 1) | |
| 2596 { | |
| 2597 if (linep[pos.col - 2] == '\'') | |
| 2598 { | |
| 2599 pos.col -= 2; | |
| 2600 break; | |
| 2601 } | |
| 2602 else if (linep[pos.col - 2] == '\\' && | |
| 2603 pos.col > 2 && linep[pos.col - 3] == '\'') | |
| 2604 { | |
| 2605 pos.col -= 3; | |
| 2606 break; | |
| 2607 } | |
| 2608 } | |
| 2609 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2610 else if (linep[pos.col + 1]) // forward search |
| 7 | 2611 { |
| 2612 if (linep[pos.col + 1] == '\\' && | |
| 2613 linep[pos.col + 2] && linep[pos.col + 3] == '\'') | |
| 2614 { | |
| 2615 pos.col += 3; | |
| 2616 break; | |
| 2617 } | |
| 2618 else if (linep[pos.col + 2] == '\'') | |
| 2619 { | |
| 2620 pos.col += 2; | |
| 2621 break; | |
| 2622 } | |
| 2623 } | |
| 2624 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2625 // FALLTHROUGH |
| 7 | 2626 |
| 2627 default: | |
| 2628 #ifdef FEAT_LISP | |
| 14 | 2629 /* |
| 2630 * For Lisp skip over backslashed (), {} and []. | |
| 2631 * (actually, we skip #\( et al) | |
| 2632 */ | |
| 7 | 2633 if (curbuf->b_p_lisp |
| 2634 && vim_strchr((char_u *)"(){}[]", c) != NULL | |
| 14 | 2635 && pos.col > 1 |
| 2636 && check_prevcol(linep, pos.col, '\\', NULL) | |
| 2637 && check_prevcol(linep, pos.col - 1, '#', NULL)) | |
| 7 | 2638 break; |
| 2639 #endif | |
| 2640 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2641 // Check for match outside of quotes, and inside of |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2642 // quotes when the start is also inside of quotes. |
| 7 | 2643 if ((!inquote || start_in_quotes == TRUE) |
| 2644 && (c == initc || c == findc)) | |
| 2645 { | |
| 2646 int col, bslcnt = 0; | |
| 2647 | |
| 2648 if (!cpo_bsl) | |
| 2649 { | |
| 2650 for (col = pos.col; check_prevcol(linep, col, '\\', &col);) | |
| 2651 bslcnt++; | |
| 2652 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2653 // Only accept a match when 'M' is in 'cpo' or when escaping |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2654 // is what we expect. |
| 7 | 2655 if (cpo_bsl || (bslcnt & 1) == match_escaped) |
| 2656 { | |
| 2657 if (c == initc) | |
| 2658 count++; | |
| 2659 else | |
| 2660 { | |
| 2661 if (count == 0) | |
| 2662 return &pos; | |
| 2663 count--; | |
| 2664 } | |
| 2665 } | |
| 2666 } | |
| 2667 } | |
| 2668 } | |
| 2669 | |
| 2670 if (comment_dir == BACKWARD && count > 0) | |
| 2671 { | |
| 2672 pos = match_pos; | |
| 2673 return &pos; | |
| 2674 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2675 return (pos_T *)NULL; // never found it |
| 7 | 2676 } |
| 2677 | |
| 2678 /* | |
| 2679 * Check if line[] contains a / / comment. | |
| 2680 * Return MAXCOL if not, otherwise return the column. | |
| 2681 * TODO: skip strings. | |
| 2682 */ | |
| 2683 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2684 check_linecomment(char_u *line) |
| 7 | 2685 { |
| 2686 char_u *p; | |
| 2687 | |
| 2688 p = line; | |
| 14 | 2689 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2690 // skip Lispish one-line comments |
| 14 | 2691 if (curbuf->b_p_lisp) |
| 2692 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2693 if (vim_strchr(p, ';') != NULL) // there may be comments |
| 14 | 2694 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2695 int in_str = FALSE; // inside of string |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2696 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2697 p = line; // scan from start |
| 333 | 2698 while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL) |
| 14 | 2699 { |
| 2700 if (*p == '"') | |
| 2701 { | |
| 3263 | 2702 if (in_str) |
| 14 | 2703 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2704 if (*(p - 1) != '\\') // skip escaped quote |
| 3263 | 2705 in_str = FALSE; |
| 14 | 2706 } |
| 2707 else if (p == line || ((p - line) >= 2 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2708 // skip #\" form |
| 14 | 2709 && *(p - 1) != '\\' && *(p - 2) != '#')) |
| 3263 | 2710 in_str = TRUE; |
| 14 | 2711 } |
| 3263 | 2712 else if (!in_str && ((p - line) < 2 |
| 14 | 2713 || (*(p - 1) != '\\' && *(p - 2) != '#'))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2714 break; // found! |
| 14 | 2715 ++p; |
| 2716 } | |
| 2717 } | |
| 2718 else | |
| 2719 p = NULL; | |
| 2720 } | |
| 2721 else | |
| 2722 #endif | |
| 7 | 2723 while ((p = vim_strchr(p, '/')) != NULL) |
| 2724 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2725 // accept a double /, unless it's preceded with * and followed by *, |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2726 // because * / / * is an end and start of a C comment |
| 1463 | 2727 if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*')) |
| 7 | 2728 break; |
| 2729 ++p; | |
| 2730 } | |
| 2731 | |
| 2732 if (p == NULL) | |
| 2733 return MAXCOL; | |
| 2734 return (int)(p - line); | |
| 2735 } | |
| 2736 | |
| 2737 /* | |
| 2738 * Move cursor briefly to character matching the one under the cursor. | |
| 2739 * Used for Insert mode and "r" command. | |
| 2740 * Show the match only if it is visible on the screen. | |
| 2741 * If there isn't a match, then beep. | |
| 2742 */ | |
| 2743 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2744 showmatch( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2745 int c) // char to show match for |
| 7 | 2746 { |
| 2747 pos_T *lpos, save_cursor; | |
| 2748 pos_T mpos; | |
| 2749 colnr_T vcol; | |
| 2750 long save_so; | |
| 2751 long save_siso; | |
| 2752 #ifdef CURSOR_SHAPE | |
| 2753 int save_state; | |
| 2754 #endif | |
| 2755 colnr_T save_dollar_vcol; | |
| 2756 char_u *p; | |
|
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2757 long *so = curwin->w_p_so >= 0 ? &curwin->w_p_so : &p_so; |
|
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2758 long *siso = curwin->w_p_siso >= 0 ? &curwin->w_p_siso : &p_siso; |
| 7 | 2759 |
| 2760 /* | |
| 2761 * Only show match for chars in the 'matchpairs' option. | |
| 2762 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2763 // 'matchpairs' is "x:y,x:y" |
| 4029 | 2764 for (p = curbuf->b_p_mps; *p != NUL; ++p) |
| 7 | 2765 { |
| 2766 #ifdef FEAT_RIGHTLEFT | |
| 4153 | 2767 if (PTR2CHAR(p) == c && (curwin->w_p_rl ^ p_ri)) |
| 2768 break; | |
| 7 | 2769 #endif |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2770 p += mb_ptr2len(p) + 1; |
| 4029 | 2771 if (PTR2CHAR(p) == c |
| 7 | 2772 #ifdef FEAT_RIGHTLEFT |
| 2773 && !(curwin->w_p_rl ^ p_ri) | |
| 2774 #endif | |
| 2775 ) | |
| 2776 break; | |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2777 p += mb_ptr2len(p); |
| 4029 | 2778 if (*p == NUL) |
| 7 | 2779 return; |
| 2780 } | |
| 2781 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2782 if ((lpos = findmatch(NULL, NUL)) == NULL) // no match, so beep |
| 6949 | 2783 vim_beep(BO_MATCH); |
| 4153 | 2784 else if (lpos->lnum >= curwin->w_topline && lpos->lnum < curwin->w_botline) |
| 7 | 2785 { |
| 2786 if (!curwin->w_p_wrap) | |
| 2787 getvcol(curwin, lpos, NULL, &vcol, NULL); | |
| 2788 if (curwin->w_p_wrap || (vcol >= curwin->w_leftcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2789 && vcol < curwin->w_leftcol + curwin->w_width)) |
| 7 | 2790 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2791 mpos = *lpos; // save the pos, update_screen() may change it |
| 7 | 2792 save_cursor = curwin->w_cursor; |
|
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2793 save_so = *so; |
|
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2794 save_siso = *siso; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2795 // Handle "$" in 'cpo': If the ')' is typed on top of the "$", |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2796 // stop displaying the "$". |
| 3318 | 2797 if (dollar_vcol >= 0 && dollar_vcol == curwin->w_virtcol) |
| 2798 dollar_vcol = -1; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2799 ++curwin->w_virtcol; // do display ')' just before "$" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2800 update_screen(VALID); // show the new char first |
| 7 | 2801 |
| 2802 save_dollar_vcol = dollar_vcol; | |
| 2803 #ifdef CURSOR_SHAPE | |
| 2804 save_state = State; | |
| 2805 State = SHOWMATCH; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2806 ui_cursor_shape(); // may show different cursor shape |
| 7 | 2807 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2808 curwin->w_cursor = mpos; // move to matching char |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2809 *so = 0; // don't use 'scrolloff' here |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2810 *siso = 0; // don't use 'sidescrolloff' here |
| 7 | 2811 showruler(FALSE); |
| 2812 setcursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2813 cursor_on(); // make sure that the cursor is shown |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
12855
diff
changeset
|
2814 out_flush_cursor(TRUE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
12855
diff
changeset
|
2815 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2816 // Restore dollar_vcol(), because setcursor() may call curs_rows() |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2817 // which resets it if the matching position is in a previous line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2818 // and has a higher column number. |
| 7 | 2819 dollar_vcol = save_dollar_vcol; |
| 2820 | |
| 2821 /* | |
| 2822 * brief pause, unless 'm' is present in 'cpo' and a character is | |
| 2823 * available. | |
| 2824 */ | |
| 2825 if (vim_strchr(p_cpo, CPO_SHOWMATCH) != NULL) | |
|
18642
bbea1f108187
patch 8.1.2313: debugging where a delay comes from is not easy
Bram Moolenaar <Bram@vim.org>
parents:
18500
diff
changeset
|
2826 ui_delay(p_mat * 100L + 8, TRUE); |
| 7 | 2827 else if (!char_avail()) |
|
18642
bbea1f108187
patch 8.1.2313: debugging where a delay comes from is not easy
Bram Moolenaar <Bram@vim.org>
parents:
18500
diff
changeset
|
2828 ui_delay(p_mat * 100L + 9, FALSE); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2829 curwin->w_cursor = save_cursor; // restore cursor position |
|
15713
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2830 *so = save_so; |
|
ad8b2c109b22
patch 8.1.0864: cannot have a local value for 'scrolloff' and 'sidescrolloff'
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
2831 *siso = save_siso; |
| 7 | 2832 #ifdef CURSOR_SHAPE |
| 2833 State = save_state; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2834 ui_cursor_shape(); // may show different cursor shape |
| 7 | 2835 #endif |
| 2836 } | |
| 2837 } | |
| 2838 } | |
| 2839 | |
| 2840 /* | |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2841 * Find the start of the next sentence, searching in the direction specified |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2842 * by the "dir" argument. The cursor is positioned on the start of the next |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2843 * sentence when found. If the next sentence is found, return OK. Return FAIL |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2844 * otherwise. See ":h sentence" for the precise definition of a "sentence" |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2845 * text object. |
| 7 | 2846 */ |
| 2847 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2848 findsent(int dir, long count) |
| 7 | 2849 { |
| 2850 pos_T pos, tpos; | |
| 2851 int c; | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
2852 int (*func)(pos_T *); |
| 7 | 2853 int startlnum; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2854 int noskip = FALSE; // do not skip blanks |
| 7 | 2855 int cpo_J; |
| 45 | 2856 int found_dot; |
| 7 | 2857 |
| 2858 pos = curwin->w_cursor; | |
| 2859 if (dir == FORWARD) | |
| 2860 func = incl; | |
| 2861 else | |
| 2862 func = decl; | |
| 2863 | |
| 2864 while (count--) | |
| 2865 { | |
| 2866 /* | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18681
diff
changeset
|
2867 * if on an empty line, skip up to a non-empty line |
| 7 | 2868 */ |
| 2869 if (gchar_pos(&pos) == NUL) | |
| 2870 { | |
| 2871 do | |
| 2872 if ((*func)(&pos) == -1) | |
| 2873 break; | |
| 2874 while (gchar_pos(&pos) == NUL); | |
| 2875 if (dir == FORWARD) | |
| 2876 goto found; | |
| 2877 } | |
| 2878 /* | |
| 2879 * if on the start of a paragraph or a section and searching forward, | |
| 2880 * go to the next line | |
| 2881 */ | |
| 2882 else if (dir == FORWARD && pos.col == 0 && | |
| 2883 startPS(pos.lnum, NUL, FALSE)) | |
| 2884 { | |
| 2885 if (pos.lnum == curbuf->b_ml.ml_line_count) | |
| 2886 return FAIL; | |
| 2887 ++pos.lnum; | |
| 2888 goto found; | |
| 2889 } | |
| 2890 else if (dir == BACKWARD) | |
| 2891 decl(&pos); | |
| 2892 | |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2893 // go back to the previous non-white non-punctuation character |
| 45 | 2894 found_dot = FALSE; |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2895 while (c = gchar_pos(&pos), VIM_ISWHITE(c) |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2896 || vim_strchr((char_u *)".!?)]\"'", c) != NULL) |
| 7 | 2897 { |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2898 tpos = pos; |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2899 if (decl(&tpos) == -1 || (LINEEMPTY(tpos.lnum) && dir == FORWARD)) |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2900 break; |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2901 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2902 if (found_dot) |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2903 break; |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2904 if (vim_strchr((char_u *) ".!?", c) != NULL) |
| 45 | 2905 found_dot = TRUE; |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2906 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2907 if (vim_strchr((char_u *) ")]\"'", c) != NULL |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2908 && vim_strchr((char_u *) ".!?)]\"'", gchar_pos(&tpos)) == NULL) |
| 7 | 2909 break; |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2910 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2911 decl(&pos); |
| 7 | 2912 } |
| 2913 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2914 // remember the line where the search started |
| 7 | 2915 startlnum = pos.lnum; |
| 2916 cpo_J = vim_strchr(p_cpo, CPO_ENDOFSENT) != NULL; | |
| 2917 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2918 for (;;) // find end of sentence |
| 7 | 2919 { |
| 2920 c = gchar_pos(&pos); | |
| 2921 if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, FALSE))) | |
| 2922 { | |
| 2923 if (dir == BACKWARD && pos.lnum != startlnum) | |
| 2924 ++pos.lnum; | |
| 2925 break; | |
| 2926 } | |
| 2927 if (c == '.' || c == '!' || c == '?') | |
| 2928 { | |
| 2929 tpos = pos; | |
| 2930 do | |
| 2931 if ((c = inc(&tpos)) == -1) | |
| 2932 break; | |
| 2933 while (vim_strchr((char_u *)")]\"'", c = gchar_pos(&tpos)) | |
| 2934 != NULL); | |
| 2935 if (c == -1 || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL | |
| 2936 || (cpo_J && (c == ' ' && inc(&tpos) >= 0 | |
| 2937 && gchar_pos(&tpos) == ' '))) | |
| 2938 { | |
| 2939 pos = tpos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2940 if (gchar_pos(&pos) == NUL) // skip NUL at EOL |
| 7 | 2941 inc(&pos); |
| 2942 break; | |
| 2943 } | |
| 2944 } | |
| 2945 if ((*func)(&pos) == -1) | |
| 2946 { | |
| 2947 if (count) | |
| 2948 return FAIL; | |
| 2949 noskip = TRUE; | |
| 2950 break; | |
| 2951 } | |
| 2952 } | |
| 2953 found: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2954 // skip white space |
| 7 | 2955 while (!noskip && ((c = gchar_pos(&pos)) == ' ' || c == '\t')) |
| 2956 if (incl(&pos) == -1) | |
| 2957 break; | |
| 2958 } | |
| 2959 | |
| 2960 setpcmark(); | |
| 2961 curwin->w_cursor = pos; | |
| 2962 return OK; | |
| 2963 } | |
| 2964 | |
| 2965 /* | |
| 164 | 2966 * Find the next paragraph or section in direction 'dir'. |
| 7 | 2967 * Paragraphs are currently supposed to be separated by empty lines. |
| 164 | 2968 * If 'what' is NUL we go to the next paragraph. |
| 7 | 2969 * If 'what' is '{' or '}' we go to the next section. |
| 2970 * If 'both' is TRUE also stop at '}'. | |
| 164 | 2971 * Return TRUE if the next paragraph or section was found. |
| 7 | 2972 */ |
| 2973 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2974 findpar( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2975 int *pincl, // Return: TRUE if last char is to be included |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2976 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2977 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2978 int what, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2979 int both) |
| 7 | 2980 { |
| 2981 linenr_T curr; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2982 int did_skip; // TRUE after separating lines have been skipped |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2983 int first; // TRUE on first line |
| 164 | 2984 int posix = (vim_strchr(p_cpo, CPO_PARA) != NULL); |
| 7 | 2985 #ifdef FEAT_FOLDING |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2986 linenr_T fold_first; // first line of a closed fold |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2987 linenr_T fold_last; // last line of a closed fold |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2988 int fold_skipped; // TRUE if a closed fold was skipped this |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2989 // iteration |
| 7 | 2990 #endif |
| 2991 | |
| 2992 curr = curwin->w_cursor.lnum; | |
| 2993 | |
| 2994 while (count--) | |
| 2995 { | |
| 2996 did_skip = FALSE; | |
| 2997 for (first = TRUE; ; first = FALSE) | |
| 2998 { | |
| 2999 if (*ml_get(curr) != NUL) | |
| 3000 did_skip = TRUE; | |
| 3001 | |
| 3002 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3003 // skip folded lines |
| 7 | 3004 fold_skipped = FALSE; |
| 3005 if (first && hasFolding(curr, &fold_first, &fold_last)) | |
| 3006 { | |
| 3007 curr = ((dir > 0) ? fold_last : fold_first) + dir; | |
| 3008 fold_skipped = TRUE; | |
| 3009 } | |
| 3010 #endif | |
| 3011 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3012 // POSIX has its own ideas of what a paragraph boundary is and it |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3013 // doesn't match historical Vi: It also stops at a "{" in the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3014 // first column and at an empty line. |
| 164 | 3015 if (!first && did_skip && (startPS(curr, what, both) |
| 3016 || (posix && what == NUL && *ml_get(curr) == '{'))) | |
| 7 | 3017 break; |
| 3018 | |
| 3019 #ifdef FEAT_FOLDING | |
| 3020 if (fold_skipped) | |
| 3021 curr -= dir; | |
| 3022 #endif | |
| 3023 if ((curr += dir) < 1 || curr > curbuf->b_ml.ml_line_count) | |
| 3024 { | |
| 3025 if (count) | |
| 3026 return FALSE; | |
| 3027 curr -= dir; | |
| 3028 break; | |
| 3029 } | |
| 3030 } | |
| 3031 } | |
| 3032 setpcmark(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3033 if (both && *ml_get(curr) == '}') // include line with '}' |
| 7 | 3034 ++curr; |
| 3035 curwin->w_cursor.lnum = curr; | |
| 3036 if (curr == curbuf->b_ml.ml_line_count && what != '}') | |
| 3037 { | |
|
11275
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3038 char_u *line = ml_get(curr); |
|
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3039 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3040 // Put the cursor on the last character in the last line and make the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3041 // motion inclusive. |
|
11275
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3042 if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0) |
| 7 | 3043 { |
| 3044 --curwin->w_cursor.col; | |
|
11275
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3045 curwin->w_cursor.col -= |
|
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3046 (*mb_head_off)(line, line + curwin->w_cursor.col); |
| 504 | 3047 *pincl = TRUE; |
| 7 | 3048 } |
| 3049 } | |
| 3050 else | |
| 3051 curwin->w_cursor.col = 0; | |
| 3052 return TRUE; | |
| 3053 } | |
| 3054 | |
| 3055 /* | |
| 3056 * check if the string 's' is a nroff macro that is in option 'opt' | |
| 3057 */ | |
| 3058 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3059 inmacro(char_u *opt, char_u *s) |
| 7 | 3060 { |
| 3061 char_u *macro; | |
| 3062 | |
| 3063 for (macro = opt; macro[0]; ++macro) | |
| 3064 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3065 // Accept two characters in the option being equal to two characters |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3066 // in the line. A space in the option matches with a space in the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3067 // line or the line having ended. |
| 7 | 3068 if ( (macro[0] == s[0] |
| 3069 || (macro[0] == ' ' | |
| 3070 && (s[0] == NUL || s[0] == ' '))) | |
| 3071 && (macro[1] == s[1] | |
| 3072 || ((macro[1] == NUL || macro[1] == ' ') | |
| 3073 && (s[0] == NUL || s[1] == NUL || s[1] == ' ')))) | |
| 3074 break; | |
| 3075 ++macro; | |
| 3076 if (macro[0] == NUL) | |
| 3077 break; | |
| 3078 } | |
| 3079 return (macro[0] != NUL); | |
| 3080 } | |
| 3081 | |
| 3082 /* | |
| 3083 * startPS: return TRUE if line 'lnum' is the start of a section or paragraph. | |
| 3084 * If 'para' is '{' or '}' only check for sections. | |
| 3085 * If 'both' is TRUE also stop at '}' | |
| 3086 */ | |
| 3087 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3088 startPS(linenr_T lnum, int para, int both) |
| 7 | 3089 { |
| 3090 char_u *s; | |
| 3091 | |
| 3092 s = ml_get(lnum); | |
| 3093 if (*s == para || *s == '\f' || (both && *s == '}')) | |
| 3094 return TRUE; | |
| 3095 if (*s == '.' && (inmacro(p_sections, s + 1) || | |
| 3096 (!para && inmacro(p_para, s + 1)))) | |
| 3097 return TRUE; | |
| 3098 return FALSE; | |
| 3099 } | |
| 3100 | |
| 3101 /* | |
| 3102 * The following routines do the word searches performed by the 'w', 'W', | |
| 3103 * 'b', 'B', 'e', and 'E' commands. | |
| 3104 */ | |
| 3105 | |
| 3106 /* | |
| 3107 * To perform these searches, characters are placed into one of three | |
| 3108 * classes, and transitions between classes determine word boundaries. | |
| 3109 * | |
| 3110 * The classes are: | |
| 3111 * | |
| 3112 * 0 - white space | |
| 3113 * 1 - punctuation | |
| 3114 * 2 or higher - keyword characters (letters, digits and underscore) | |
| 3115 */ | |
| 3116 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3117 static int cls_bigword; // TRUE for "W", "B" or "E" |
| 7 | 3118 |
| 3119 /* | |
| 3120 * cls() - returns the class of character at curwin->w_cursor | |
| 3121 * | |
| 3122 * If a 'W', 'B', or 'E' motion is being done (cls_bigword == TRUE), chars | |
| 3123 * from class 2 and higher are reported as class 1 since only white space | |
| 3124 * boundaries are of interest. | |
| 3125 */ | |
| 3126 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3127 cls(void) |
| 7 | 3128 { |
| 3129 int c; | |
| 3130 | |
| 3131 c = gchar_cursor(); | |
| 3132 if (c == ' ' || c == '\t' || c == NUL) | |
| 3133 return 0; | |
| 3134 if (enc_dbcs != 0 && c > 0xFF) | |
| 3135 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3136 // If cls_bigword, report multi-byte chars as class 1. |
| 7 | 3137 if (enc_dbcs == DBCS_KOR && cls_bigword) |
| 3138 return 1; | |
| 3139 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3140 // process code leading/trailing bytes |
| 7 | 3141 return dbcs_class(((unsigned)c >> 8), (c & 0xFF)); |
| 3142 } | |
| 3143 if (enc_utf8) | |
| 3144 { | |
| 3145 c = utf_class(c); | |
| 3146 if (c != 0 && cls_bigword) | |
| 3147 return 1; | |
| 3148 return c; | |
| 3149 } | |
| 3150 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3151 // If cls_bigword is TRUE, report all non-blanks as class 1. |
| 7 | 3152 if (cls_bigword) |
| 3153 return 1; | |
| 3154 | |
| 3155 if (vim_iswordc(c)) | |
| 3156 return 2; | |
| 3157 return 1; | |
| 3158 } | |
| 3159 | |
| 3160 | |
| 3161 /* | |
| 3162 * fwd_word(count, type, eol) - move forward one word | |
| 3163 * | |
| 3164 * Returns FAIL if the cursor was already at the end of the file. | |
| 3165 * If eol is TRUE, last word stops at end of line (for operators). | |
| 3166 */ | |
| 3167 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3168 fwd_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3169 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3170 int bigword, // "W", "E" or "B" |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3171 int eol) |
| 7 | 3172 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3173 int sclass; // starting class |
| 7 | 3174 int i; |
| 3175 int last_line; | |
| 3176 | |
| 3177 curwin->w_cursor.coladd = 0; | |
| 3178 cls_bigword = bigword; | |
| 3179 while (--count >= 0) | |
| 3180 { | |
| 3181 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3182 // When inside a range of folded lines, move to the last char of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3183 // last line. |
| 7 | 3184 if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) |
| 3185 coladvance((colnr_T)MAXCOL); | |
| 3186 #endif | |
| 3187 sclass = cls(); | |
| 3188 | |
| 3189 /* | |
| 3190 * We always move at least one character, unless on the last | |
| 3191 * character in the buffer. | |
| 3192 */ | |
| 3193 last_line = (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count); | |
| 3194 i = inc_cursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3195 if (i == -1 || (i >= 1 && last_line)) // started at last char in file |
| 7 | 3196 return FAIL; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3197 if (i >= 1 && eol && count == 0) // started at last char in line |
| 7 | 3198 return OK; |
| 3199 | |
| 3200 /* | |
| 3201 * Go one char past end of current word (if any) | |
| 3202 */ | |
| 3203 if (sclass != 0) | |
| 3204 while (cls() == sclass) | |
| 3205 { | |
| 3206 i = inc_cursor(); | |
| 3207 if (i == -1 || (i >= 1 && eol && count == 0)) | |
| 3208 return OK; | |
| 3209 } | |
| 3210 | |
| 3211 /* | |
| 3212 * go to next non-white | |
| 3213 */ | |
| 3214 while (cls() == 0) | |
| 3215 { | |
| 3216 /* | |
| 3217 * We'll stop if we land on a blank line | |
| 3218 */ | |
| 3219 if (curwin->w_cursor.col == 0 && *ml_get_curline() == NUL) | |
| 3220 break; | |
| 3221 | |
| 3222 i = inc_cursor(); | |
| 3223 if (i == -1 || (i >= 1 && eol && count == 0)) | |
| 3224 return OK; | |
| 3225 } | |
| 3226 } | |
| 3227 return OK; | |
| 3228 } | |
| 3229 | |
| 3230 /* | |
| 3231 * bck_word() - move backward 'count' words | |
| 3232 * | |
| 3233 * If stop is TRUE and we are already on the start of a word, move one less. | |
| 3234 * | |
| 3235 * Returns FAIL if top of the file was reached. | |
| 3236 */ | |
| 3237 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3238 bck_word(long count, int bigword, int stop) |
| 7 | 3239 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3240 int sclass; // starting class |
| 7 | 3241 |
| 3242 curwin->w_cursor.coladd = 0; | |
| 3243 cls_bigword = bigword; | |
| 3244 while (--count >= 0) | |
| 3245 { | |
| 3246 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3247 // When inside a range of folded lines, move to the first char of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3248 // first line. |
| 7 | 3249 if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL)) |
| 3250 curwin->w_cursor.col = 0; | |
| 3251 #endif | |
| 3252 sclass = cls(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3253 if (dec_cursor() == -1) // started at start of file |
| 7 | 3254 return FAIL; |
| 3255 | |
| 3256 if (!stop || sclass == cls() || sclass == 0) | |
| 3257 { | |
| 3258 /* | |
| 3259 * Skip white space before the word. | |
| 3260 * Stop on an empty line. | |
| 3261 */ | |
| 3262 while (cls() == 0) | |
| 3263 { | |
| 3264 if (curwin->w_cursor.col == 0 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3265 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3266 goto finished; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3267 if (dec_cursor() == -1) // hit start of file, stop here |
| 7 | 3268 return OK; |
| 3269 } | |
| 3270 | |
| 3271 /* | |
| 3272 * Move backward to start of this word. | |
| 3273 */ | |
| 3274 if (skip_chars(cls(), BACKWARD)) | |
| 3275 return OK; | |
| 3276 } | |
| 3277 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3278 inc_cursor(); // overshot - forward one |
| 7 | 3279 finished: |
| 3280 stop = FALSE; | |
| 3281 } | |
| 3282 return OK; | |
| 3283 } | |
| 3284 | |
| 3285 /* | |
| 3286 * end_word() - move to the end of the word | |
| 3287 * | |
| 3288 * There is an apparent bug in the 'e' motion of the real vi. At least on the | |
| 3289 * System V Release 3 version for the 80386. Unlike 'b' and 'w', the 'e' | |
| 3290 * motion crosses blank lines. When the real vi crosses a blank line in an | |
| 3291 * 'e' motion, the cursor is placed on the FIRST character of the next | |
| 3292 * non-blank line. The 'E' command, however, works correctly. Since this | |
| 3293 * appears to be a bug, I have not duplicated it here. | |
| 3294 * | |
| 3295 * Returns FAIL if end of the file was reached. | |
| 3296 * | |
| 3297 * If stop is TRUE and we are already on the end of a word, move one less. | |
| 3298 * If empty is TRUE stop on an empty line. | |
| 3299 */ | |
| 3300 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3301 end_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3302 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3303 int bigword, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3304 int stop, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3305 int empty) |
| 7 | 3306 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3307 int sclass; // starting class |
| 7 | 3308 |
| 3309 curwin->w_cursor.coladd = 0; | |
| 3310 cls_bigword = bigword; | |
| 3311 while (--count >= 0) | |
| 3312 { | |
| 3313 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3314 // When inside a range of folded lines, move to the last char of the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3315 // last line. |
| 7 | 3316 if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) |
| 3317 coladvance((colnr_T)MAXCOL); | |
| 3318 #endif | |
| 3319 sclass = cls(); | |
| 3320 if (inc_cursor() == -1) | |
| 3321 return FAIL; | |
| 3322 | |
| 3323 /* | |
| 3324 * If we're in the middle of a word, we just have to move to the end | |
| 3325 * of it. | |
| 3326 */ | |
| 3327 if (cls() == sclass && sclass != 0) | |
| 3328 { | |
| 3329 /* | |
| 3330 * Move forward to end of the current word | |
| 3331 */ | |
| 3332 if (skip_chars(sclass, FORWARD)) | |
| 3333 return FAIL; | |
| 3334 } | |
| 3335 else if (!stop || sclass == 0) | |
| 3336 { | |
| 3337 /* | |
| 3338 * We were at the end of a word. Go to the end of the next word. | |
| 3339 * First skip white space, if 'empty' is TRUE, stop at empty line. | |
| 3340 */ | |
| 3341 while (cls() == 0) | |
| 3342 { | |
| 3343 if (empty && curwin->w_cursor.col == 0 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3344 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3345 goto finished; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3346 if (inc_cursor() == -1) // hit end of file, stop here |
| 7 | 3347 return FAIL; |
| 3348 } | |
| 3349 | |
| 3350 /* | |
| 3351 * Move forward to the end of this word. | |
| 3352 */ | |
| 3353 if (skip_chars(cls(), FORWARD)) | |
| 3354 return FAIL; | |
| 3355 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3356 dec_cursor(); // overshot - one char backward |
| 7 | 3357 finished: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3358 stop = FALSE; // we move only one word less |
| 7 | 3359 } |
| 3360 return OK; | |
| 3361 } | |
| 3362 | |
| 3363 /* | |
| 3364 * Move back to the end of the word. | |
| 3365 * | |
| 3366 * Returns FAIL if start of the file was reached. | |
| 3367 */ | |
| 3368 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3369 bckend_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3370 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3371 int bigword, // TRUE for "B" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3372 int eol) // TRUE: stop at end of line. |
| 7 | 3373 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3374 int sclass; // starting class |
| 7 | 3375 int i; |
| 3376 | |
| 3377 curwin->w_cursor.coladd = 0; | |
| 3378 cls_bigword = bigword; | |
| 3379 while (--count >= 0) | |
| 3380 { | |
| 3381 sclass = cls(); | |
| 3382 if ((i = dec_cursor()) == -1) | |
| 3383 return FAIL; | |
| 3384 if (eol && i == 1) | |
| 3385 return OK; | |
| 3386 | |
| 3387 /* | |
| 3388 * Move backward to before the start of this word. | |
| 3389 */ | |
| 3390 if (sclass != 0) | |
| 3391 { | |
| 3392 while (cls() == sclass) | |
| 3393 if ((i = dec_cursor()) == -1 || (eol && i == 1)) | |
| 3394 return OK; | |
| 3395 } | |
| 3396 | |
| 3397 /* | |
| 3398 * Move backward to end of the previous word | |
| 3399 */ | |
| 3400 while (cls() == 0) | |
| 3401 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3402 if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3403 break; |
| 3404 if ((i = dec_cursor()) == -1 || (eol && i == 1)) | |
| 3405 return OK; | |
| 3406 } | |
| 3407 } | |
| 3408 return OK; | |
| 3409 } | |
| 3410 | |
| 3411 /* | |
| 3412 * Skip a row of characters of the same class. | |
| 3413 * Return TRUE when end-of-file reached, FALSE otherwise. | |
| 3414 */ | |
| 3415 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3416 skip_chars(int cclass, int dir) |
| 7 | 3417 { |
| 3418 while (cls() == cclass) | |
| 3419 if ((dir == FORWARD ? inc_cursor() : dec_cursor()) == -1) | |
| 3420 return TRUE; | |
| 3421 return FALSE; | |
| 3422 } | |
| 3423 | |
| 3424 #ifdef FEAT_TEXTOBJ | |
| 3425 /* | |
| 3426 * Go back to the start of the word or the start of white space | |
| 3427 */ | |
| 3428 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3429 back_in_line(void) |
| 7 | 3430 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3431 int sclass; // starting class |
| 7 | 3432 |
| 3433 sclass = cls(); | |
| 3434 for (;;) | |
| 3435 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3436 if (curwin->w_cursor.col == 0) // stop at start of line |
| 7 | 3437 break; |
| 3438 dec_cursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3439 if (cls() != sclass) // stop at start of word |
| 7 | 3440 { |
| 3441 inc_cursor(); | |
| 3442 break; | |
| 3443 } | |
| 3444 } | |
| 3445 } | |
| 3446 | |
| 3447 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3448 find_first_blank(pos_T *posp) |
| 7 | 3449 { |
| 3450 int c; | |
| 3451 | |
| 3452 while (decl(posp) != -1) | |
| 3453 { | |
| 3454 c = gchar_pos(posp); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3455 if (!VIM_ISWHITE(c)) |
| 7 | 3456 { |
| 3457 incl(posp); | |
| 3458 break; | |
| 3459 } | |
| 3460 } | |
| 3461 } | |
| 3462 | |
| 3463 /* | |
| 3464 * Skip count/2 sentences and count/2 separating white spaces. | |
| 3465 */ | |
| 3466 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3467 findsent_forward( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3468 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3469 int at_start_sent) // cursor is at start of sentence |
| 7 | 3470 { |
| 3471 while (count--) | |
| 3472 { | |
| 3473 findsent(FORWARD, 1L); | |
| 3474 if (at_start_sent) | |
| 3475 find_first_blank(&curwin->w_cursor); | |
| 3476 if (count == 0 || at_start_sent) | |
| 3477 decl(&curwin->w_cursor); | |
| 3478 at_start_sent = !at_start_sent; | |
| 3479 } | |
| 3480 } | |
| 3481 | |
| 3482 /* | |
| 3483 * Find word under cursor, cursor at end. | |
| 3484 * Used while an operator is pending, and in Visual mode. | |
| 3485 */ | |
| 3486 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3487 current_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3488 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3489 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3490 int include, // TRUE: include word and white space |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3491 int bigword) // FALSE == word, TRUE == WORD |
| 7 | 3492 { |
| 3493 pos_T start_pos; | |
| 3494 pos_T pos; | |
| 3495 int inclusive = TRUE; | |
| 3496 int include_white = FALSE; | |
| 3497 | |
| 3498 cls_bigword = bigword; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3499 CLEAR_POS(&start_pos); |
| 7 | 3500 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3501 // Correct cursor when 'selection' is exclusive |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3502 if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 3503 dec_cursor(); |
| 3504 | |
| 3505 /* | |
| 3506 * When Visual mode is not active, or when the VIsual area is only one | |
| 3507 * character, select the word and/or white space under the cursor. | |
| 3508 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3509 if (!VIsual_active || EQUAL_POS(curwin->w_cursor, VIsual)) |
| 7 | 3510 { |
| 3511 /* | |
| 3512 * Go to start of current word or white space. | |
| 3513 */ | |
| 3514 back_in_line(); | |
| 3515 start_pos = curwin->w_cursor; | |
| 3516 | |
| 3517 /* | |
| 3518 * If the start is on white space, and white space should be included | |
| 3519 * (" word"), or start is not on white space, and white space should | |
| 3520 * not be included ("word"), find end of word. | |
| 3521 */ | |
| 3522 if ((cls() == 0) == include) | |
| 3523 { | |
| 3524 if (end_word(1L, bigword, TRUE, TRUE) == FAIL) | |
| 3525 return FAIL; | |
| 3526 } | |
| 3527 else | |
| 3528 { | |
| 3529 /* | |
| 3530 * If the start is not on white space, and white space should be | |
| 3531 * included ("word "), or start is on white space and white | |
| 3532 * space should not be included (" "), find start of word. | |
| 3533 * If we end up in the first column of the next line (single char | |
| 3534 * word) back up to end of the line. | |
| 3535 */ | |
| 3536 fwd_word(1L, bigword, TRUE); | |
| 3537 if (curwin->w_cursor.col == 0) | |
| 3538 decl(&curwin->w_cursor); | |
| 3539 else | |
| 3540 oneleft(); | |
| 3541 | |
| 3542 if (include) | |
| 3543 include_white = TRUE; | |
| 3544 } | |
| 3545 | |
| 3546 if (VIsual_active) | |
| 3547 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3548 // should do something when inclusive == FALSE ! |
| 7 | 3549 VIsual = start_pos; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3550 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3551 } |
| 3552 else | |
| 3553 { | |
| 3554 oap->start = start_pos; | |
| 3555 oap->motion_type = MCHAR; | |
| 3556 } | |
| 3557 --count; | |
| 3558 } | |
| 3559 | |
| 3560 /* | |
| 3561 * When count is still > 0, extend with more objects. | |
| 3562 */ | |
| 3563 while (count > 0) | |
| 3564 { | |
| 3565 inclusive = TRUE; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3566 if (VIsual_active && LT_POS(curwin->w_cursor, VIsual)) |
| 7 | 3567 { |
| 3568 /* | |
| 3569 * In Visual mode, with cursor at start: move cursor back. | |
| 3570 */ | |
| 3571 if (decl(&curwin->w_cursor) == -1) | |
| 3572 return FAIL; | |
| 3573 if (include != (cls() != 0)) | |
| 3574 { | |
| 3575 if (bck_word(1L, bigword, TRUE) == FAIL) | |
| 3576 return FAIL; | |
| 3577 } | |
| 3578 else | |
| 3579 { | |
| 3580 if (bckend_word(1L, bigword, TRUE) == FAIL) | |
| 3581 return FAIL; | |
| 3582 (void)incl(&curwin->w_cursor); | |
| 3583 } | |
| 3584 } | |
| 3585 else | |
| 3586 { | |
| 3587 /* | |
| 3588 * Move cursor forward one word and/or white area. | |
| 3589 */ | |
| 3590 if (incl(&curwin->w_cursor) == -1) | |
| 3591 return FAIL; | |
| 3592 if (include != (cls() == 0)) | |
| 3593 { | |
| 96 | 3594 if (fwd_word(1L, bigword, TRUE) == FAIL && count > 1) |
| 7 | 3595 return FAIL; |
| 3596 /* | |
| 3597 * If end is just past a new-line, we don't want to include | |
| 96 | 3598 * the first character on the line. |
| 3599 * Put cursor on last char of white. | |
| 7 | 3600 */ |
| 96 | 3601 if (oneleft() == FAIL) |
| 7 | 3602 inclusive = FALSE; |
| 3603 } | |
| 3604 else | |
| 3605 { | |
| 3606 if (end_word(1L, bigword, TRUE, TRUE) == FAIL) | |
| 3607 return FAIL; | |
| 3608 } | |
| 3609 } | |
| 3610 --count; | |
| 3611 } | |
| 3612 | |
| 9 | 3613 if (include_white && (cls() != 0 |
| 3614 || (curwin->w_cursor.col == 0 && !inclusive))) | |
| 7 | 3615 { |
| 3616 /* | |
| 3617 * If we don't include white space at the end, move the start | |
| 3618 * to include some white space there. This makes "daw" work | |
| 3619 * better on the last word in a sentence (and "2daw" on last-but-one | |
| 9 | 3620 * word). Also when "2daw" deletes "word." at the end of the line |
| 3621 * (cursor is at start of next line). | |
| 3622 * But don't delete white space at start of line (indent). | |
| 7 | 3623 */ |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3624 pos = curwin->w_cursor; // save cursor position |
| 7 | 3625 curwin->w_cursor = start_pos; |
| 3626 if (oneleft() == OK) | |
| 3627 { | |
| 3628 back_in_line(); | |
| 3629 if (cls() == 0 && curwin->w_cursor.col > 0) | |
| 3630 { | |
| 3631 if (VIsual_active) | |
| 3632 VIsual = curwin->w_cursor; | |
| 3633 else | |
| 3634 oap->start = curwin->w_cursor; | |
| 3635 } | |
| 3636 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3637 curwin->w_cursor = pos; // put cursor back at end |
| 7 | 3638 } |
| 3639 | |
| 3640 if (VIsual_active) | |
| 3641 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3642 if (*p_sel == 'e' && inclusive && LTOREQ_POS(VIsual, curwin->w_cursor)) |
| 7 | 3643 inc_cursor(); |
| 3644 if (VIsual_mode == 'V') | |
| 3645 { | |
| 3646 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3647 redraw_cmdline = TRUE; // show mode later |
| 7 | 3648 } |
| 3649 } | |
| 3650 else | |
| 3651 oap->inclusive = inclusive; | |
| 3652 | |
| 3653 return OK; | |
| 3654 } | |
| 3655 | |
| 3656 /* | |
| 3657 * Find sentence(s) under the cursor, cursor at end. | |
| 3658 * When Visual active, extend it by one or more sentences. | |
| 3659 */ | |
| 3660 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3661 current_sent(oparg_T *oap, long count, int include) |
| 7 | 3662 { |
| 3663 pos_T start_pos; | |
| 3664 pos_T pos; | |
| 3665 int start_blank; | |
| 3666 int c; | |
| 3667 int at_start_sent; | |
| 3668 long ncount; | |
| 3669 | |
| 3670 start_pos = curwin->w_cursor; | |
| 3671 pos = start_pos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3672 findsent(FORWARD, 1L); // Find start of next sentence. |
| 7 | 3673 |
| 3674 /* | |
| 3701 | 3675 * When the Visual area is bigger than one character: Extend it. |
| 7 | 3676 */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3677 if (VIsual_active && !EQUAL_POS(start_pos, VIsual)) |
| 7 | 3678 { |
| 3679 extend: | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3680 if (LT_POS(start_pos, VIsual)) |
| 7 | 3681 { |
| 3682 /* | |
| 3683 * Cursor at start of Visual area. | |
| 3684 * Find out where we are: | |
| 3685 * - in the white space before a sentence | |
| 3686 * - in a sentence or just after it | |
| 3687 * - at the start of a sentence | |
| 3688 */ | |
| 3689 at_start_sent = TRUE; | |
| 3690 decl(&pos); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3691 while (LT_POS(pos, curwin->w_cursor)) |
| 7 | 3692 { |
| 3693 c = gchar_pos(&pos); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3694 if (!VIM_ISWHITE(c)) |
| 7 | 3695 { |
| 3696 at_start_sent = FALSE; | |
| 3697 break; | |
| 3698 } | |
| 3699 incl(&pos); | |
| 3700 } | |
| 3701 if (!at_start_sent) | |
| 3702 { | |
| 3703 findsent(BACKWARD, 1L); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3704 if (EQUAL_POS(curwin->w_cursor, start_pos)) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3705 at_start_sent = TRUE; // exactly at start of sentence |
| 7 | 3706 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3707 // inside a sentence, go to its end (start of next) |
| 7 | 3708 findsent(FORWARD, 1L); |
| 3709 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3710 if (include) // "as" gets twice as much as "is" |
| 7 | 3711 count *= 2; |
| 3712 while (count--) | |
| 3713 { | |
| 3714 if (at_start_sent) | |
| 3715 find_first_blank(&curwin->w_cursor); | |
| 3716 c = gchar_cursor(); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3717 if (!at_start_sent || (!include && !VIM_ISWHITE(c))) |
| 7 | 3718 findsent(BACKWARD, 1L); |
| 3719 at_start_sent = !at_start_sent; | |
| 3720 } | |
| 3721 } | |
| 3722 else | |
| 3723 { | |
| 3724 /* | |
| 3725 * Cursor at end of Visual area. | |
| 3726 * Find out where we are: | |
| 3727 * - just before a sentence | |
| 3728 * - just before or in the white space before a sentence | |
| 3729 * - in a sentence | |
| 3730 */ | |
| 3731 incl(&pos); | |
| 3732 at_start_sent = TRUE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3733 // not just before a sentence |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3734 if (!EQUAL_POS(pos, curwin->w_cursor)) |
| 7 | 3735 { |
| 3736 at_start_sent = FALSE; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3737 while (LT_POS(pos, curwin->w_cursor)) |
| 7 | 3738 { |
| 3739 c = gchar_pos(&pos); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3740 if (!VIM_ISWHITE(c)) |
| 7 | 3741 { |
| 3742 at_start_sent = TRUE; | |
| 3743 break; | |
| 3744 } | |
| 3745 incl(&pos); | |
| 3746 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3747 if (at_start_sent) // in the sentence |
| 7 | 3748 findsent(BACKWARD, 1L); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3749 else // in/before white before a sentence |
| 7 | 3750 curwin->w_cursor = start_pos; |
| 3751 } | |
| 3752 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3753 if (include) // "as" gets twice as much as "is" |
| 7 | 3754 count *= 2; |
| 3755 findsent_forward(count, at_start_sent); | |
| 3756 if (*p_sel == 'e') | |
| 3757 ++curwin->w_cursor.col; | |
| 3758 } | |
| 3759 return OK; | |
| 3760 } | |
| 3761 | |
| 3762 /* | |
| 3701 | 3763 * If the cursor started on a blank, check if it is just before the start |
| 3764 * of the next sentence. | |
| 7 | 3765 */ |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3766 while (c = gchar_pos(&pos), VIM_ISWHITE(c)) // VIM_ISWHITE() is a macro |
| 7 | 3767 incl(&pos); |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3768 if (EQUAL_POS(pos, curwin->w_cursor)) |
| 7 | 3769 { |
| 3770 start_blank = TRUE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3771 find_first_blank(&start_pos); // go back to first blank |
| 7 | 3772 } |
| 3773 else | |
| 3774 { | |
| 3775 start_blank = FALSE; | |
| 3776 findsent(BACKWARD, 1L); | |
| 3777 start_pos = curwin->w_cursor; | |
| 3778 } | |
| 3779 if (include) | |
| 3780 ncount = count * 2; | |
| 3781 else | |
| 3782 { | |
| 3783 ncount = count; | |
| 3784 if (start_blank) | |
| 3785 --ncount; | |
| 3786 } | |
| 45 | 3787 if (ncount > 0) |
| 7 | 3788 findsent_forward(ncount, TRUE); |
| 3789 else | |
| 3790 decl(&curwin->w_cursor); | |
| 3791 | |
| 3792 if (include) | |
| 3793 { | |
| 3794 /* | |
| 3795 * If the blank in front of the sentence is included, exclude the | |
| 3796 * blanks at the end of the sentence, go back to the first blank. | |
| 3797 * If there are no trailing blanks, try to include leading blanks. | |
| 3798 */ | |
| 3799 if (start_blank) | |
| 3800 { | |
| 3801 find_first_blank(&curwin->w_cursor); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3802 c = gchar_pos(&curwin->w_cursor); // VIM_ISWHITE() is a macro |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3803 if (VIM_ISWHITE(c)) |
| 7 | 3804 decl(&curwin->w_cursor); |
| 3805 } | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3806 else if (c = gchar_cursor(), !VIM_ISWHITE(c)) |
| 7 | 3807 find_first_blank(&start_pos); |
| 3808 } | |
| 3809 | |
| 3810 if (VIsual_active) | |
| 3811 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3812 // Avoid getting stuck with "is" on a single space before a sentence. |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3813 if (EQUAL_POS(start_pos, curwin->w_cursor)) |
| 7 | 3814 goto extend; |
| 3815 if (*p_sel == 'e') | |
| 3816 ++curwin->w_cursor.col; | |
| 3817 VIsual = start_pos; | |
| 3818 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3819 redraw_cmdline = TRUE; // show mode later |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3820 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3821 } |
| 3822 else | |
| 3823 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3824 // include a newline after the sentence, if there is one |
| 7 | 3825 if (incl(&curwin->w_cursor) == -1) |
| 3826 oap->inclusive = TRUE; | |
| 3827 else | |
| 3828 oap->inclusive = FALSE; | |
| 3829 oap->start = start_pos; | |
| 3830 oap->motion_type = MCHAR; | |
| 3831 } | |
| 3832 return OK; | |
| 3833 } | |
| 3834 | |
| 423 | 3835 /* |
| 3836 * Find block under the cursor, cursor at end. | |
| 4352 | 3837 * "what" and "other" are two matching parenthesis/brace/etc. |
| 423 | 3838 */ |
| 7 | 3839 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3840 current_block( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3841 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3842 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3843 int include, // TRUE == include white space |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3844 int what, // '(', '{', etc. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3845 int other) // ')', '}', etc. |
| 7 | 3846 { |
| 3847 pos_T old_pos; | |
| 3848 pos_T *pos = NULL; | |
| 3849 pos_T start_pos; | |
| 3850 pos_T *end_pos; | |
| 3851 pos_T old_start, old_end; | |
| 3852 char_u *save_cpo; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3853 int sol = FALSE; // '{' at start of line |
| 7 | 3854 |
| 3855 old_pos = curwin->w_cursor; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3856 old_end = curwin->w_cursor; // remember where we started |
| 7 | 3857 old_start = old_end; |
| 3858 | |
| 3859 /* | |
| 3860 * If we start on '(', '{', ')', '}', etc., use the whole block inclusive. | |
| 3861 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3862 if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor)) |
| 7 | 3863 { |
| 3864 setpcmark(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3865 if (what == '{') // ignore indent |
| 7 | 3866 while (inindent(1)) |
| 3867 if (inc_cursor() != 0) | |
| 3868 break; | |
| 423 | 3869 if (gchar_cursor() == what) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3870 // cursor on '(' or '{', move cursor just after it |
| 7 | 3871 ++curwin->w_cursor.col; |
| 3872 } | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3873 else if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 3874 { |
| 3875 old_start = VIsual; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3876 curwin->w_cursor = VIsual; // cursor at low end of Visual |
| 7 | 3877 } |
| 3878 else | |
| 3879 old_end = VIsual; | |
| 3880 | |
| 3881 /* | |
| 3882 * Search backwards for unclosed '(', '{', etc.. | |
| 3883 * Put this position in start_pos. | |
| 6675 | 3884 * Ignore quotes here. Keep the "M" flag in 'cpo', as that is what the |
| 3885 * user wants. | |
| 7 | 3886 */ |
| 3887 save_cpo = p_cpo; | |
| 6675 | 3888 p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%"); |
| 7 | 3889 while (count-- > 0) |
| 3890 { | |
| 3891 if ((pos = findmatch(NULL, what)) == NULL) | |
| 3892 break; | |
| 3893 curwin->w_cursor = *pos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3894 start_pos = *pos; // the findmatch for end_pos will overwrite *pos |
| 7 | 3895 } |
| 3896 p_cpo = save_cpo; | |
| 3897 | |
| 3898 /* | |
| 3899 * Search for matching ')', '}', etc. | |
| 3900 * Put this position in curwin->w_cursor. | |
| 3901 */ | |
| 3902 if (pos == NULL || (end_pos = findmatch(NULL, other)) == NULL) | |
| 3903 { | |
| 3904 curwin->w_cursor = old_pos; | |
| 3905 return FAIL; | |
| 3906 } | |
| 3907 curwin->w_cursor = *end_pos; | |
| 3908 | |
| 3909 /* | |
| 3910 * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE. | |
| 5975 | 3911 * If the ending '}', ')' or ']' is only preceded by indent, skip that |
| 3912 * indent. But only if the resulting area is not smaller than what we | |
| 3913 * started with. | |
| 7 | 3914 */ |
| 3915 while (!include) | |
| 3916 { | |
| 3917 incl(&start_pos); | |
| 3918 sol = (curwin->w_cursor.col == 0); | |
| 3919 decl(&curwin->w_cursor); | |
| 5975 | 3920 while (inindent(1)) |
| 3921 { | |
| 3922 sol = TRUE; | |
| 3923 if (decl(&curwin->w_cursor) != 0) | |
| 3924 break; | |
| 3925 } | |
| 3926 | |
| 7 | 3927 /* |
| 3928 * In Visual mode, when the resulting area is not bigger than what we | |
| 3929 * started with, extend it to the next block, and then exclude again. | |
| 3930 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3931 if (!LT_POS(start_pos, old_start) && !LT_POS(old_end, curwin->w_cursor) |
| 7 | 3932 && VIsual_active) |
| 3933 { | |
| 3934 curwin->w_cursor = old_start; | |
| 3935 decl(&curwin->w_cursor); | |
| 3936 if ((pos = findmatch(NULL, what)) == NULL) | |
| 3937 { | |
| 3938 curwin->w_cursor = old_pos; | |
| 3939 return FAIL; | |
| 3940 } | |
| 3941 start_pos = *pos; | |
| 3942 curwin->w_cursor = *pos; | |
| 3943 if ((end_pos = findmatch(NULL, other)) == NULL) | |
| 3944 { | |
| 3945 curwin->w_cursor = old_pos; | |
| 3946 return FAIL; | |
| 3947 } | |
| 3948 curwin->w_cursor = *end_pos; | |
| 3949 } | |
| 3950 else | |
| 3951 break; | |
| 3952 } | |
| 3953 | |
| 3954 if (VIsual_active) | |
| 3955 { | |
| 3956 if (*p_sel == 'e') | |
|
7070
d92910c0c415
commit https://github.com/vim/vim/commit/8667d66ca923d361e00e6369cbff37283db5a432
Christian Brabandt <cb@256bit.org>
parents:
7054
diff
changeset
|
3957 inc(&curwin->w_cursor); |
| 557 | 3958 if (sol && gchar_cursor() != NUL) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3959 inc(&curwin->w_cursor); // include the line break |
| 7 | 3960 VIsual = start_pos; |
| 3961 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3962 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3963 showmode(); |
| 3964 } | |
| 3965 else | |
| 3966 { | |
| 3967 oap->start = start_pos; | |
| 3968 oap->motion_type = MCHAR; | |
| 1290 | 3969 oap->inclusive = FALSE; |
| 7 | 3970 if (sol) |
| 3971 incl(&curwin->w_cursor); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3972 else if (LTOREQ_POS(start_pos, curwin->w_cursor)) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3973 // Include the character under the cursor. |
| 1290 | 3974 oap->inclusive = TRUE; |
| 7 | 3975 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3976 // End is before the start (no text in between <>, [], etc.): don't |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3977 // operate on any text. |
| 1290 | 3978 curwin->w_cursor = start_pos; |
| 7 | 3979 } |
| 3980 | |
| 3981 return OK; | |
| 3982 } | |
| 3983 | |
| 423 | 3984 /* |
| 3985 * Return TRUE if the cursor is on a "<aaa>" tag. Ignore "<aaa/>". | |
| 3986 * When "end_tag" is TRUE return TRUE if the cursor is on "</aaa>". | |
| 3987 */ | |
| 3988 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3989 in_html_tag( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3990 int end_tag) |
| 423 | 3991 { |
| 3992 char_u *line = ml_get_curline(); | |
| 3993 char_u *p; | |
| 3994 int c; | |
| 3995 int lc = NUL; | |
| 3996 pos_T pos; | |
| 3997 | |
| 3998 if (enc_dbcs) | |
| 3999 { | |
| 4000 char_u *lp = NULL; | |
| 4001 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4002 // We search forward until the cursor, because searching backwards is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4003 // very slow for DBCS encodings. |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4004 for (p = line; p < line + curwin->w_cursor.col; MB_PTR_ADV(p)) |
| 423 | 4005 if (*p == '>' || *p == '<') |
| 4006 { | |
| 4007 lc = *p; | |
| 4008 lp = p; | |
| 4009 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4010 if (*p != '<') // check for '<' under cursor |
| 423 | 4011 { |
| 4012 if (lc != '<') | |
| 4013 return FALSE; | |
| 4014 p = lp; | |
| 4015 } | |
| 4016 } | |
| 4017 else | |
| 4018 { | |
| 4019 for (p = line + curwin->w_cursor.col; p > line; ) | |
| 4020 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4021 if (*p == '<') // find '<' under/before cursor |
| 423 | 4022 break; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4023 MB_PTR_BACK(line, p); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4024 if (*p == '>') // find '>' before cursor |
| 423 | 4025 break; |
| 4026 } | |
| 4027 if (*p != '<') | |
| 4028 return FALSE; | |
| 4029 } | |
| 4030 | |
| 4031 pos.lnum = curwin->w_cursor.lnum; | |
| 835 | 4032 pos.col = (colnr_T)(p - line); |
| 423 | 4033 |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4034 MB_PTR_ADV(p); |
| 423 | 4035 if (end_tag) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4036 // check that there is a '/' after the '<' |
| 423 | 4037 return *p == '/'; |
| 4038 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4039 // check that there is no '/' after the '<' |
| 423 | 4040 if (*p == '/') |
| 4041 return FALSE; | |
| 4042 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4043 // check that the matching '>' is not preceded by '/' |
| 423 | 4044 for (;;) |
| 4045 { | |
| 4046 if (inc(&pos) < 0) | |
| 4047 return FALSE; | |
| 4048 c = *ml_get_pos(&pos); | |
| 4049 if (c == '>') | |
| 4050 break; | |
| 4051 lc = c; | |
| 4052 } | |
| 4053 return lc != '/'; | |
| 4054 } | |
| 4055 | |
| 4056 /* | |
| 4057 * Find tag block under the cursor, cursor at end. | |
| 4058 */ | |
| 4059 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4060 current_tagblock( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4061 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4062 long count_arg, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4063 int include) // TRUE == include white space |
| 423 | 4064 { |
| 4065 long count = count_arg; | |
| 4066 long n; | |
| 4067 pos_T old_pos; | |
| 4068 pos_T start_pos; | |
| 4069 pos_T end_pos; | |
| 4070 pos_T old_start, old_end; | |
| 4071 char_u *spat, *epat; | |
| 4072 char_u *p; | |
| 4073 char_u *cp; | |
| 4074 int len; | |
| 4075 int r; | |
| 4076 int do_include = include; | |
| 4077 int save_p_ws = p_ws; | |
| 4078 int retval = FAIL; | |
| 6661 | 4079 int is_inclusive = TRUE; |
| 423 | 4080 |
| 4081 p_ws = FALSE; | |
| 4082 | |
| 4083 old_pos = curwin->w_cursor; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4084 old_end = curwin->w_cursor; // remember where we started |
| 423 | 4085 old_start = old_end; |
| 1527 | 4086 if (!VIsual_active || *p_sel == 'e') |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4087 decl(&old_end); // old_end is inclusive |
| 423 | 4088 |
| 4089 /* | |
| 435 | 4090 * If we start on "<aaa>" select that block. |
| 423 | 4091 */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4092 if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor)) |
| 423 | 4093 { |
| 4094 setpcmark(); | |
| 4095 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4096 // ignore indent |
| 423 | 4097 while (inindent(1)) |
| 4098 if (inc_cursor() != 0) | |
| 4099 break; | |
| 4100 | |
| 4101 if (in_html_tag(FALSE)) | |
| 4102 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4103 // cursor on start tag, move to its '>' |
| 423 | 4104 while (*ml_get_cursor() != '>') |
| 4105 if (inc_cursor() < 0) | |
| 4106 break; | |
| 4107 } | |
| 4108 else if (in_html_tag(TRUE)) | |
| 4109 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4110 // cursor on end tag, move to just before it |
| 423 | 4111 while (*ml_get_cursor() != '<') |
| 4112 if (dec_cursor() < 0) | |
| 4113 break; | |
| 4114 dec_cursor(); | |
| 4115 old_end = curwin->w_cursor; | |
| 4116 } | |
| 4117 } | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4118 else if (LT_POS(VIsual, curwin->w_cursor)) |
| 423 | 4119 { |
| 4120 old_start = VIsual; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4121 curwin->w_cursor = VIsual; // cursor at low end of Visual |
| 423 | 4122 } |
| 4123 else | |
| 4124 old_end = VIsual; | |
| 4125 | |
| 4126 again: | |
| 4127 /* | |
| 4128 * Search backwards for unclosed "<aaa>". | |
| 4129 * Put this position in start_pos. | |
| 4130 */ | |
| 4131 for (n = 0; n < count; ++n) | |
| 4132 { | |
| 435 | 4133 if (do_searchpair((char_u *)"<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)", |
| 423 | 4134 (char_u *)"", |
|
12722
7749260f261c
patch 8.0.1239: cannot use a lambda for the skip argument to searchpair()
Christian Brabandt <cb@256bit.org>
parents:
12720
diff
changeset
|
4135 (char_u *)"</[^>]*>", BACKWARD, NULL, 0, |
| 1496 | 4136 NULL, (linenr_T)0, 0L) <= 0) |
| 423 | 4137 { |
| 4138 curwin->w_cursor = old_pos; | |
| 4139 goto theend; | |
| 4140 } | |
| 4141 } | |
| 4142 start_pos = curwin->w_cursor; | |
| 4143 | |
| 4144 /* | |
| 4145 * Search for matching "</aaa>". First isolate the "aaa". | |
| 4146 */ | |
| 4147 inc_cursor(); | |
| 4148 p = ml_get_cursor(); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4149 for (cp = p; *cp != NUL && *cp != '>' && !VIM_ISWHITE(*cp); MB_PTR_ADV(cp)) |
| 423 | 4150 ; |
| 835 | 4151 len = (int)(cp - p); |
| 423 | 4152 if (len == 0) |
| 4153 { | |
| 4154 curwin->w_cursor = old_pos; | |
| 4155 goto theend; | |
| 4156 } | |
| 3306 | 4157 spat = alloc(len + 31); |
| 423 | 4158 epat = alloc(len + 9); |
| 4159 if (spat == NULL || epat == NULL) | |
| 4160 { | |
| 4161 vim_free(spat); | |
| 4162 vim_free(epat); | |
| 4163 curwin->w_cursor = old_pos; | |
| 4164 goto theend; | |
| 4165 } | |
| 3306 | 4166 sprintf((char *)spat, "<%.*s\\>\\%%(\\s\\_[^>]\\{-}[^/]>\\|>\\)\\c", len, p); |
| 423 | 4167 sprintf((char *)epat, "</%.*s>\\c", len, p); |
| 4168 | |
|
12722
7749260f261c
patch 8.0.1239: cannot use a lambda for the skip argument to searchpair()
Christian Brabandt <cb@256bit.org>
parents:
12720
diff
changeset
|
4169 r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL, |
| 1496 | 4170 0, NULL, (linenr_T)0, 0L); |
| 423 | 4171 |
| 4172 vim_free(spat); | |
| 4173 vim_free(epat); | |
| 4174 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4175 if (r < 1 || LT_POS(curwin->w_cursor, old_end)) |
| 423 | 4176 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4177 // Can't find other end or it's before the previous end. Could be a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4178 // HTML tag that doesn't have a matching end. Search backwards for |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4179 // another starting tag. |
| 423 | 4180 count = 1; |
| 4181 curwin->w_cursor = start_pos; | |
| 4182 goto again; | |
| 4183 } | |
| 4184 | |
|
13762
9de2b25932eb
patch 8.0.1753: various warnings from a static analyser
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
4185 if (do_include) |
| 423 | 4186 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4187 // Include up to the '>'. |
| 423 | 4188 while (*ml_get_cursor() != '>') |
| 4189 if (inc_cursor() < 0) | |
| 4190 break; | |
| 4191 } | |
| 4192 else | |
| 4193 { | |
| 6661 | 4194 char_u *c = ml_get_cursor(); |
| 4195 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4196 // Exclude the '<' of the end tag. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4197 // If the closing tag is on new line, do not decrement cursor, but |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4198 // make operation exclusive, so that the linefeed will be selected |
| 6661 | 4199 if (*c == '<' && !VIsual_active && curwin->w_cursor.col == 0) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4200 // do not decrement cursor |
| 6661 | 4201 is_inclusive = FALSE; |
| 4202 else if (*c == '<') | |
| 423 | 4203 dec_cursor(); |
| 4204 } | |
| 4205 end_pos = curwin->w_cursor; | |
| 4206 | |
| 4207 if (!do_include) | |
| 4208 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4209 // Exclude the start tag. |
| 423 | 4210 curwin->w_cursor = start_pos; |
| 4211 while (inc_cursor() >= 0) | |
| 1290 | 4212 if (*ml_get_cursor() == '>') |
| 423 | 4213 { |
| 4214 inc_cursor(); | |
| 4215 start_pos = curwin->w_cursor; | |
| 4216 break; | |
| 4217 } | |
| 4218 curwin->w_cursor = end_pos; | |
| 4219 | |
|
14554
e7f92d1a3fcd
patch 8.1.0290: "cit" on an empty HTML tag changes the whole tag
Christian Brabandt <cb@256bit.org>
parents:
14131
diff
changeset
|
4220 // If we are in Visual mode and now have the same text as before set |
|
e7f92d1a3fcd
patch 8.1.0290: "cit" on an empty HTML tag changes the whole tag
Christian Brabandt <cb@256bit.org>
parents:
14131
diff
changeset
|
4221 // "do_include" and try again. |
|
e7f92d1a3fcd
patch 8.1.0290: "cit" on an empty HTML tag changes the whole tag
Christian Brabandt <cb@256bit.org>
parents:
14131
diff
changeset
|
4222 if (VIsual_active && EQUAL_POS(start_pos, old_start) |
|
e7f92d1a3fcd
patch 8.1.0290: "cit" on an empty HTML tag changes the whole tag
Christian Brabandt <cb@256bit.org>
parents:
14131
diff
changeset
|
4223 && EQUAL_POS(end_pos, old_end)) |
| 423 | 4224 { |
| 4225 do_include = TRUE; | |
| 4226 curwin->w_cursor = old_start; | |
| 4227 count = count_arg; | |
| 4228 goto again; | |
| 4229 } | |
| 4230 } | |
| 4231 | |
| 4232 if (VIsual_active) | |
| 4233 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4234 // If the end is before the start there is no text between tags, select |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4235 // the char under the cursor. |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4236 if (LT_POS(end_pos, start_pos)) |
| 1290 | 4237 curwin->w_cursor = start_pos; |
| 4238 else if (*p_sel == 'e') | |
| 6434 | 4239 inc_cursor(); |
| 423 | 4240 VIsual = start_pos; |
| 4241 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4242 redraw_curbuf_later(INVERTED); // update the inversion |
| 423 | 4243 showmode(); |
| 4244 } | |
| 4245 else | |
| 4246 { | |
| 4247 oap->start = start_pos; | |
| 4248 oap->motion_type = MCHAR; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4249 if (LT_POS(end_pos, start_pos)) |
| 1290 | 4250 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4251 // End is before the start: there is no text between tags; operate |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4252 // on an empty area. |
| 1290 | 4253 curwin->w_cursor = start_pos; |
| 4254 oap->inclusive = FALSE; | |
| 4255 } | |
| 4256 else | |
| 6661 | 4257 oap->inclusive = is_inclusive; |
| 423 | 4258 } |
| 4259 retval = OK; | |
| 4260 | |
| 4261 theend: | |
| 4262 p_ws = save_p_ws; | |
| 4263 return retval; | |
| 4264 } | |
| 4265 | |
| 7 | 4266 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4267 current_par( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4268 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4269 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4270 int include, // TRUE == include white space |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4271 int type) // 'p' for paragraph, 'S' for section |
| 7 | 4272 { |
| 4273 linenr_T start_lnum; | |
| 4274 linenr_T end_lnum; | |
| 4275 int white_in_front; | |
| 4276 int dir; | |
| 4277 int start_is_white; | |
| 4278 int prev_start_is_white; | |
| 4279 int retval = OK; | |
| 4280 int do_white = FALSE; | |
| 4281 int t; | |
| 4282 int i; | |
| 4283 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4284 if (type == 'S') // not implemented yet |
| 7 | 4285 return FAIL; |
| 4286 | |
| 4287 start_lnum = curwin->w_cursor.lnum; | |
| 4288 | |
| 4289 /* | |
| 4290 * When visual area is more than one line: extend it. | |
| 4291 */ | |
| 4292 if (VIsual_active && start_lnum != VIsual.lnum) | |
| 4293 { | |
| 4294 extend: | |
| 4295 if (start_lnum < VIsual.lnum) | |
| 4296 dir = BACKWARD; | |
| 4297 else | |
| 4298 dir = FORWARD; | |
| 4299 for (i = count; --i >= 0; ) | |
| 4300 { | |
| 4301 if (start_lnum == | |
| 4302 (dir == BACKWARD ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4303 { | |
| 4304 retval = FAIL; | |
| 4305 break; | |
| 4306 } | |
| 4307 | |
| 4308 prev_start_is_white = -1; | |
| 4309 for (t = 0; t < 2; ++t) | |
| 4310 { | |
| 4311 start_lnum += dir; | |
| 4312 start_is_white = linewhite(start_lnum); | |
| 4313 if (prev_start_is_white == start_is_white) | |
| 4314 { | |
| 4315 start_lnum -= dir; | |
| 4316 break; | |
| 4317 } | |
| 4318 for (;;) | |
| 4319 { | |
| 4320 if (start_lnum == (dir == BACKWARD | |
| 4321 ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4322 break; | |
| 4323 if (start_is_white != linewhite(start_lnum + dir) | |
| 4324 || (!start_is_white | |
| 4325 && startPS(start_lnum + (dir > 0 | |
| 4326 ? 1 : 0), 0, 0))) | |
| 4327 break; | |
| 4328 start_lnum += dir; | |
| 4329 } | |
| 4330 if (!include) | |
| 4331 break; | |
| 4332 if (start_lnum == (dir == BACKWARD | |
| 4333 ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4334 break; | |
| 4335 prev_start_is_white = start_is_white; | |
| 4336 } | |
| 4337 } | |
| 4338 curwin->w_cursor.lnum = start_lnum; | |
| 4339 curwin->w_cursor.col = 0; | |
| 4340 return retval; | |
| 4341 } | |
| 4342 | |
| 4343 /* | |
| 4344 * First move back to the start_lnum of the paragraph or white lines | |
| 4345 */ | |
| 4346 white_in_front = linewhite(start_lnum); | |
| 4347 while (start_lnum > 1) | |
| 4348 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4349 if (white_in_front) // stop at first white line |
| 7 | 4350 { |
| 4351 if (!linewhite(start_lnum - 1)) | |
| 4352 break; | |
| 4353 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4354 else // stop at first non-white line of start of paragraph |
| 7 | 4355 { |
| 4356 if (linewhite(start_lnum - 1) || startPS(start_lnum, 0, 0)) | |
| 4357 break; | |
| 4358 } | |
| 4359 --start_lnum; | |
| 4360 } | |
| 4361 | |
| 4362 /* | |
| 4363 * Move past the end of any white lines. | |
| 4364 */ | |
| 4365 end_lnum = start_lnum; | |
| 692 | 4366 while (end_lnum <= curbuf->b_ml.ml_line_count && linewhite(end_lnum)) |
| 4367 ++end_lnum; | |
| 7 | 4368 |
| 4369 --end_lnum; | |
| 4370 i = count; | |
| 4371 if (!include && white_in_front) | |
| 4372 --i; | |
| 4373 while (i--) | |
| 4374 { | |
| 4375 if (end_lnum == curbuf->b_ml.ml_line_count) | |
| 4376 return FAIL; | |
| 4377 | |
| 4378 if (!include) | |
| 4379 do_white = linewhite(end_lnum + 1); | |
| 4380 | |
| 4381 if (include || !do_white) | |
| 4382 { | |
| 4383 ++end_lnum; | |
| 4384 /* | |
| 4385 * skip to end of paragraph | |
| 4386 */ | |
| 4387 while (end_lnum < curbuf->b_ml.ml_line_count | |
| 4388 && !linewhite(end_lnum + 1) | |
| 4389 && !startPS(end_lnum + 1, 0, 0)) | |
| 4390 ++end_lnum; | |
| 4391 } | |
| 4392 | |
| 4393 if (i == 0 && white_in_front && include) | |
| 4394 break; | |
| 4395 | |
| 4396 /* | |
| 4397 * skip to end of white lines after paragraph | |
| 4398 */ | |
| 4399 if (include || do_white) | |
| 4400 while (end_lnum < curbuf->b_ml.ml_line_count | |
| 4401 && linewhite(end_lnum + 1)) | |
| 4402 ++end_lnum; | |
| 4403 } | |
| 4404 | |
| 4405 /* | |
| 4406 * If there are no empty lines at the end, try to find some empty lines at | |
| 4407 * the start (unless that has been done already). | |
| 4408 */ | |
| 4409 if (!white_in_front && !linewhite(end_lnum) && include) | |
| 4410 while (start_lnum > 1 && linewhite(start_lnum - 1)) | |
| 4411 --start_lnum; | |
| 4412 | |
| 4413 if (VIsual_active) | |
| 4414 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4415 // Problem: when doing "Vipipip" nothing happens in a single white |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4416 // line, we get stuck there. Trap this here. |
| 7 | 4417 if (VIsual_mode == 'V' && start_lnum == curwin->w_cursor.lnum) |
| 4418 goto extend; | |
|
10881
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4419 if (VIsual.lnum != start_lnum) |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4420 { |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4421 VIsual.lnum = start_lnum; |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4422 VIsual.col = 0; |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4423 } |
| 7 | 4424 VIsual_mode = 'V'; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4425 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 4426 showmode(); |
| 4427 } | |
| 4428 else | |
| 4429 { | |
| 4430 oap->start.lnum = start_lnum; | |
| 4431 oap->start.col = 0; | |
| 4432 oap->motion_type = MLINE; | |
| 4433 } | |
| 4434 curwin->w_cursor.lnum = end_lnum; | |
| 4435 curwin->w_cursor.col = 0; | |
| 4436 | |
| 4437 return OK; | |
| 4438 } | |
| 12 | 4439 |
| 4440 /* | |
| 4441 * Search quote char from string line[col]. | |
| 4442 * Quote character escaped by one of the characters in "escape" is not counted | |
| 4443 * as a quote. | |
| 4444 * Returns column number of "quotechar" or -1 when not found. | |
| 4445 */ | |
| 4446 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4447 find_next_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4448 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4449 int col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4450 int quotechar, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4451 char_u *escape) // escape characters, can be NULL |
| 12 | 4452 { |
| 4453 int c; | |
| 4454 | |
| 408 | 4455 for (;;) |
| 12 | 4456 { |
| 4457 c = line[col]; | |
| 4458 if (c == NUL) | |
| 4459 return -1; | |
| 4460 else if (escape != NULL && vim_strchr(escape, c)) | |
| 4461 ++col; | |
| 4462 else if (c == quotechar) | |
| 4463 break; | |
| 4464 if (has_mbyte) | |
| 474 | 4465 col += (*mb_ptr2len)(line + col); |
| 12 | 4466 else |
| 4467 ++col; | |
| 4468 } | |
| 4469 return col; | |
| 4470 } | |
| 4471 | |
| 4472 /* | |
| 4473 * Search backwards in "line" from column "col_start" to find "quotechar". | |
| 4474 * Quote character escaped by one of the characters in "escape" is not counted | |
| 4475 * as a quote. | |
| 4476 * Return the found column or zero. | |
| 4477 */ | |
| 4478 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4479 find_prev_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4480 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4481 int col_start, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4482 int quotechar, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4483 char_u *escape) // escape characters, can be NULL |
| 12 | 4484 { |
| 4485 int n; | |
| 4486 | |
| 4487 while (col_start > 0) | |
| 4488 { | |
| 4489 --col_start; | |
| 4490 col_start -= (*mb_head_off)(line, line + col_start); | |
| 4491 n = 0; | |
| 4492 if (escape != NULL) | |
| 4493 while (col_start - n > 0 && vim_strchr(escape, | |
| 4494 line[col_start - n - 1]) != NULL) | |
| 4495 ++n; | |
| 4496 if (n & 1) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4497 col_start -= n; // uneven number of escape chars, skip it |
| 12 | 4498 else if (line[col_start] == quotechar) |
| 4499 break; | |
| 4500 } | |
| 4501 return col_start; | |
| 4502 } | |
| 4503 | |
| 4504 /* | |
| 4505 * Find quote under the cursor, cursor at end. | |
| 4506 * Returns TRUE if found, else FALSE. | |
| 4507 */ | |
| 4508 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4509 current_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4510 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4511 long count, |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4512 int include, // TRUE == include quote char |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4513 int quotechar) // Quote character |
| 12 | 4514 { |
| 4515 char_u *line = ml_get_curline(); | |
| 4516 int col_end; | |
| 4517 int col_start = curwin->w_cursor.col; | |
| 4518 int inclusive = FALSE; | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4519 int vis_empty = TRUE; // Visual selection <= 1 char |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4520 int vis_bef_curs = FALSE; // Visual starts before cursor |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4521 int did_exclusive_adj = FALSE; // adjusted pos for 'selection' |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4522 int inside_quotes = FALSE; // Looks like "i'" done before |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4523 int selected_quote = FALSE; // Has quote inside selection |
| 527 | 4524 int i; |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4525 int restore_vis_bef = FALSE; // restore VIsual on abort |
| 12 | 4526 |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4527 // When 'selection' is "exclusive" move the cursor to where it would be |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4528 // with 'selection' "inclusive", so that the logic is the same for both. |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4529 // The cursor then is moved forward after adjusting the area. |
| 12 | 4530 if (VIsual_active) |
| 4531 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4532 // this only works within one line |
|
10900
9b4574d95571
patch 8.0.0339: illegal memory access with vi'
Christian Brabandt <cb@256bit.org>
parents:
10881
diff
changeset
|
4533 if (VIsual.lnum != curwin->w_cursor.lnum) |
|
9b4574d95571
patch 8.0.0339: illegal memory access with vi'
Christian Brabandt <cb@256bit.org>
parents:
10881
diff
changeset
|
4534 return FALSE; |
|
9b4574d95571
patch 8.0.0339: illegal memory access with vi'
Christian Brabandt <cb@256bit.org>
parents:
10881
diff
changeset
|
4535 |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4536 vis_bef_curs = LT_POS(VIsual, curwin->w_cursor); |
|
18644
7bfe68b637be
patch 8.1.2314: vi' sometimes does not select anything
Bram Moolenaar <Bram@vim.org>
parents:
18642
diff
changeset
|
4537 vis_empty = EQUAL_POS(VIsual, curwin->w_cursor); |
|
11478
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4538 if (*p_sel == 'e') |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4539 { |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4540 if (vis_bef_curs) |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4541 { |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4542 dec_cursor(); |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4543 did_exclusive_adj = TRUE; |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4544 } |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4545 else if (!vis_empty) |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4546 { |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4547 dec(&VIsual); |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4548 did_exclusive_adj = TRUE; |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4549 } |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4550 vis_empty = EQUAL_POS(VIsual, curwin->w_cursor); |
|
18644
7bfe68b637be
patch 8.1.2314: vi' sometimes does not select anything
Bram Moolenaar <Bram@vim.org>
parents:
18642
diff
changeset
|
4551 if (!vis_bef_curs && !vis_empty) |
|
11478
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4552 { |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4553 // VIsual needs to be the start of Visual selection. |
|
11478
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4554 pos_T t = curwin->w_cursor; |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4555 |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4556 curwin->w_cursor = VIsual; |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4557 VIsual = t; |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4558 vis_bef_curs = TRUE; |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4559 restore_vis_bef = TRUE; |
|
11478
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4560 } |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4561 } |
| 12 | 4562 } |
| 527 | 4563 |
| 4564 if (!vis_empty) | |
| 4565 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4566 // Check if the existing selection exactly spans the text inside |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4567 // quotes. |
| 527 | 4568 if (vis_bef_curs) |
| 4569 { | |
| 4570 inside_quotes = VIsual.col > 0 | |
| 4571 && line[VIsual.col - 1] == quotechar | |
| 4572 && line[curwin->w_cursor.col] != NUL | |
| 4573 && line[curwin->w_cursor.col + 1] == quotechar; | |
| 4574 i = VIsual.col; | |
| 4575 col_end = curwin->w_cursor.col; | |
| 4576 } | |
| 4577 else | |
| 4578 { | |
| 4579 inside_quotes = curwin->w_cursor.col > 0 | |
| 4580 && line[curwin->w_cursor.col - 1] == quotechar | |
| 4581 && line[VIsual.col] != NUL | |
| 4582 && line[VIsual.col + 1] == quotechar; | |
| 4583 i = curwin->w_cursor.col; | |
| 4584 col_end = VIsual.col; | |
| 4585 } | |
| 4586 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4587 // Find out if we have a quote in the selection. |
| 527 | 4588 while (i <= col_end) |
| 4589 if (line[i++] == quotechar) | |
| 4590 { | |
| 4591 selected_quote = TRUE; | |
| 4592 break; | |
| 4593 } | |
| 4594 } | |
| 4595 | |
| 12 | 4596 if (!vis_empty && line[col_start] == quotechar) |
| 4597 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4598 // Already selecting something and on a quote character. Find the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4599 // next quoted string. |
| 12 | 4600 if (vis_bef_curs) |
| 4601 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4602 // Assume we are on a closing quote: move to after the next |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4603 // opening quote. |
| 12 | 4604 col_start = find_next_quote(line, col_start + 1, quotechar, NULL); |
| 4605 if (col_start < 0) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4606 goto abort_search; |
| 12 | 4607 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4608 curbuf->b_p_qe); | |
| 4609 if (col_end < 0) | |
| 4610 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4611 // We were on a starting quote perhaps? |
| 12 | 4612 col_end = col_start; |
| 4613 col_start = curwin->w_cursor.col; | |
| 4614 } | |
| 4615 } | |
| 4616 else | |
| 4617 { | |
| 4618 col_end = find_prev_quote(line, col_start, quotechar, NULL); | |
| 4619 if (line[col_end] != quotechar) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4620 goto abort_search; |
| 12 | 4621 col_start = find_prev_quote(line, col_end, quotechar, |
| 4622 curbuf->b_p_qe); | |
| 4623 if (line[col_start] != quotechar) | |
| 4624 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4625 // We were on an ending quote perhaps? |
| 12 | 4626 col_start = col_end; |
| 4627 col_end = curwin->w_cursor.col; | |
| 4628 } | |
| 4629 } | |
| 4630 } | |
| 4631 else | |
| 5735 | 4632 |
| 4633 if (line[col_start] == quotechar || !vis_empty) | |
| 12 | 4634 { |
| 4635 int first_col = col_start; | |
| 4636 | |
| 4637 if (!vis_empty) | |
| 4638 { | |
| 4639 if (vis_bef_curs) | |
| 4640 first_col = find_next_quote(line, col_start, quotechar, NULL); | |
| 4641 else | |
| 4642 first_col = find_prev_quote(line, col_start, quotechar, NULL); | |
| 4643 } | |
| 5735 | 4644 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4645 // The cursor is on a quote, we don't know if it's the opening or |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4646 // closing quote. Search from the start of the line to find out. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4647 // Also do this when there is a Visual area, a' may leave the cursor |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4648 // in between two strings. |
| 12 | 4649 col_start = 0; |
| 408 | 4650 for (;;) |
| 12 | 4651 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4652 // Find open quote character. |
| 12 | 4653 col_start = find_next_quote(line, col_start, quotechar, NULL); |
| 4654 if (col_start < 0 || col_start > first_col) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4655 goto abort_search; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4656 // Find close quote character. |
| 12 | 4657 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4658 curbuf->b_p_qe); | |
| 4659 if (col_end < 0) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4660 goto abort_search; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4661 // If is cursor between start and end quote character, it is |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4662 // target text object. |
| 12 | 4663 if (col_start <= first_col && first_col <= col_end) |
| 4664 break; | |
| 4665 col_start = col_end + 1; | |
| 4666 } | |
| 4667 } | |
| 4668 else | |
| 4669 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4670 // Search backward for a starting quote. |
| 12 | 4671 col_start = find_prev_quote(line, col_start, quotechar, curbuf->b_p_qe); |
| 4672 if (line[col_start] != quotechar) | |
| 4673 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4674 // No quote before the cursor, look after the cursor. |
| 12 | 4675 col_start = find_next_quote(line, col_start, quotechar, NULL); |
| 4676 if (col_start < 0) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4677 goto abort_search; |
| 12 | 4678 } |
| 4679 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4680 // Find close quote character. |
| 12 | 4681 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4682 curbuf->b_p_qe); | |
| 4683 if (col_end < 0) | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4684 goto abort_search; |
| 12 | 4685 } |
| 4686 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4687 // When "include" is TRUE, include spaces after closing quote or before |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4688 // the starting quote. |
| 12 | 4689 if (include) |
| 4690 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4691 if (VIM_ISWHITE(line[col_end + 1])) |
|
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4692 while (VIM_ISWHITE(line[col_end + 1])) |
| 12 | 4693 ++col_end; |
| 4694 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4695 while (col_start > 0 && VIM_ISWHITE(line[col_start - 1])) |
| 12 | 4696 --col_start; |
| 4697 } | |
| 4698 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4699 // Set start position. After vi" another i" must include the ". |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4700 // For v2i" include the quotes. |
| 5735 | 4701 if (!include && count < 2 && (vis_empty || !inside_quotes)) |
| 12 | 4702 ++col_start; |
| 4703 curwin->w_cursor.col = col_start; | |
| 4704 if (VIsual_active) | |
| 4705 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4706 // Set the start of the Visual area when the Visual area was empty, we |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4707 // were just inside quotes or the Visual area didn't start at a quote |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4708 // and didn't include a quote. |
| 527 | 4709 if (vis_empty |
| 4710 || (vis_bef_curs | |
| 4711 && !selected_quote | |
| 4712 && (inside_quotes | |
| 4713 || (line[VIsual.col] != quotechar | |
| 4714 && (VIsual.col == 0 | |
| 4715 || line[VIsual.col - 1] != quotechar))))) | |
| 12 | 4716 { |
| 4717 VIsual = curwin->w_cursor; | |
| 4718 redraw_curbuf_later(INVERTED); | |
| 4719 } | |
| 4720 } | |
| 4721 else | |
| 4722 { | |
| 4723 oap->start = curwin->w_cursor; | |
| 4724 oap->motion_type = MCHAR; | |
| 4725 } | |
| 4726 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4727 // Set end position. |
| 12 | 4728 curwin->w_cursor.col = col_end; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4729 if ((include || count > 1 // After vi" another i" must include the ". |
| 527 | 4730 || (!vis_empty && inside_quotes) |
| 4731 ) && inc_cursor() == 2) | |
| 12 | 4732 inclusive = TRUE; |
| 4733 if (VIsual_active) | |
| 4734 { | |
| 4735 if (vis_empty || vis_bef_curs) | |
| 4736 { | |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4737 // decrement cursor when 'selection' is not exclusive |
| 12 | 4738 if (*p_sel != 'e') |
| 4739 dec_cursor(); | |
| 4740 } | |
| 4741 else | |
| 4742 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4743 // Cursor is at start of Visual area. Set the end of the Visual |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4744 // area when it was just inside quotes or it didn't end at a |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4745 // quote. |
| 527 | 4746 if (inside_quotes |
| 4747 || (!selected_quote | |
| 4748 && line[VIsual.col] != quotechar | |
| 4749 && (line[VIsual.col] == NUL | |
| 4750 || line[VIsual.col + 1] != quotechar))) | |
| 4751 { | |
| 4752 dec_cursor(); | |
| 4753 VIsual = curwin->w_cursor; | |
| 4754 } | |
| 12 | 4755 curwin->w_cursor.col = col_start; |
| 4756 } | |
| 4757 if (VIsual_mode == 'V') | |
| 4758 { | |
| 4759 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4760 redraw_cmdline = TRUE; // show mode later |
| 12 | 4761 } |
| 4762 } | |
| 4763 else | |
| 4764 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4765 // Set inclusive and other oap's flags. |
| 12 | 4766 oap->inclusive = inclusive; |
| 4767 } | |
| 4768 | |
| 4769 return OK; | |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4770 |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4771 abort_search: |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4772 if (VIsual_active && *p_sel == 'e') |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4773 { |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4774 if (did_exclusive_adj) |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4775 inc_cursor(); |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4776 if (restore_vis_bef) |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4777 { |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4778 pos_T t = curwin->w_cursor; |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4779 |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4780 curwin->w_cursor = VIsual; |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4781 VIsual = t; |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4782 } |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4783 } |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4784 return FALSE; |
| 12 | 4785 } |
| 4786 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4787 #endif // FEAT_TEXTOBJ |
| 7 | 4788 |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4789 /* |
|
18448
35e0ab1f2975
patch 8.1.2218: "gN" is off by one in Visual mode
Bram Moolenaar <Bram@vim.org>
parents:
18426
diff
changeset
|
4790 * Check if the pattern is zero-width. |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4791 * If move is TRUE, check from the beginning of the buffer, else from position |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4792 * "cur". |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4793 * "direction" is FORWARD or BACKWARD. |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4794 * Returns TRUE, FALSE or -1 for failure. |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4795 */ |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4796 static int |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4797 is_zero_width(char_u *pattern, int move, pos_T *cur, int direction) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4798 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4799 regmmatch_T regmatch; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4800 int nmatched = 0; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4801 int result = -1; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4802 pos_T pos; |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
4803 int called_emsg_before = called_emsg; |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4804 int flag = 0; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4805 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4806 if (pattern == NULL) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4807 pattern = spats[last_idx].pat; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4808 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4809 if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH, |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4810 SEARCH_KEEP, ®match) == FAIL) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4811 return -1; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4812 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4813 // init startcol correctly |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4814 regmatch.startpos[0].col = -1; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4815 // move to match |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4816 if (move) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4817 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4818 CLEAR_POS(&pos); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4819 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4820 else |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4821 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4822 pos = *cur; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4823 // accept a match at the cursor position |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4824 flag = SEARCH_START; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4825 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4826 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4827 if (searchit(curwin, curbuf, &pos, NULL, direction, pattern, 1, |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4828 SEARCH_KEEP + flag, RE_SEARCH, NULL) != FAIL) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4829 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4830 // Zero-width pattern should match somewhere, then we can check if |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4831 // start and end are in the same position. |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4832 do |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4833 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4834 regmatch.startpos[0].col++; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4835 nmatched = vim_regexec_multi(®match, curwin, curbuf, |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4836 pos.lnum, regmatch.startpos[0].col, NULL, NULL); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4837 if (nmatched != 0) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4838 break; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4839 } while (direction == FORWARD ? regmatch.startpos[0].col < pos.col |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4840 : regmatch.startpos[0].col > pos.col); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4841 |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
4842 if (called_emsg == called_emsg_before) |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4843 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4844 result = (nmatched != 0 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4845 && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4846 && regmatch.startpos[0].col == regmatch.endpos[0].col); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4847 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4848 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4849 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4850 vim_regfree(regmatch.regprog); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4851 return result; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4852 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4853 |
| 3755 | 4854 |
| 3718 | 4855 /* |
| 4856 * Find next search match under cursor, cursor at end. | |
| 4857 * Used while an operator is pending, and in Visual mode. | |
| 4858 */ | |
| 4859 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4860 current_search( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4861 long count, |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4862 int forward) // TRUE for forward, FALSE for backward |
| 3718 | 4863 { |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4864 pos_T start_pos; // start position of the pattern match |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4865 pos_T end_pos; // end position of the pattern match |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4866 pos_T orig_pos; // position of the cursor at beginning |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4867 pos_T pos; // position after the pattern |
| 3718 | 4868 int i; |
| 4869 int dir; | |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4870 int result; // result of various function calls |
| 3718 | 4871 char_u old_p_ws = p_ws; |
| 4872 int flags = 0; | |
|
5210
839ebe7c1b2f
updated for version 7.4a.031
Bram Moolenaar <bram@vim.org>
parents:
5118
diff
changeset
|
4873 pos_T save_VIsual = VIsual; |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4874 int zero_width; |
| 3718 | 4875 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4876 // Correct cursor when 'selection' is exclusive |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4877 if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor)) |
| 3718 | 4878 dec_cursor(); |
| 4879 | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4880 orig_pos = pos = curwin->w_cursor; |
| 3718 | 4881 if (VIsual_active) |
| 4882 { | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4883 if (forward) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4884 incl(&pos); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4885 else |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4886 decl(&pos); |
| 3718 | 4887 } |
| 4888 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4889 // Is the pattern is zero-width?, this time, don't care about the direction |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4890 zero_width = is_zero_width(spats[last_idx].pat, TRUE, &curwin->w_cursor, |
|
12539
6d3584b60170
patch 8.0.1148: gN doesn't work on last match with 'wrapscan' off
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
4891 FORWARD); |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4892 if (zero_width == -1) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4893 return FAIL; // pattern not found |
| 3732 | 4894 |
| 4895 /* | |
| 3718 | 4896 * The trick is to first search backwards and then search forward again, |
| 4897 * so that a match at the current cursor position will be correctly | |
| 4898 * captured. | |
| 4899 */ | |
| 4900 for (i = 0; i < 2; i++) | |
| 4901 { | |
| 4902 if (forward) | |
| 4903 dir = i; | |
| 4904 else | |
| 4905 dir = !i; | |
| 3732 | 4906 |
| 4907 flags = 0; | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4908 if (!dir && !zero_width) |
| 3732 | 4909 flags = SEARCH_END; |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4910 end_pos = pos; |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4911 |
|
18500
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4912 // wrapping should not occur in the first round |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4913 if (i == 0) |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4914 p_ws = FALSE; |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4915 |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4916 result = searchit(curwin, curbuf, &pos, &end_pos, |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4917 (dir ? FORWARD : BACKWARD), |
| 3718 | 4918 spats[last_idx].pat, (long) (i ? count : 1), |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
4919 SEARCH_KEEP | flags, RE_SEARCH, NULL); |
| 3718 | 4920 |
|
18500
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4921 p_ws = old_p_ws; |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4922 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4923 // First search may fail, but then start searching from the |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4924 // beginning of the file (cursor might be on the search match) |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4925 // except when Visual mode is active, so that extending the visual |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4926 // selection works. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4927 if (i == 1 && !result) // not found, abort |
| 3718 | 4928 { |
| 4929 curwin->w_cursor = orig_pos; | |
| 4930 if (VIsual_active) | |
| 4931 VIsual = save_VIsual; | |
| 4932 return FAIL; | |
| 4933 } | |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4934 else if (i == 0 && !result) |
| 3718 | 4935 { |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4936 if (forward) |
| 3718 | 4937 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4938 // try again from start of buffer |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4939 CLEAR_POS(&pos); |
| 3718 | 4940 } |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4941 else |
| 3718 | 4942 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4943 // try again from end of buffer |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4944 // searching backwards, so set pos to last line and col |
| 3718 | 4945 pos.lnum = curwin->w_buffer->b_ml.ml_line_count; |
| 3724 | 4946 pos.col = (colnr_T)STRLEN( |
| 4947 ml_get(curwin->w_buffer->b_ml.ml_line_count)); | |
| 3718 | 4948 } |
| 4949 } | |
| 4950 } | |
| 4951 | |
| 4952 start_pos = pos; | |
| 4953 | |
| 4954 if (!VIsual_active) | |
| 4955 VIsual = start_pos; | |
| 4956 | |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4957 // put cursor on last character of match |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4958 curwin->w_cursor = end_pos; |
|
18448
35e0ab1f2975
patch 8.1.2218: "gN" is off by one in Visual mode
Bram Moolenaar <Bram@vim.org>
parents:
18426
diff
changeset
|
4959 if (LT_POS(VIsual, end_pos) && forward) |
|
15239
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
4960 dec_cursor(); |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4961 else if (VIsual_active && LT_POS(curwin->w_cursor, VIsual)) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4962 curwin->w_cursor = pos; // put the cursor on the start of the match |
| 3718 | 4963 VIsual_active = TRUE; |
| 4964 VIsual_mode = 'v'; | |
| 4965 | |
|
15758
675dd5d7afb3
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
4966 if (*p_sel == 'e') |
| 3718 | 4967 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4968 // Correction for exclusive selection depends on the direction. |
|
15758
675dd5d7afb3
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
4969 if (forward && LTOREQ_POS(VIsual, curwin->w_cursor)) |
|
675dd5d7afb3
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
4970 inc_cursor(); |
|
675dd5d7afb3
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
4971 else if (!forward && LTOREQ_POS(curwin->w_cursor, VIsual)) |
|
675dd5d7afb3
patch 8.1.0886: compiler warning for NULL pointer and condition always true
Bram Moolenaar <Bram@vim.org>
parents:
15713
diff
changeset
|
4972 inc(&VIsual); |
| 3718 | 4973 } |
| 4974 | |
| 4975 #ifdef FEAT_FOLDING | |
| 4976 if (fdo_flags & FDO_SEARCH && KeyTyped) | |
| 4977 foldOpenCursor(); | |
| 4978 #endif | |
| 4979 | |
| 4980 may_start_select('c'); | |
| 4981 setmouse(); | |
| 4982 #ifdef FEAT_CLIPBOARD | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4983 // Make sure the clipboard gets updated. Needed because start and |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4984 // end are still the same, and the selection needs to be owned |
| 3718 | 4985 clip_star.vmode = NUL; |
| 4986 #endif | |
| 4987 redraw_curbuf_later(INVERTED); | |
| 4988 showmode(); | |
| 4989 | |
| 4990 return OK; | |
| 4991 } | |
| 3755 | 4992 |
| 7 | 4993 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \ |
| 4994 || defined(PROTO) | |
| 4995 /* | |
| 4996 * return TRUE if line 'lnum' is empty or has white chars only. | |
| 4997 */ | |
| 4998 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4999 linewhite(linenr_T lnum) |
| 7 | 5000 { |
| 5001 char_u *p; | |
| 5002 | |
| 5003 p = skipwhite(ml_get(lnum)); | |
| 5004 return (*p == NUL); | |
| 5005 } | |
| 5006 #endif | |
| 5007 | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5008 /* |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5009 * Add the search count "[3/19]" to "msgbuf". |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5010 * When "recompute" is TRUE always recompute the numbers. |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5011 */ |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5012 static void |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5013 search_stat( |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5014 int dirc, |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5015 pos_T *pos, |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5016 int show_top_bot_msg, |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5017 char_u *msgbuf, |
|
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5018 int recompute) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5019 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5020 int save_ws = p_ws; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5021 int wraparound = FALSE; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5022 pos_T p = (*pos); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5023 static pos_T lastpos = {0, 0, 0}; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5024 static int cur = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5025 static int cnt = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5026 static int chgtick = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5027 static char_u *lastpat = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5028 static buf_T *lbuf = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5029 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5030 proftime_T start; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5031 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5032 #define OUT_OF_TIME 999 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5033 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5034 wraparound = ((dirc == '?' && LT_POS(lastpos, p)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5035 || (dirc == '/' && LT_POS(p, lastpos))); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5036 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5037 // If anything relevant changed the count has to be recomputed. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5038 // MB_STRNICMP ignores case, but we should not ignore case. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5039 // Unfortunately, there is no MB_STRNICMP function. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5040 if (!(chgtick == CHANGEDTICK(curbuf) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5041 && MB_STRNICMP(lastpat, spats[last_idx].pat, STRLEN(lastpat)) == 0 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5042 && STRLEN(lastpat) == STRLEN(spats[last_idx].pat) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5043 && EQUAL_POS(lastpos, curwin->w_cursor) |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5044 && lbuf == curbuf) || wraparound || cur < 0 || cur > 99 || recompute) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5045 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5046 cur = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5047 cnt = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5048 CLEAR_POS(&lastpos); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5049 lbuf = curbuf; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5050 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5051 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5052 if (EQUAL_POS(lastpos, curwin->w_cursor) && !wraparound |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5053 && (dirc == '/' ? cur < cnt : cur > 0)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5054 cur += dirc == '/' ? 1 : -1; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5055 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5056 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5057 p_ws = FALSE; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5058 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5059 profile_setlimit(20L, &start); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5060 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5061 while (!got_int && searchit(curwin, curbuf, &lastpos, NULL, |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
5062 FORWARD, NULL, 1, SEARCH_KEEP, RE_LAST, NULL) != FAIL) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5063 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5064 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5065 // Stop after passing the time limit. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5066 if (profile_passed_limit(&start)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5067 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5068 cnt = OUT_OF_TIME; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5069 cur = OUT_OF_TIME; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5070 break; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5071 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5072 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5073 cnt++; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5074 if (LTOREQ_POS(lastpos, p)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5075 cur++; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5076 fast_breakcheck(); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5077 if (cnt > 99) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5078 break; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5079 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5080 if (got_int) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5081 cur = -1; // abort |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5082 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5083 if (cur > 0) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5084 { |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5085 char t[SEARCH_STAT_BUF_LEN] = ""; |
|
16748
75703a39d875
patch 8.1.1376: warnings for size_t/int mixups
Bram Moolenaar <Bram@vim.org>
parents:
16746
diff
changeset
|
5086 size_t len; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5087 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5088 #ifdef FEAT_RIGHTLEFT |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5089 if (curwin->w_p_rl && *curwin->w_p_rlc == 's') |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5090 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5091 if (cur == OUT_OF_TIME) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5092 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[?/??]"); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5093 else if (cnt > 99 && cur > 99) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5094 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/>99]"); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5095 else if (cnt > 99) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5096 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/%d]", cur); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5097 else |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5098 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/%d]", cnt, cur); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5099 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5100 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5101 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5102 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5103 if (cur == OUT_OF_TIME) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5104 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[?/??]"); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5105 else if (cnt > 99 && cur > 99) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5106 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[>99/>99]"); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5107 else if (cnt > 99) |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5108 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/>99]", cur); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5109 else |
|
16572
f37255166ff4
patch 8.1.1289: may not have enough space to add "W" to search stats
Bram Moolenaar <Bram@vim.org>
parents:
16570
diff
changeset
|
5110 vim_snprintf(t, SEARCH_STAT_BUF_LEN, "[%d/%d]", cur, cnt); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5111 } |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5112 |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5113 len = STRLEN(t); |
|
16696
b1756c303066
patch 8.1.1350: "W" for wrapping not shown when more than 99 matches
Bram Moolenaar <Bram@vim.org>
parents:
16572
diff
changeset
|
5114 if (show_top_bot_msg && len + 2 < SEARCH_STAT_BUF_LEN) |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5115 { |
|
17992
a9c54c20295c
patch 8.1.1992: the search stat moves when wrapping at the end of the buffer
Bram Moolenaar <Bram@vim.org>
parents:
17948
diff
changeset
|
5116 mch_memmove(t + 2, t, len); |
|
a9c54c20295c
patch 8.1.1992: the search stat moves when wrapping at the end of the buffer
Bram Moolenaar <Bram@vim.org>
parents:
17948
diff
changeset
|
5117 t[0] = 'W'; |
|
a9c54c20295c
patch 8.1.1992: the search stat moves when wrapping at the end of the buffer
Bram Moolenaar <Bram@vim.org>
parents:
17948
diff
changeset
|
5118 t[1] = ' '; |
|
16560
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5119 len += 2; |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5120 } |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5121 |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5122 mch_memmove(msgbuf + STRLEN(msgbuf) - len, t, len); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5123 if (dirc == '?' && cur == 100) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5124 cur = -1; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5125 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5126 vim_free(lastpat); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5127 lastpat = vim_strsave(spats[last_idx].pat); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5128 chgtick = CHANGEDTICK(curbuf); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5129 lbuf = curbuf; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5130 lastpos = p; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5131 |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5132 // keep the message even after redraw, but don't put in history |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5133 msg_hist_off = TRUE; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5134 give_warning(msgbuf, FALSE); |
|
16746
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
5135 msg_hist_off = FALSE; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5136 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5137 p_ws = save_ws; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5138 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5139 |
| 7 | 5140 #if defined(FEAT_FIND_ID) || defined(PROTO) |
| 5141 /* | |
| 5142 * Find identifiers or defines in included files. | |
| 2719 | 5143 * If p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. |
| 7 | 5144 */ |
| 5145 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5146 find_pattern_in_path( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5147 char_u *ptr, // pointer to search pattern |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5148 int dir UNUSED, // direction of expansion |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5149 int len, // length of search pattern |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5150 int whole, // match whole words only |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5151 int skip_comments, // don't match inside comments |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5152 int type, // Type of search; are we looking for a type? |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5153 // a macro? |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5154 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5155 int action, // What to do when we find it |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5156 linenr_T start_lnum, // first line to start searching |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5157 linenr_T end_lnum) // last line for searching |
| 7 | 5158 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5159 SearchedFile *files; // Stack of included files |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5160 SearchedFile *bigger; // When we need more space |
| 7 | 5161 int max_path_depth = 50; |
| 5162 long match_count = 1; | |
| 5163 | |
| 5164 char_u *pat; | |
| 5165 char_u *new_fname; | |
| 5166 char_u *curr_fname = curbuf->b_fname; | |
| 5167 char_u *prev_fname = NULL; | |
| 5168 linenr_T lnum; | |
| 5169 int depth; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5170 int depth_displayed; // For type==CHECK_PATH |
| 7 | 5171 int old_files; |
| 5172 int already_searched; | |
| 5173 char_u *file_line; | |
| 5174 char_u *line; | |
| 5175 char_u *p; | |
| 5176 char_u save_char; | |
| 5177 int define_matched; | |
| 5178 regmatch_T regmatch; | |
| 5179 regmatch_T incl_regmatch; | |
| 5180 regmatch_T def_regmatch; | |
| 5181 int matched = FALSE; | |
| 5182 int did_show = FALSE; | |
| 5183 int found = FALSE; | |
| 5184 int i; | |
| 5185 char_u *already = NULL; | |
| 5186 char_u *startp = NULL; | |
| 534 | 5187 char_u *inc_opt = NULL; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5188 #if defined(FEAT_QUICKFIX) |
| 7 | 5189 win_T *curwin_save = NULL; |
| 5190 #endif | |
| 5191 | |
| 5192 regmatch.regprog = NULL; | |
| 5193 incl_regmatch.regprog = NULL; | |
| 5194 def_regmatch.regprog = NULL; | |
| 5195 | |
| 5196 file_line = alloc(LSIZE); | |
| 5197 if (file_line == NULL) | |
| 5198 return; | |
| 5199 | |
| 5200 if (type != CHECK_PATH && type != FIND_DEFINE | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5201 // when CONT_SOL is set compare "ptr" with the beginning of the line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5202 // is faster than quote_meta/regcomp/regexec "ptr" -- Acevedo |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5203 && !(compl_cont_status & CONT_SOL)) |
| 7 | 5204 { |
| 5205 pat = alloc(len + 5); | |
| 5206 if (pat == NULL) | |
| 5207 goto fpip_end; | |
| 5208 sprintf((char *)pat, whole ? "\\<%.*s\\>" : "%.*s", len, ptr); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5209 // ignore case according to p_ic, p_scs and pat |
| 7 | 5210 regmatch.rm_ic = ignorecase(pat); |
| 5211 regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); | |
| 5212 vim_free(pat); | |
| 5213 if (regmatch.regprog == NULL) | |
| 5214 goto fpip_end; | |
| 5215 } | |
| 534 | 5216 inc_opt = (*curbuf->b_p_inc == NUL) ? p_inc : curbuf->b_p_inc; |
| 5217 if (*inc_opt != NUL) | |
| 7 | 5218 { |
| 534 | 5219 incl_regmatch.regprog = vim_regcomp(inc_opt, p_magic ? RE_MAGIC : 0); |
| 7 | 5220 if (incl_regmatch.regprog == NULL) |
| 5221 goto fpip_end; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5222 incl_regmatch.rm_ic = FALSE; // don't ignore case in incl. pat. |
| 7 | 5223 } |
| 5224 if (type == FIND_DEFINE && (*curbuf->b_p_def != NUL || *p_def != NUL)) | |
| 5225 { | |
| 5226 def_regmatch.regprog = vim_regcomp(*curbuf->b_p_def == NUL | |
| 5227 ? p_def : curbuf->b_p_def, p_magic ? RE_MAGIC : 0); | |
| 5228 if (def_regmatch.regprog == NULL) | |
| 5229 goto fpip_end; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5230 def_regmatch.rm_ic = FALSE; // don't ignore case in define pat. |
| 7 | 5231 } |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5232 files = lalloc_clear(max_path_depth * sizeof(SearchedFile), TRUE); |
| 7 | 5233 if (files == NULL) |
| 5234 goto fpip_end; | |
| 5235 old_files = max_path_depth; | |
| 5236 depth = depth_displayed = -1; | |
| 5237 | |
| 5238 lnum = start_lnum; | |
| 5239 if (end_lnum > curbuf->b_ml.ml_line_count) | |
| 5240 end_lnum = curbuf->b_ml.ml_line_count; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5241 if (lnum > end_lnum) // do at least one line |
| 7 | 5242 lnum = end_lnum; |
| 5243 line = ml_get(lnum); | |
| 5244 | |
| 5245 for (;;) | |
| 5246 { | |
| 5247 if (incl_regmatch.regprog != NULL | |
| 5248 && vim_regexec(&incl_regmatch, line, (colnr_T)0)) | |
| 5249 { | |
| 534 | 5250 char_u *p_fname = (curr_fname == curbuf->b_fname) |
| 5251 ? curbuf->b_ffname : curr_fname; | |
| 5252 | |
| 5253 if (inc_opt != NULL && strstr((char *)inc_opt, "\\zs") != NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5254 // Use text from '\zs' to '\ze' (or end) of 'include'. |
| 534 | 5255 new_fname = find_file_name_in_path(incl_regmatch.startp[0], |
|
5118
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5256 (int)(incl_regmatch.endp[0] - incl_regmatch.startp[0]), |
| 534 | 5257 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname); |
| 5258 else | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5259 // Use text after match with 'include'. |
| 534 | 5260 new_fname = file_name_in_line(incl_regmatch.endp[0], 0, |
| 681 | 5261 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname, NULL); |
| 7 | 5262 already_searched = FALSE; |
| 5263 if (new_fname != NULL) | |
| 5264 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5265 // Check whether we have already searched in this file |
| 7 | 5266 for (i = 0;; i++) |
| 5267 { | |
| 5268 if (i == depth + 1) | |
| 5269 i = old_files; | |
| 5270 if (i == max_path_depth) | |
| 5271 break; | |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16696
diff
changeset
|
5272 if (fullpathcmp(new_fname, files[i].name, TRUE, TRUE) |
|
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16696
diff
changeset
|
5273 & FPC_SAME) |
| 7 | 5274 { |
| 5275 if (type != CHECK_PATH && | |
| 5276 action == ACTION_SHOW_ALL && files[i].matched) | |
| 5277 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5278 msg_putchar('\n'); // cursor below last one |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5279 if (!got_int) // don't display if 'q' |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5280 // typed at "--more--" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5281 // message |
| 7 | 5282 { |
| 5283 msg_home_replace_hl(new_fname); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5284 msg_puts(_(" (includes previously listed match)")); |
| 7 | 5285 prev_fname = NULL; |
| 5286 } | |
| 5287 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13225
diff
changeset
|
5288 VIM_CLEAR(new_fname); |
| 7 | 5289 already_searched = TRUE; |
| 5290 break; | |
| 5291 } | |
| 5292 } | |
| 5293 } | |
| 5294 | |
| 5295 if (type == CHECK_PATH && (action == ACTION_SHOW_ALL | |
| 5296 || (new_fname == NULL && !already_searched))) | |
| 5297 { | |
| 5298 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5299 msg_putchar('\n'); // cursor below last one |
| 7 | 5300 else |
| 5301 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5302 gotocmdline(TRUE); // cursor at status line |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5303 msg_puts_title(_("--- Included files ")); |
| 7 | 5304 if (action != ACTION_SHOW_ALL) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5305 msg_puts_title(_("not found ")); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5306 msg_puts_title(_("in path ---\n")); |
| 7 | 5307 } |
| 5308 did_show = TRUE; | |
| 5309 while (depth_displayed < depth && !got_int) | |
| 5310 { | |
| 5311 ++depth_displayed; | |
| 5312 for (i = 0; i < depth_displayed; i++) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5313 msg_puts(" "); |
| 7 | 5314 msg_home_replace(files[depth_displayed].name); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5315 msg_puts(" -->\n"); |
| 7 | 5316 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5317 if (!got_int) // don't display if 'q' typed |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5318 // for "--more--" message |
| 7 | 5319 { |
| 5320 for (i = 0; i <= depth_displayed; i++) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5321 msg_puts(" "); |
| 7 | 5322 if (new_fname != NULL) |
| 5323 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5324 // using "new_fname" is more reliable, e.g., when |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5325 // 'includeexpr' is set. |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5326 msg_outtrans_attr(new_fname, HL_ATTR(HLF_D)); |
| 7 | 5327 } |
| 5328 else | |
| 5329 { | |
| 5330 /* | |
| 5331 * Isolate the file name. | |
| 5332 * Include the surrounding "" or <> if present. | |
| 5333 */ | |
| 3699 | 5334 if (inc_opt != NULL |
| 5335 && strstr((char *)inc_opt, "\\zs") != NULL) | |
| 5336 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5337 // pattern contains \zs, use the match |
| 3699 | 5338 p = incl_regmatch.startp[0]; |
| 5339 i = (int)(incl_regmatch.endp[0] | |
| 5340 - incl_regmatch.startp[0]); | |
| 5341 } | |
| 5342 else | |
| 5343 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5344 // find the file name after the end of the match |
| 3699 | 5345 for (p = incl_regmatch.endp[0]; |
| 5346 *p && !vim_isfilec(*p); p++) | |
| 5347 ; | |
| 5348 for (i = 0; vim_isfilec(p[i]); i++) | |
| 5349 ; | |
| 5350 } | |
| 5351 | |
| 7 | 5352 if (i == 0) |
| 5353 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5354 // Nothing found, use the rest of the line. |
| 7 | 5355 p = incl_regmatch.endp[0]; |
| 835 | 5356 i = (int)STRLEN(p); |
| 7 | 5357 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5358 // Avoid checking before the start of the line, can |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5359 // happen if \zs appears in the regexp. |
| 3699 | 5360 else if (p > line) |
| 7 | 5361 { |
| 5362 if (p[-1] == '"' || p[-1] == '<') | |
| 5363 { | |
| 5364 --p; | |
| 5365 ++i; | |
| 5366 } | |
| 5367 if (p[i] == '"' || p[i] == '>') | |
| 5368 ++i; | |
| 5369 } | |
| 5370 save_char = p[i]; | |
| 5371 p[i] = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
5372 msg_outtrans_attr(p, HL_ATTR(HLF_D)); |
| 7 | 5373 p[i] = save_char; |
| 5374 } | |
| 5375 | |
| 5376 if (new_fname == NULL && action == ACTION_SHOW_ALL) | |
| 5377 { | |
| 5378 if (already_searched) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5379 msg_puts(_(" (Already listed)")); |
| 7 | 5380 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5381 msg_puts(_(" NOT FOUND")); |
| 7 | 5382 } |
| 5383 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5384 out_flush(); // output each line directly |
| 7 | 5385 } |
| 5386 | |
| 5387 if (new_fname != NULL) | |
| 5388 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5389 // Push the new file onto the file stack |
| 7 | 5390 if (depth + 1 == old_files) |
| 5391 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
5392 bigger = ALLOC_MULT(SearchedFile, max_path_depth * 2); |
| 7 | 5393 if (bigger != NULL) |
| 5394 { | |
| 5395 for (i = 0; i <= depth; i++) | |
| 5396 bigger[i] = files[i]; | |
| 5397 for (i = depth + 1; i < old_files + max_path_depth; i++) | |
| 5398 { | |
| 5399 bigger[i].fp = NULL; | |
| 5400 bigger[i].name = NULL; | |
| 5401 bigger[i].lnum = 0; | |
| 5402 bigger[i].matched = FALSE; | |
| 5403 } | |
| 5404 for (i = old_files; i < max_path_depth; i++) | |
| 5405 bigger[i + max_path_depth] = files[i]; | |
| 5406 old_files += max_path_depth; | |
| 5407 max_path_depth *= 2; | |
| 5408 vim_free(files); | |
| 5409 files = bigger; | |
| 5410 } | |
| 5411 } | |
| 5412 if ((files[depth + 1].fp = mch_fopen((char *)new_fname, "r")) | |
| 5413 == NULL) | |
| 5414 vim_free(new_fname); | |
| 5415 else | |
| 5416 { | |
| 5417 if (++depth == old_files) | |
| 5418 { | |
| 5419 /* | |
| 5420 * lalloc() for 'bigger' must have failed above. We | |
| 5421 * will forget one of our already visited files now. | |
| 5422 */ | |
| 5423 vim_free(files[old_files].name); | |
| 5424 ++old_files; | |
| 5425 } | |
| 5426 files[depth].name = curr_fname = new_fname; | |
| 5427 files[depth].lnum = 0; | |
| 5428 files[depth].matched = FALSE; | |
| 5429 if (action == ACTION_EXPAND) | |
| 5430 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5431 msg_hist_off = TRUE; // reset in msg_trunc_attr() |
| 274 | 5432 vim_snprintf((char*)IObuff, IOSIZE, |
| 5433 _("Scanning included file: %s"), | |
| 5434 (char *)new_fname); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5435 msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); |
| 7 | 5436 } |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5437 else if (p_verbose >= 5) |
| 712 | 5438 { |
| 5439 verbose_enter(); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5440 smsg(_("Searching included file %s"), |
| 712 | 5441 (char *)new_fname); |
| 5442 verbose_leave(); | |
| 5443 } | |
| 5444 | |
| 7 | 5445 } |
| 5446 } | |
| 5447 } | |
| 5448 else | |
| 5449 { | |
| 5450 /* | |
| 5451 * Check if the line is a define (type == FIND_DEFINE) | |
| 5452 */ | |
| 5453 p = line; | |
| 5454 search_line: | |
| 5455 define_matched = FALSE; | |
| 5456 if (def_regmatch.regprog != NULL | |
| 5457 && vim_regexec(&def_regmatch, line, (colnr_T)0)) | |
| 5458 { | |
| 5459 /* | |
| 5460 * Pattern must be first identifier after 'define', so skip | |
| 5461 * to that position before checking for match of pattern. Also | |
| 5462 * don't let it match beyond the end of this identifier. | |
| 5463 */ | |
| 5464 p = def_regmatch.endp[0]; | |
| 5465 while (*p && !vim_iswordc(*p)) | |
| 5466 p++; | |
| 5467 define_matched = TRUE; | |
| 5468 } | |
| 5469 | |
| 5470 /* | |
| 5471 * Look for a match. Don't do this if we are looking for a | |
| 5472 * define and this line didn't match define_prog above. | |
| 5473 */ | |
| 5474 if (def_regmatch.regprog == NULL || define_matched) | |
| 5475 { | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5476 if (define_matched || (compl_cont_status & CONT_SOL)) |
| 7 | 5477 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5478 // compare the first "len" chars from "ptr" |
| 7 | 5479 startp = skipwhite(p); |
| 5480 if (p_ic) | |
| 5481 matched = !MB_STRNICMP(startp, ptr, len); | |
| 5482 else | |
| 5483 matched = !STRNCMP(startp, ptr, len); | |
| 5484 if (matched && define_matched && whole | |
| 5485 && vim_iswordc(startp[len])) | |
| 5486 matched = FALSE; | |
| 5487 } | |
| 5488 else if (regmatch.regprog != NULL | |
| 5489 && vim_regexec(®match, line, (colnr_T)(p - line))) | |
| 5490 { | |
| 5491 matched = TRUE; | |
| 5492 startp = regmatch.startp[0]; | |
| 5493 /* | |
| 5494 * Check if the line is not a comment line (unless we are | |
| 5495 * looking for a define). A line starting with "# define" | |
| 5496 * is not considered to be a comment line. | |
| 5497 */ | |
| 5498 if (!define_matched && skip_comments) | |
| 5499 { | |
| 5500 if ((*line != '#' || | |
| 5501 STRNCMP(skipwhite(line + 1), "define", 6) != 0) | |
| 3562 | 5502 && get_leader_len(line, NULL, FALSE, TRUE)) |
| 7 | 5503 matched = FALSE; |
| 5504 | |
| 5505 /* | |
| 5506 * Also check for a "/ *" or "/ /" before the match. | |
| 5507 * Skips lines like "int backwards; / * normal index | |
| 5508 * * /" when looking for "normal". | |
| 5509 * Note: Doesn't skip "/ *" in comments. | |
| 5510 */ | |
| 5511 p = skipwhite(line); | |
| 5512 if (matched | |
| 5513 || (p[0] == '/' && p[1] == '*') || p[0] == '*') | |
| 5514 for (p = line; *p && p < startp; ++p) | |
| 5515 { | |
| 5516 if (matched | |
| 5517 && p[0] == '/' | |
| 5518 && (p[1] == '*' || p[1] == '/')) | |
| 5519 { | |
| 5520 matched = FALSE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5521 // After "//" all text is comment |
| 7 | 5522 if (p[1] == '/') |
| 5523 break; | |
| 5524 ++p; | |
| 5525 } | |
| 5526 else if (!matched && p[0] == '*' && p[1] == '/') | |
| 5527 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5528 // Can find match after "* /". |
| 7 | 5529 matched = TRUE; |
| 5530 ++p; | |
| 5531 } | |
| 5532 } | |
| 5533 } | |
| 5534 } | |
| 5535 } | |
| 5536 } | |
| 5537 if (matched) | |
| 5538 { | |
| 5539 if (action == ACTION_EXPAND) | |
| 5540 { | |
|
16239
5df26b29e809
patch 8.1.1124: insert completion flags are mixed up
Bram Moolenaar <Bram@vim.org>
parents:
16142
diff
changeset
|
5541 int cont_s_ipos = FALSE; |
| 7 | 5542 int add_r; |
| 5543 char_u *aux; | |
| 5544 | |
| 5545 if (depth == -1 && lnum == curwin->w_cursor.lnum) | |
| 5546 break; | |
| 5547 found = TRUE; | |
| 5548 aux = p = startp; | |
| 449 | 5549 if (compl_cont_status & CONT_ADDING) |
| 7 | 5550 { |
| 449 | 5551 p += compl_length; |
| 7 | 5552 if (vim_iswordp(p)) |
| 5553 goto exit_matched; | |
| 5554 p = find_word_start(p); | |
| 5555 } | |
| 5556 p = find_word_end(p); | |
| 5557 i = (int)(p - aux); | |
| 5558 | |
| 449 | 5559 if ((compl_cont_status & CONT_ADDING) && i == compl_length) |
| 7 | 5560 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5561 // IOSIZE > compl_length, so the STRNCPY works |
| 7 | 5562 STRNCPY(IObuff, aux, i); |
| 944 | 5563 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5564 // Get the next line: when "depth" < 0 from the current |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5565 // buffer, otherwise from the included file. Jump to |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5566 // exit_matched when past the last line. |
| 944 | 5567 if (depth < 0) |
| 5568 { | |
| 5569 if (lnum >= end_lnum) | |
| 5570 goto exit_matched; | |
| 5571 line = ml_get(++lnum); | |
| 5572 } | |
| 5573 else if (vim_fgets(line = file_line, | |
| 5574 LSIZE, files[depth].fp)) | |
| 7 | 5575 goto exit_matched; |
| 5576 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5577 // we read a line, set "already" to check this "line" later |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5578 // if depth >= 0 we'll increase files[depth].lnum far |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5579 // bellow -- Acevedo |
| 7 | 5580 already = aux = p = skipwhite(line); |
| 5581 p = find_word_start(p); | |
| 5582 p = find_word_end(p); | |
| 5583 if (p > aux) | |
| 5584 { | |
| 5585 if (*aux != ')' && IObuff[i-1] != TAB) | |
| 5586 { | |
| 5587 if (IObuff[i-1] != ' ') | |
| 5588 IObuff[i++] = ' '; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5589 // IObuf =~ "\(\k\|\i\).* ", thus i >= 2 |
| 7 | 5590 if (p_js |
| 5591 && (IObuff[i-2] == '.' | |
| 5592 || (vim_strchr(p_cpo, CPO_JOINSP) == NULL | |
| 5593 && (IObuff[i-2] == '?' | |
| 5594 || IObuff[i-2] == '!')))) | |
| 5595 IObuff[i++] = ' '; | |
| 5596 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5597 // copy as much as possible of the new word |
| 7 | 5598 if (p - aux >= IOSIZE - i) |
| 5599 p = aux + IOSIZE - i - 1; | |
| 5600 STRNCPY(IObuff + i, aux, p - aux); | |
| 5601 i += (int)(p - aux); | |
|
16239
5df26b29e809
patch 8.1.1124: insert completion flags are mixed up
Bram Moolenaar <Bram@vim.org>
parents:
16142
diff
changeset
|
5602 cont_s_ipos = TRUE; |
| 7 | 5603 } |
| 5604 IObuff[i] = NUL; | |
| 5605 aux = IObuff; | |
| 5606 | |
| 449 | 5607 if (i == compl_length) |
| 7 | 5608 goto exit_matched; |
| 5609 } | |
| 5610 | |
| 942 | 5611 add_r = ins_compl_add_infercase(aux, i, p_ic, |
| 7 | 5612 curr_fname == curbuf->b_fname ? NULL : curr_fname, |
|
16239
5df26b29e809
patch 8.1.1124: insert completion flags are mixed up
Bram Moolenaar <Bram@vim.org>
parents:
16142
diff
changeset
|
5613 dir, cont_s_ipos); |
| 7 | 5614 if (add_r == OK) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5615 // if dir was BACKWARD then honor it just once |
| 7 | 5616 dir = FORWARD; |
| 464 | 5617 else if (add_r == FAIL) |
| 7 | 5618 break; |
| 5619 } | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5620 else if (action == ACTION_SHOW_ALL) |
| 7 | 5621 { |
| 5622 found = TRUE; | |
| 5623 if (!did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5624 gotocmdline(TRUE); // cursor at status line |
| 7 | 5625 if (curr_fname != prev_fname) |
| 5626 { | |
| 5627 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5628 msg_putchar('\n'); // cursor below last one |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5629 if (!got_int) // don't display if 'q' typed |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5630 // at "--more--" message |
| 7 | 5631 msg_home_replace_hl(curr_fname); |
| 5632 prev_fname = curr_fname; | |
| 5633 } | |
| 5634 did_show = TRUE; | |
| 5635 if (!got_int) | |
| 5636 show_pat_in_path(line, type, TRUE, action, | |
| 5637 (depth == -1) ? NULL : files[depth].fp, | |
| 5638 (depth == -1) ? &lnum : &files[depth].lnum, | |
| 5639 match_count++); | |
| 5640 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5641 // Set matched flag for this file and all the ones that |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5642 // include it |
| 7 | 5643 for (i = 0; i <= depth; ++i) |
| 5644 files[i].matched = TRUE; | |
| 5645 } | |
| 5646 else if (--count <= 0) | |
| 5647 { | |
| 5648 found = TRUE; | |
| 5649 if (depth == -1 && lnum == curwin->w_cursor.lnum | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5650 #if defined(FEAT_QUICKFIX) |
| 7 | 5651 && g_do_tagpreview == 0 |
| 5652 #endif | |
| 5653 ) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5654 emsg(_("E387: Match is on current line")); |
| 7 | 5655 else if (action == ACTION_SHOW) |
| 5656 { | |
| 5657 show_pat_in_path(line, type, did_show, action, | |
| 5658 (depth == -1) ? NULL : files[depth].fp, | |
| 5659 (depth == -1) ? &lnum : &files[depth].lnum, 1L); | |
| 5660 did_show = TRUE; | |
| 5661 } | |
| 5662 else | |
| 5663 { | |
| 5664 #ifdef FEAT_GUI | |
| 5665 need_mouse_correct = TRUE; | |
| 5666 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5667 #if defined(FEAT_QUICKFIX) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5668 // ":psearch" uses the preview window |
| 7 | 5669 if (g_do_tagpreview != 0) |
| 5670 { | |
| 5671 curwin_save = curwin; | |
|
17767
c75da1064e33
patch 8.1.1880: cannot show extra info for completion in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17652
diff
changeset
|
5672 prepare_tagpreview(TRUE, TRUE, FALSE); |
| 7 | 5673 } |
| 5674 #endif | |
| 5675 if (action == ACTION_SPLIT) | |
| 5676 { | |
| 5677 if (win_split(0, 0) == FAIL) | |
| 5678 break; | |
| 2583 | 5679 RESET_BINDING(curwin); |
| 7 | 5680 } |
| 5681 if (depth == -1) | |
| 5682 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5683 // match in current file |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5684 #if defined(FEAT_QUICKFIX) |
| 7 | 5685 if (g_do_tagpreview != 0) |
| 5686 { | |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5687 if (!GETFILE_SUCCESS(getfile( |
|
11759
5e36b2f825cb
patch 8.0.0762: ml_get error with :psearch in buffer without a name
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
5688 curwin_save->w_buffer->b_fnum, NULL, |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5689 NULL, TRUE, lnum, FALSE))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5690 break; // failed to jump to file |
| 7 | 5691 } |
| 5692 else | |
| 5693 #endif | |
| 5694 setpcmark(); | |
| 5695 curwin->w_cursor.lnum = lnum; | |
|
11759
5e36b2f825cb
patch 8.0.0762: ml_get error with :psearch in buffer without a name
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
5696 check_cursor(); |
| 7 | 5697 } |
| 5698 else | |
| 5699 { | |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5700 if (!GETFILE_SUCCESS(getfile( |
|
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5701 0, files[depth].name, NULL, TRUE, |
|
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5702 files[depth].lnum, FALSE))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5703 break; // failed to jump to file |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5704 // autocommands may have changed the lnum, we don't |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5705 // want that here |
| 7 | 5706 curwin->w_cursor.lnum = files[depth].lnum; |
| 5707 } | |
| 5708 } | |
| 5709 if (action != ACTION_SHOW) | |
| 5710 { | |
| 1859 | 5711 curwin->w_cursor.col = (colnr_T)(startp - line); |
| 7 | 5712 curwin->w_set_curswant = TRUE; |
| 5713 } | |
| 5714 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5715 #if defined(FEAT_QUICKFIX) |
| 7 | 5716 if (g_do_tagpreview != 0 |
| 673 | 5717 && curwin != curwin_save && win_valid(curwin_save)) |
| 7 | 5718 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5719 // Return cursor to where we were |
| 7 | 5720 validate_cursor(); |
| 5721 redraw_later(VALID); | |
| 5722 win_enter(curwin_save, TRUE); | |
| 5723 } | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18681
diff
changeset
|
5724 # ifdef FEAT_PROP_POPUP |
|
17644
daa1dea1c1b3
patch 8.1.1819: :pedit does not work with a popup preview window
Bram Moolenaar <Bram@vim.org>
parents:
17476
diff
changeset
|
5725 else if (WIN_IS_POPUP(curwin)) |
|
daa1dea1c1b3
patch 8.1.1819: :pedit does not work with a popup preview window
Bram Moolenaar <Bram@vim.org>
parents:
17476
diff
changeset
|
5726 // can't keep focus in popup window |
|
daa1dea1c1b3
patch 8.1.1819: :pedit does not work with a popup preview window
Bram Moolenaar <Bram@vim.org>
parents:
17476
diff
changeset
|
5727 win_enter(firstwin, TRUE); |
|
daa1dea1c1b3
patch 8.1.1819: :pedit does not work with a popup preview window
Bram Moolenaar <Bram@vim.org>
parents:
17476
diff
changeset
|
5728 # endif |
| 7 | 5729 #endif |
| 5730 break; | |
| 5731 } | |
| 5732 exit_matched: | |
| 5733 matched = FALSE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5734 // look for other matches in the rest of the line if we |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5735 // are not at the end of it already |
| 7 | 5736 if (def_regmatch.regprog == NULL |
| 5737 && action == ACTION_EXPAND | |
| 449 | 5738 && !(compl_cont_status & CONT_SOL) |
| 1859 | 5739 && *startp != NUL |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
5740 && *(p = startp + mb_ptr2len(startp)) != NUL) |
| 7 | 5741 goto search_line; |
| 5742 } | |
| 5743 line_breakcheck(); | |
| 5744 if (action == ACTION_EXPAND) | |
|
10277
154d5a2e7395
commit https://github.com/vim/vim/commit/472e85970ee3a80abd824bef510df12e9cfe9e96
Christian Brabandt <cb@256bit.org>
parents:
10172
diff
changeset
|
5745 ins_compl_check_keys(30, FALSE); |
|
16142
570a296aa0b4
patch 8.1.1076: file for Insert mode is much too big
Bram Moolenaar <Bram@vim.org>
parents:
15971
diff
changeset
|
5746 if (got_int || ins_compl_interrupted()) |
| 7 | 5747 break; |
| 5748 | |
| 5749 /* | |
| 5750 * Read the next line. When reading an included file and encountering | |
| 5751 * end-of-file, close the file and continue in the file that included | |
| 5752 * it. | |
| 5753 */ | |
| 5754 while (depth >= 0 && !already | |
| 5755 && vim_fgets(line = file_line, LSIZE, files[depth].fp)) | |
| 5756 { | |
| 5757 fclose(files[depth].fp); | |
| 5758 --old_files; | |
| 5759 files[old_files].name = files[depth].name; | |
| 5760 files[old_files].matched = files[depth].matched; | |
| 5761 --depth; | |
| 5762 curr_fname = (depth == -1) ? curbuf->b_fname | |
| 5763 : files[depth].name; | |
| 5764 if (depth < depth_displayed) | |
| 5765 depth_displayed = depth; | |
| 5766 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5767 if (depth >= 0) // we could read the line |
|
5118
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5768 { |
| 7 | 5769 files[depth].lnum++; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5770 // Remove any CR and LF from the line. |
|
5118
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5771 i = (int)STRLEN(line); |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5772 if (i > 0 && line[i - 1] == '\n') |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5773 line[--i] = NUL; |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5774 if (i > 0 && line[i - 1] == '\r') |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5775 line[--i] = NUL; |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5776 } |
| 7 | 5777 else if (!already) |
| 5778 { | |
| 5779 if (++lnum > end_lnum) | |
| 5780 break; | |
| 5781 line = ml_get(lnum); | |
| 5782 } | |
| 5783 already = NULL; | |
| 5784 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5785 // End of big for (;;) loop. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5786 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5787 // Close any files that are still open. |
| 7 | 5788 for (i = 0; i <= depth; i++) |
| 5789 { | |
| 5790 fclose(files[i].fp); | |
| 5791 vim_free(files[i].name); | |
| 5792 } | |
| 5793 for (i = old_files; i < max_path_depth; i++) | |
| 5794 vim_free(files[i].name); | |
| 5795 vim_free(files); | |
| 5796 | |
| 5797 if (type == CHECK_PATH) | |
| 5798 { | |
| 5799 if (!did_show) | |
| 5800 { | |
| 5801 if (action != ACTION_SHOW_ALL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5802 msg(_("All included files were found")); |
| 7 | 5803 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5804 msg(_("No included files")); |
| 7 | 5805 } |
| 5806 } | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5807 else if (!found && action != ACTION_EXPAND) |
| 7 | 5808 { |
|
16142
570a296aa0b4
patch 8.1.1076: file for Insert mode is much too big
Bram Moolenaar <Bram@vim.org>
parents:
15971
diff
changeset
|
5809 if (got_int || ins_compl_interrupted()) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5810 emsg(_(e_interr)); |
| 7 | 5811 else if (type == FIND_DEFINE) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5812 emsg(_("E388: Couldn't find definition")); |
| 7 | 5813 else |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5814 emsg(_("E389: Couldn't find pattern")); |
| 7 | 5815 } |
| 5816 if (action == ACTION_SHOW || action == ACTION_SHOW_ALL) | |
| 5817 msg_end(); | |
| 5818 | |
| 5819 fpip_end: | |
| 5820 vim_free(file_line); | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5821 vim_regfree(regmatch.regprog); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5822 vim_regfree(incl_regmatch.regprog); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5823 vim_regfree(def_regmatch.regprog); |
| 7 | 5824 } |
| 5825 | |
| 5826 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5827 show_pat_in_path( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5828 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5829 int type, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5830 int did_show, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5831 int action, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5832 FILE *fp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5833 linenr_T *lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5834 long count) |
| 7 | 5835 { |
| 5836 char_u *p; | |
| 5837 | |
| 5838 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5839 msg_putchar('\n'); // cursor below last one |
| 867 | 5840 else if (!msg_silent) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5841 gotocmdline(TRUE); // cursor at status line |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5842 if (got_int) // 'q' typed at "--more--" message |
| 7 | 5843 return; |
| 5844 for (;;) | |
| 5845 { | |
| 5846 p = line + STRLEN(line) - 1; | |
| 5847 if (fp != NULL) | |
| 5848 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5849 // We used fgets(), so get rid of newline at end |
| 7 | 5850 if (p >= line && *p == '\n') |
| 5851 --p; | |
| 5852 if (p >= line && *p == '\r') | |
| 5853 --p; | |
| 5854 *(p + 1) = NUL; | |
| 5855 } | |
| 5856 if (action == ACTION_SHOW_ALL) | |
| 5857 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5858 sprintf((char *)IObuff, "%3ld: ", count); // show match nr |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5859 msg_puts((char *)IObuff); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5860 sprintf((char *)IObuff, "%4ld", *lnum); // show line nr |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5861 // Highlight line numbers |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5862 msg_puts_attr((char *)IObuff, HL_ATTR(HLF_N)); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5863 msg_puts(" "); |
| 7 | 5864 } |
| 168 | 5865 msg_prt_line(line, FALSE); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5866 out_flush(); // show one line at a time |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5867 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5868 // Definition continues until line that doesn't end with '\' |
| 7 | 5869 if (got_int || type != FIND_DEFINE || p < line || *p != '\\') |
| 5870 break; | |
| 5871 | |
| 5872 if (fp != NULL) | |
| 5873 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5874 if (vim_fgets(line, LSIZE, fp)) // end of file |
| 7 | 5875 break; |
| 5876 ++*lnum; | |
| 5877 } | |
| 5878 else | |
| 5879 { | |
| 5880 if (++*lnum > curbuf->b_ml.ml_line_count) | |
| 5881 break; | |
| 5882 line = ml_get(*lnum); | |
| 5883 } | |
| 5884 msg_putchar('\n'); | |
| 5885 } | |
| 5886 } | |
| 5887 #endif | |
| 5888 | |
| 5889 #ifdef FEAT_VIMINFO | |
|
18263
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5890 /* |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5891 * Return the last used search pattern at "idx". |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5892 */ |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5893 spat_T * |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5894 get_spat(int idx) |
| 7 | 5895 { |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5896 return &spats[idx]; |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5897 } |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5898 |
|
18263
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5899 /* |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5900 * Return the last used search pattern index. |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5901 */ |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5902 int |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5903 get_spat_last_idx(void) |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5904 { |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5905 return last_idx; |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5906 } |
| 7 | 5907 #endif |