Mercurial > vim
annotate src/search.c @ 19308:6fd567c927c0 v8.2.0212
patch 8.2.0212: missing search/substitute pattern hardly tested
Commit: https://github.com/vim/vim/commit/07ada5ff2fd8f22ed3233ae5c4ddf87c7b3f56fe
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 5 20:38:22 2020 +0100
patch 8.2.0212: missing search/substitute pattern hardly tested
Problem: Missing search/substitute pattern hardly tested.
Solution: Add test_clear_search_pat() and tests. (Yegappan Lakshmanan,
closes #5579)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 05 Feb 2020 20:45:04 +0100 |
| parents | 5c405689da3e |
| children | 6c944fee0d7e |
| 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 |
|
19308
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
383 void |
|
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
384 free_last_pat(int idx) |
|
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
385 { |
|
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
386 VIM_CLEAR(spats[idx].pat); |
|
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
387 } |
|
6fd567c927c0
patch 8.2.0212: missing search/substitute pattern hardly tested
Bram Moolenaar <Bram@vim.org>
parents:
18949
diff
changeset
|
388 |
| 7 | 389 /* |
| 390 * Return TRUE when case should be ignored for search pattern "pat". | |
| 391 * Uses the 'ignorecase' and 'smartcase' options. | |
| 392 */ | |
| 393 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
394 ignorecase(char_u *pat) |
| 7 | 395 { |
|
9913
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
396 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
|
397 } |
|
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 /* |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
400 * 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
|
401 */ |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
402 int |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
403 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
|
404 { |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
405 int ic = ic_in; |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
406 |
|
bb00c661b3a4
commit https://github.com/vim/vim/commit/66e29d7112e437b2b50efe1f82c7e892736d23e4
Christian Brabandt <cb@256bit.org>
parents:
9647
diff
changeset
|
407 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
|
408 && !(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
|
409 ic = !pat_has_uppercase(pat); |
| 7 | 410 no_smartcase = FALSE; |
| 411 | |
| 412 return ic; | |
| 413 } | |
| 414 | |
|
2302
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
415 /* |
| 6991 | 416 * 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
|
417 */ |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
418 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
419 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
|
420 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
421 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
|
422 |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
423 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
|
424 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
425 int l; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
426 |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
427 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
|
428 { |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
429 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
|
430 return TRUE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
431 p += l; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
432 } |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
433 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
|
434 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
435 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
|
436 p += 3; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
437 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
|
438 p += 3; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
439 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
|
440 p += 2; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
441 else |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
442 p += 1; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
443 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
444 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
|
445 return TRUE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
446 else |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
447 ++p; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
448 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
449 return FALSE; |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
450 } |
|
488be8cbe19c
Make CTRL-L in command line mode respect 'ignorecase' and 'smartcase'. (Martin
Bram Moolenaar <bram@vim.org>
parents:
2282
diff
changeset
|
451 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
452 #if defined(FEAT_EVAL) || defined(PROTO) |
| 7 | 453 char_u * |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
454 last_csearch(void) |
| 6991 | 455 { |
| 456 return lastc_bytes; | |
| 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_forward(void) |
| 6991 | 461 { |
| 462 return lastcdir == FORWARD; | |
| 463 } | |
| 464 | |
| 465 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
466 last_csearch_until(void) |
| 6991 | 467 { |
| 468 return last_t_cmd == TRUE; | |
| 469 } | |
| 470 | |
| 471 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
472 set_last_csearch(int c, char_u *s UNUSED, int len UNUSED) |
| 6991 | 473 { |
| 474 *lastc = c; | |
| 475 lastc_bytelen = len; | |
| 476 if (len) | |
| 477 memcpy(lastc_bytes, s, len); | |
| 478 else | |
| 479 vim_memset(lastc_bytes, 0, sizeof(lastc_bytes)); | |
| 480 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
481 #endif |
| 6991 | 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_direction(int cdir) |
| 6991 | 485 { |
| 486 lastcdir = cdir; | |
| 487 } | |
| 488 | |
| 489 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
490 set_csearch_until(int t_cmd) |
| 6991 | 491 { |
| 492 last_t_cmd = t_cmd; | |
| 493 } | |
| 494 | |
| 495 char_u * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
496 last_search_pat(void) |
| 7 | 497 { |
| 498 return spats[last_idx].pat; | |
| 499 } | |
| 500 | |
| 501 /* | |
| 502 * Reset search direction to forward. For "gd" and "gD" commands. | |
| 503 */ | |
| 504 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
505 reset_search_dir(void) |
| 7 | 506 { |
| 507 spats[0].off.dir = '/'; | |
| 1624 | 508 #if defined(FEAT_EVAL) |
| 509 set_vv_searchforward(); | |
| 510 #endif | |
| 7 | 511 } |
| 512 | |
| 513 #if defined(FEAT_EVAL) || defined(FEAT_VIMINFO) | |
| 514 /* | |
| 515 * Set the last search pattern. For ":let @/ =" and viminfo. | |
| 516 * Also set the saved search pattern, so that this works in an autocommand. | |
| 517 */ | |
| 518 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
519 set_last_search_pat( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
520 char_u *s, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
521 int idx, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
522 int magic, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
523 int setlast) |
| 7 | 524 { |
| 525 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
|
526 // An empty string means that nothing should be matched. |
| 7 | 527 if (*s == NUL) |
| 528 spats[idx].pat = NULL; | |
| 529 else | |
| 530 spats[idx].pat = vim_strsave(s); | |
| 531 spats[idx].magic = magic; | |
| 532 spats[idx].no_scs = FALSE; | |
| 533 spats[idx].off.dir = '/'; | |
| 1624 | 534 #if defined(FEAT_EVAL) |
| 535 set_vv_searchforward(); | |
| 536 #endif | |
| 7 | 537 spats[idx].off.line = FALSE; |
| 538 spats[idx].off.end = FALSE; | |
| 539 spats[idx].off.off = 0; | |
| 540 if (setlast) | |
| 541 last_idx = idx; | |
| 542 if (save_level) | |
| 543 { | |
| 544 vim_free(saved_spats[idx].pat); | |
| 545 saved_spats[idx] = spats[0]; | |
| 546 if (spats[idx].pat == NULL) | |
| 547 saved_spats[idx].pat = NULL; | |
| 548 else | |
| 549 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
|
550 # 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
|
551 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
|
552 # endif |
| 7 | 553 } |
| 554 # ifdef FEAT_SEARCH_EXTRA | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
555 // If 'hlsearch' set and search pat changed: need redraw. |
| 7 | 556 if (p_hls && idx == last_idx && !no_hlsearch) |
| 745 | 557 redraw_all_later(SOME_VALID); |
| 7 | 558 # endif |
| 559 } | |
| 560 #endif | |
| 561 | |
| 562 #ifdef FEAT_SEARCH_EXTRA | |
| 563 /* | |
| 564 * Get a regexp program for the last used search pattern. | |
| 565 * This is used for highlighting all matches in a window. | |
| 566 * Values returned in regmatch->regprog and regmatch->rmm_ic. | |
| 567 */ | |
| 568 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 last_pat_prog(regmmatch_T *regmatch) |
| 7 | 570 { |
| 571 if (spats[last_idx].pat == NULL) | |
| 572 { | |
| 573 regmatch->regprog = NULL; | |
| 574 return; | |
| 575 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
576 ++emsg_off; // So it doesn't beep if bad expr |
| 7 | 577 (void)search_regcomp((char_u *)"", 0, last_idx, SEARCH_KEEP, regmatch); |
| 578 --emsg_off; | |
| 579 } | |
| 580 #endif | |
| 581 | |
| 582 /* | |
| 5735 | 583 * 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
|
584 * 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
|
585 * Start at position "pos" and return the found position in "pos". |
| 7 | 586 * |
| 587 * if (options & SEARCH_MSG) == 0 don't give any messages | |
| 588 * if (options & SEARCH_MSG) == SEARCH_NFMSG don't give 'notfound' messages | |
| 589 * if (options & SEARCH_MSG) == SEARCH_MSG give all messages | |
| 590 * if (options & SEARCH_HIS) put search pattern in history | |
| 591 * if (options & SEARCH_END) return position at end of match | |
| 592 * if (options & SEARCH_START) accept match at pos itself | |
| 593 * if (options & SEARCH_KEEP) keep previous search pattern | |
| 594 * if (options & SEARCH_FOLD) match only once in a closed fold | |
| 595 * 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
|
596 * if (options & SEARCH_COL) start at pos->col instead of zero |
| 7 | 597 * |
| 598 * Return FAIL (zero) for failure, non-zero for success. | |
| 599 * When FEAT_EVAL is defined, returns the index of the first matching | |
| 600 * subpattern plus one; one if there was none. | |
| 601 */ | |
| 602 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
603 searchit( |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
604 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
|
605 // buffer without a window! |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
606 buf_T *buf, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
607 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
|
608 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
|
609 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
610 char_u *pat, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
611 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
612 int options, |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
613 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
|
614 searchit_arg_T *extra_arg) // optional extra arguments, can be NULL |
| 7 | 615 { |
| 616 int found; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
617 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
|
618 colnr_T col; |
| 7 | 619 regmmatch_T regmatch; |
| 620 char_u *ptr; | |
| 621 colnr_T matchcol; | |
| 622 lpos_T endpos; | |
| 140 | 623 lpos_T matchpos; |
| 7 | 624 int loop; |
| 625 pos_T start_pos; | |
| 626 int at_first_line; | |
| 627 int extra_col; | |
| 6903 | 628 int start_char_len; |
| 7 | 629 int match_ok; |
| 630 long nmatched; | |
| 631 int submatch = 0; | |
| 6402 | 632 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
|
633 int called_emsg_before = called_emsg; |
| 7 | 634 #ifdef FEAT_SEARCH_EXTRA |
| 635 int break_loop = FALSE; | |
| 636 #endif | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
637 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
|
638 #ifdef FEAT_RELTIME |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
639 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
|
640 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
|
641 #endif |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
642 |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
643 if (extra_arg != NULL) |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
644 { |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
645 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
|
646 #ifdef FEAT_RELTIME |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
647 tm = extra_arg->sa_tm; |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
648 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
|
649 #endif |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
650 } |
| 7 | 651 |
| 652 if (search_regcomp(pat, RE_SEARCH, pat_use, | |
| 653 (options & (SEARCH_HIS + SEARCH_KEEP)), ®match) == FAIL) | |
| 654 { | |
| 655 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
|
656 semsg(_("E383: Invalid search string: %s"), mr_pattern); |
| 7 | 657 return FAIL; |
| 658 } | |
| 659 | |
| 648 | 660 /* |
| 661 * find the string | |
| 662 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
663 do // loop for count |
| 7 | 664 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
665 // 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
|
666 // 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
|
667 // MAXCOL + 1 is zero. |
| 6903 | 668 if (pos->col == MAXCOL) |
| 669 start_char_len = 0; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
670 // Watch out for the "col" being MAXCOL - 2, used in a closed fold. |
| 6903 | 671 else if (has_mbyte |
| 672 && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count | |
| 673 && pos->col < MAXCOL - 2) | |
| 6402 | 674 { |
|
13223
e37327129859
patch 8.0.1486: accessing invalid memory with "it"
Christian Brabandt <cb@256bit.org>
parents:
13217
diff
changeset
|
675 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
|
676 if ((int)STRLEN(ptr) <= pos->col) |
| 6903 | 677 start_char_len = 1; |
| 6402 | 678 else |
|
13223
e37327129859
patch 8.0.1486: accessing invalid memory with "it"
Christian Brabandt <cb@256bit.org>
parents:
13217
diff
changeset
|
679 start_char_len = (*mb_ptr2len)(ptr + pos->col); |
| 6402 | 680 } |
| 681 else | |
| 6903 | 682 start_char_len = 1; |
| 683 if (dir == FORWARD) | |
| 684 { | |
| 685 if (options & SEARCH_START) | |
| 686 extra_col = 0; | |
| 687 else | |
| 688 extra_col = start_char_len; | |
| 689 } | |
| 690 else | |
| 691 { | |
| 692 if (options & SEARCH_START) | |
| 693 extra_col = start_char_len; | |
| 694 else | |
| 695 extra_col = 0; | |
| 696 } | |
| 6402 | 697 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
698 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
|
699 found = 0; // default: not found |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
700 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
|
701 if (pos->lnum == 0) // correct lnum for when starting in line 0 |
| 7 | 702 { |
| 703 pos->lnum = 1; | |
| 704 pos->col = 0; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
705 at_first_line = FALSE; // not in first line now |
| 7 | 706 } |
| 707 | |
| 708 /* | |
| 709 * Start searching in current line, unless searching backwards and | |
| 710 * we're in column 0. | |
| 1311 | 711 * If we are searching backwards, in column 0, and not including the |
| 712 * current position, gain some efficiency by skipping back a line. | |
| 713 * Otherwise begin the search in the current line. | |
| 7 | 714 */ |
| 1311 | 715 if (dir == BACKWARD && start_pos.col == 0 |
| 716 && (options & SEARCH_START) == 0) | |
| 7 | 717 { |
| 718 lnum = pos->lnum - 1; | |
| 719 at_first_line = FALSE; | |
| 720 } | |
| 721 else | |
| 722 lnum = pos->lnum; | |
| 723 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
724 for (loop = 0; loop <= 1; ++loop) // loop twice if 'wrapscan' set |
| 7 | 725 { |
| 726 for ( ; lnum > 0 && lnum <= buf->b_ml.ml_line_count; | |
| 727 lnum += dir, at_first_line = FALSE) | |
| 728 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
729 // Stop after checking "stop_lnum", if it's set. |
| 692 | 730 if (stop_lnum != 0 && (dir == FORWARD |
| 731 ? lnum > stop_lnum : lnum < stop_lnum)) | |
| 732 break; | |
| 1496 | 733 #ifdef FEAT_RELTIME |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
734 // Stop after passing the "tm" time limit. |
| 1496 | 735 if (tm != NULL && profile_passed_limit(tm)) |
| 736 break; | |
| 737 #endif | |
| 692 | 738 |
| 7 | 739 /* |
| 140 | 740 * Look for a match somewhere in line "lnum". |
| 7 | 741 */ |
|
7358
6fbeef3b65e6
commit https://github.com/vim/vim/commit/ad4d8a192abf44b89371af87d70b971cd654b799
Christian Brabandt <cb@256bit.org>
parents:
7070
diff
changeset
|
742 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
|
743 : (colnr_T)0; |
| 7 | 744 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
|
745 lnum, col, |
| 1521 | 746 #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
|
747 tm, timed_out |
| 1521 | 748 #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
|
749 NULL, NULL |
| 1521 | 750 #endif |
| 751 ); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
752 // 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
|
753 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
|
754 #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
|
755 || (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
|
756 #endif |
|
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11488
diff
changeset
|
757 ) |
| 7 | 758 break; |
| 759 if (nmatched > 0) | |
| 760 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
761 // match may actually be in another line when using \zs |
| 140 | 762 matchpos = regmatch.startpos[0]; |
| 7 | 763 endpos = regmatch.endpos[0]; |
| 1521 | 764 #ifdef FEAT_EVAL |
| 7 | 765 submatch = first_submatch(®match); |
| 1521 | 766 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
767 // "lnum" may be past end of buffer for "\n\zs". |
| 685 | 768 if (lnum + matchpos.lnum > buf->b_ml.ml_line_count) |
| 769 ptr = (char_u *)""; | |
| 770 else | |
| 771 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); | |
| 7 | 772 |
| 773 /* | |
| 774 * Forward search in the first line: match should be after | |
| 775 * the start position. If not, continue at the end of the | |
| 776 * match (this is vi compatible) or on the next char. | |
| 777 */ | |
| 778 if (dir == FORWARD && at_first_line) | |
| 779 { | |
| 780 match_ok = TRUE; | |
| 781 /* | |
| 140 | 782 * When the match starts in a next line it's certainly |
| 783 * past the start position. | |
| 7 | 784 * When match lands on a NUL the cursor will be put |
| 785 * one back afterwards, compare with that position, | |
| 786 * otherwise "/$" will get stuck on end of line. | |
| 787 */ | |
| 140 | 788 while (matchpos.lnum == 0 |
| 6402 | 789 && ((options & SEARCH_END) && first_match |
| 140 | 790 ? (nmatched == 1 |
| 791 && (int)endpos.col - 1 | |
| 7 | 792 < (int)start_pos.col + extra_col) |
| 140 | 793 : ((int)matchpos.col |
| 794 - (ptr[matchpos.col] == NUL) | |
| 795 < (int)start_pos.col + extra_col))) | |
| 7 | 796 { |
| 797 /* | |
| 798 * If vi-compatible searching, continue at the end | |
| 799 * of the match, otherwise continue one position | |
| 800 * forward. | |
| 801 */ | |
| 802 if (vim_strchr(p_cpo, CPO_SEARCH) != NULL) | |
| 803 { | |
| 804 if (nmatched > 1) | |
| 805 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
806 // 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
|
807 // this line |
| 7 | 808 match_ok = FALSE; |
| 809 break; | |
| 810 } | |
| 811 matchcol = endpos.col; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
812 // for empty match: advance one char |
| 140 | 813 if (matchcol == matchpos.col |
| 7 | 814 && ptr[matchcol] != NUL) |
| 815 { | |
| 816 if (has_mbyte) | |
| 817 matchcol += | |
| 474 | 818 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 819 else |
| 820 ++matchcol; | |
| 821 } | |
| 822 } | |
| 823 else | |
| 824 { | |
| 140 | 825 matchcol = matchpos.col; |
| 7 | 826 if (ptr[matchcol] != NUL) |
| 827 { | |
| 828 if (has_mbyte) | |
| 474 | 829 matchcol += (*mb_ptr2len)(ptr |
| 7 | 830 + matchcol); |
| 831 else | |
| 832 ++matchcol; | |
| 833 } | |
| 834 } | |
| 4252 | 835 if (matchcol == 0 && (options & SEARCH_START)) |
| 4240 | 836 break; |
| 7 | 837 if (ptr[matchcol] == NUL |
| 838 || (nmatched = vim_regexec_multi(®match, | |
| 140 | 839 win, buf, lnum + matchpos.lnum, |
| 1521 | 840 matchcol, |
| 841 #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
|
842 tm, timed_out |
| 1521 | 843 #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
|
844 NULL, NULL |
| 1521 | 845 #endif |
| 846 )) == 0) | |
| 7 | 847 { |
| 848 match_ok = FALSE; | |
| 849 break; | |
| 850 } | |
| 140 | 851 matchpos = regmatch.startpos[0]; |
| 7 | 852 endpos = regmatch.endpos[0]; |
| 853 # ifdef FEAT_EVAL | |
| 854 submatch = first_submatch(®match); | |
| 855 # endif | |
| 856 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
857 // 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
|
858 // multi-line search may have made it invalid. |
| 140 | 859 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); |
| 7 | 860 } |
| 861 if (!match_ok) | |
| 862 continue; | |
| 863 } | |
| 864 if (dir == BACKWARD) | |
| 865 { | |
| 866 /* | |
| 867 * Now, if there are multiple matches on this line, | |
| 868 * we have to get the last one. Or the last one before | |
| 869 * the cursor, if we're on that line. | |
| 870 * When putting the new cursor at the end, compare | |
| 871 * relative to the end of the match. | |
| 872 */ | |
| 873 match_ok = FALSE; | |
| 874 for (;;) | |
| 875 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
876 // 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
|
877 // 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
|
878 // 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
|
879 // wrapping around. |
| 140 | 880 if (loop |
| 881 || ((options & SEARCH_END) | |
| 882 ? (lnum + regmatch.endpos[0].lnum | |
| 883 < start_pos.lnum | |
| 884 || (lnum + regmatch.endpos[0].lnum | |
| 885 == start_pos.lnum | |
| 886 && (int)regmatch.endpos[0].col - 1 | |
| 6903 | 887 < (int)start_pos.col |
| 888 + extra_col)) | |
| 140 | 889 : (lnum + regmatch.startpos[0].lnum |
| 890 < start_pos.lnum | |
| 891 || (lnum + regmatch.startpos[0].lnum | |
| 892 == start_pos.lnum | |
| 893 && (int)regmatch.startpos[0].col | |
| 6903 | 894 < (int)start_pos.col |
| 895 + extra_col)))) | |
| 7 | 896 { |
| 897 match_ok = TRUE; | |
| 140 | 898 matchpos = regmatch.startpos[0]; |
| 7 | 899 endpos = regmatch.endpos[0]; |
| 900 # ifdef FEAT_EVAL | |
| 901 submatch = first_submatch(®match); | |
| 902 # endif | |
| 903 } | |
| 904 else | |
| 905 break; | |
| 906 | |
| 907 /* | |
| 908 * We found a valid match, now check if there is | |
| 909 * another one after it. | |
| 910 * If vi-compatible searching, continue at the end | |
| 911 * of the match, otherwise continue one position | |
| 912 * forward. | |
| 913 */ | |
| 914 if (vim_strchr(p_cpo, CPO_SEARCH) != NULL) | |
| 915 { | |
| 916 if (nmatched > 1) | |
| 917 break; | |
| 918 matchcol = endpos.col; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
919 // for empty match: advance one char |
| 140 | 920 if (matchcol == matchpos.col |
| 7 | 921 && ptr[matchcol] != NUL) |
| 922 { | |
| 923 if (has_mbyte) | |
| 924 matchcol += | |
| 474 | 925 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 926 else |
| 927 ++matchcol; | |
| 928 } | |
| 929 } | |
| 930 else | |
| 931 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
932 // Stop when the match is in a next line. |
| 140 | 933 if (matchpos.lnum > 0) |
| 934 break; | |
| 935 matchcol = matchpos.col; | |
| 7 | 936 if (ptr[matchcol] != NUL) |
| 937 { | |
| 938 if (has_mbyte) | |
| 939 matchcol += | |
| 474 | 940 (*mb_ptr2len)(ptr + matchcol); |
| 7 | 941 else |
| 942 ++matchcol; | |
| 943 } | |
| 944 } | |
| 945 if (ptr[matchcol] == NUL | |
| 946 || (nmatched = vim_regexec_multi(®match, | |
| 140 | 947 win, buf, lnum + matchpos.lnum, |
| 1521 | 948 matchcol, |
| 949 #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
|
950 tm, timed_out |
| 1521 | 951 #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
|
952 NULL, NULL |
| 1521 | 953 #endif |
| 954 )) == 0) | |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
955 { |
|
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
956 #ifdef FEAT_RELTIME |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
957 // 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
|
958 // 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
|
959 // OK. |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
960 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
|
961 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
|
962 #endif |
| 7 | 963 break; |
|
13217
891b821d3602
patch 8.0.1483: searchpair() might return an invalid value on timeout
Christian Brabandt <cb@256bit.org>
parents:
13210
diff
changeset
|
964 } |
| 7 | 965 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
966 // 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
|
967 // multi-line search may have made it invalid. |
| 140 | 968 ptr = ml_get_buf(buf, lnum + matchpos.lnum, FALSE); |
| 7 | 969 } |
| 970 | |
| 971 /* | |
| 972 * If there is only a match after the cursor, skip | |
| 973 * this match. | |
| 974 */ | |
| 975 if (!match_ok) | |
| 976 continue; | |
| 977 } | |
| 978 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
979 // 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
|
980 // 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
|
981 // should be same as start then. |
| 4252 | 982 if ((options & SEARCH_END) && !(options & SEARCH_NOOF) |
| 1544 | 983 && !(matchpos.lnum == endpos.lnum |
| 984 && matchpos.col == endpos.col)) | |
| 7 | 985 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
986 // 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
|
987 // on the NUL in the previous line. |
| 140 | 988 pos->lnum = lnum + endpos.lnum; |
| 1544 | 989 pos->col = endpos.col; |
| 990 if (endpos.col == 0) | |
| 819 | 991 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
992 if (pos->lnum > 1) // just in case |
| 1544 | 993 { |
| 994 --pos->lnum; | |
| 995 pos->col = (colnr_T)STRLEN(ml_get_buf(buf, | |
| 996 pos->lnum, FALSE)); | |
| 997 } | |
| 998 } | |
| 999 else | |
| 1000 { | |
| 1001 --pos->col; | |
| 1002 if (has_mbyte | |
| 1003 && pos->lnum <= buf->b_ml.ml_line_count) | |
| 1004 { | |
| 1060 | 1005 ptr = ml_get_buf(buf, pos->lnum, FALSE); |
| 1544 | 1006 pos->col -= (*mb_head_off)(ptr, ptr + pos->col); |
| 1007 } | |
| 819 | 1008 } |
|
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
|
1009 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
|
1010 { |
|
db5d2429bda3
patch 8.1.0629: "gn" selects the wrong text with a multi-line match
Bram Moolenaar <Bram@vim.org>
parents:
15091
diff
changeset
|
1011 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
|
1012 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
|
1013 } |
| 7 | 1014 } |
| 1015 else | |
| 1016 { | |
| 140 | 1017 pos->lnum = lnum + matchpos.lnum; |
| 1018 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
|
1019 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
|
1020 { |
|
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->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
|
1022 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
|
1023 } |
| 7 | 1024 } |
| 1025 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
|
1026 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
|
1027 end_pos->coladd = 0; |
| 7 | 1028 found = 1; |
| 6402 | 1029 first_match = FALSE; |
| 7 | 1030 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1031 // Set variables used for 'incsearch' highlighting. |
| 140 | 1032 search_match_lines = endpos.lnum - matchpos.lnum; |
| 7 | 1033 search_match_endcol = endpos.col; |
| 1034 break; | |
| 1035 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1036 line_breakcheck(); // stop if ctrl-C typed |
| 7 | 1037 if (got_int) |
| 1038 break; | |
| 1039 | |
| 1040 #ifdef FEAT_SEARCH_EXTRA | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1041 // 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
|
1042 // '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
|
1043 // searching too much. |
| 7 | 1044 if ((options & SEARCH_PEEK) |
| 1045 && ((lnum - pos->lnum) & 0x3f) == 0 | |
| 1046 && char_avail()) | |
| 1047 { | |
| 1048 break_loop = TRUE; | |
| 1049 break; | |
| 1050 } | |
| 1051 #endif | |
| 1052 | |
| 1053 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
|
1054 break; // if second loop, stop where started |
| 7 | 1055 } |
| 1056 at_first_line = FALSE; | |
| 1057 | |
| 1058 /* | |
| 692 | 1059 * Stop the search if wrapscan isn't set, "stop_lnum" is |
| 1060 * specified, after an interrupt, after a match and after looping | |
| 1061 * twice. | |
| 7 | 1062 */ |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
1063 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
|
1064 || 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
|
1065 #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
|
1066 || (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
|
1067 #endif |
| 1877 | 1068 #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
|
1069 || break_loop |
| 1877 | 1070 #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
|
1071 || found || loop) |
| 7 | 1072 break; |
| 1073 | |
| 1074 /* | |
| 1075 * If 'wrapscan' is set we continue at the other end of the file. | |
| 1076 * If 'shortmess' does not contain 's', we give a message. | |
| 1077 * This message is also remembered in keep_msg for when the screen | |
| 1078 * is redrawn. The keep_msg is cleared whenever another message is | |
| 1079 * written. | |
| 1080 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1081 if (dir == BACKWARD) // start second loop at the other end |
| 7 | 1082 lnum = buf->b_ml.ml_line_count; |
| 1083 else | |
| 1084 lnum = 1; | |
| 504 | 1085 if (!shortmess(SHM_SEARCH) && (options & SEARCH_MSG)) |
| 1086 give_warning((char_u *)_(dir == BACKWARD | |
| 1087 ? 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
|
1088 if (extra_arg != NULL) |
|
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1089 extra_arg->sa_wrapped = TRUE; |
| 7 | 1090 } |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
1091 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
|
1092 #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
|
1093 || (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
|
1094 #endif |
| 1877 | 1095 #ifdef FEAT_SEARCH_EXTRA |
| 1096 || break_loop | |
| 1097 #endif | |
| 1098 ) | |
| 7 | 1099 break; |
| 1100 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1101 while (--count > 0 && found); // stop after count matches or no match |
| 7 | 1102 |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
1103 vim_regfree(regmatch.regprog); |
| 7 | 1104 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1105 if (!found) // did not find it |
| 7 | 1106 { |
| 1107 if (got_int) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1108 emsg(_(e_interr)); |
| 7 | 1109 else if ((options & SEARCH_MSG) == SEARCH_MSG) |
| 1110 { | |
| 1111 if (p_ws) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1112 semsg(_(e_patnotf2), mr_pattern); |
| 7 | 1113 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
|
1114 semsg(_("E384: search hit TOP without match for: %s"), |
| 7 | 1115 mr_pattern); |
| 1116 else | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1117 semsg(_("E385: search hit BOTTOM without match for: %s"), |
| 7 | 1118 mr_pattern); |
| 1119 } | |
| 1120 return FAIL; | |
| 1121 } | |
| 1122 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1123 // A pattern like "\n\zs" may go past the last line. |
| 685 | 1124 if (pos->lnum > buf->b_ml.ml_line_count) |
| 1125 { | |
| 1126 pos->lnum = buf->b_ml.ml_line_count; | |
| 835 | 1127 pos->col = (int)STRLEN(ml_get_buf(buf, pos->lnum, FALSE)); |
| 685 | 1128 if (pos->col > 0) |
| 1129 --pos->col; | |
| 1130 } | |
| 1131 | |
| 7 | 1132 return submatch + 1; |
| 1133 } | |
| 1134 | |
| 1135 #ifdef FEAT_EVAL | |
| 1624 | 1136 void |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1137 set_search_direction(int cdir) |
| 1624 | 1138 { |
| 1139 spats[0].off.dir = cdir; | |
| 1140 } | |
| 1141 | |
| 1142 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1143 set_vv_searchforward(void) |
| 1624 | 1144 { |
| 1145 set_vim_var_nr(VV_SEARCHFORWARD, (long)(spats[0].off.dir == '/')); | |
| 1146 } | |
| 1147 | |
| 7 | 1148 /* |
| 1149 * 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
|
1150 * Return zero if none of them matched. |
| 7 | 1151 */ |
| 1152 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1153 first_submatch(regmmatch_T *rp) |
| 7 | 1154 { |
| 1155 int submatch; | |
| 1156 | |
| 1157 for (submatch = 1; ; ++submatch) | |
| 1158 { | |
| 1159 if (rp->startpos[submatch].lnum >= 0) | |
| 1160 break; | |
| 1161 if (submatch == 9) | |
| 1162 { | |
| 1163 submatch = 0; | |
| 1164 break; | |
| 1165 } | |
| 1166 } | |
| 1167 return submatch; | |
| 1168 } | |
| 1169 #endif | |
| 1170 | |
| 1171 /* | |
| 1172 * Highest level string search function. | |
| 1222 | 1173 * Search for the 'count'th occurrence of pattern 'pat' in direction 'dirc' |
| 7 | 1174 * If 'dirc' is 0: use previous dir. |
| 1175 * If 'pat' is NULL or empty : use previous string. | |
| 1176 * If 'options & SEARCH_REV' : go in reverse of previous dir. | |
| 1177 * If 'options & SEARCH_ECHO': echo the search command and handle options | |
| 1178 * If 'options & SEARCH_MSG' : may give error message | |
| 1179 * If 'options & SEARCH_OPT' : interpret optional flags | |
| 1180 * If 'options & SEARCH_HIS' : put search pattern in history | |
| 1181 * If 'options & SEARCH_NOOF': don't add offset to position | |
| 1182 * If 'options & SEARCH_MARK': set previous context mark | |
| 1183 * If 'options & SEARCH_KEEP': keep previous search pattern | |
| 1184 * If 'options & SEARCH_START': accept match at curpos itself | |
| 1185 * If 'options & SEARCH_PEEK': check for typed char, cancel search | |
| 1186 * | |
| 1187 * Careful: If spats[0].off.line == TRUE and spats[0].off.off == 0 this | |
| 1188 * makes the movement linewise without moving the match position. | |
| 1189 * | |
| 6661 | 1190 * Return 0 for failure, 1 for found, 2 for found and line offset added. |
| 7 | 1191 */ |
| 1192 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1193 do_search( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1194 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
|
1195 int dirc, // '/' or '?' |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1196 char_u *pat, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1197 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1198 int options, |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1199 searchit_arg_T *sia) // optional arguments or NULL |
| 7 | 1200 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1201 pos_T pos; // position of the last match |
| 7 | 1202 char_u *searchstr; |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
1203 soffset_T old_off; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1204 int retval; // Return value |
| 7 | 1205 char_u *p; |
| 1206 long c; | |
| 1207 char_u *dircp; | |
| 1208 char_u *strcopy = NULL; | |
| 1209 char_u *ps; | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1210 char_u *msgbuf = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1211 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
|
1212 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
|
1213 #define SEARCH_STAT_BUF_LEN 12 |
| 7 | 1214 |
| 1215 /* | |
| 1216 * A line offset is not remembered, this is vi compatible. | |
| 1217 */ | |
| 1218 if (spats[0].off.line && vim_strchr(p_cpo, CPO_LINEOFF) != NULL) | |
| 1219 { | |
| 1220 spats[0].off.line = FALSE; | |
| 1221 spats[0].off.off = 0; | |
| 1222 } | |
| 1223 | |
| 1224 /* | |
| 1225 * Save the values for when (options & SEARCH_KEEP) is used. | |
| 1226 * (there is no "if ()" around this because gcc wants them initialized) | |
| 1227 */ | |
| 1228 old_off = spats[0].off; | |
| 1229 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1230 pos = curwin->w_cursor; // start searching at the cursor position |
| 7 | 1231 |
| 1232 /* | |
| 1233 * Find out the direction of the search. | |
| 1234 */ | |
| 1235 if (dirc == 0) | |
| 1236 dirc = spats[0].off.dir; | |
| 1237 else | |
| 1624 | 1238 { |
| 7 | 1239 spats[0].off.dir = dirc; |
| 1624 | 1240 #if defined(FEAT_EVAL) |
| 1241 set_vv_searchforward(); | |
| 1242 #endif | |
| 1243 } | |
| 7 | 1244 if (options & SEARCH_REV) |
| 1245 { | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
1246 #ifdef MSWIN |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1247 // 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
|
1248 // dirc always ends up being '/' |
| 7 | 1249 dirc = (dirc == '/') ? '?' : '/'; |
| 1250 #else | |
| 1251 if (dirc == '/') | |
| 1252 dirc = '?'; | |
| 1253 else | |
| 1254 dirc = '/'; | |
| 1255 #endif | |
| 1256 } | |
| 1257 | |
| 1258 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1259 // 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
|
1260 // fold. |
| 7 | 1261 if (dirc == '/') |
| 1262 { | |
| 1263 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
|
1264 pos.col = MAXCOL - 2; // avoid overflow when adding 1 |
| 7 | 1265 } |
| 1266 else | |
| 1267 { | |
| 1268 if (hasFolding(pos.lnum, &pos.lnum, NULL)) | |
| 1269 pos.col = 0; | |
| 1270 } | |
| 1271 #endif | |
| 1272 | |
| 1273 #ifdef FEAT_SEARCH_EXTRA | |
| 1274 /* | |
| 1275 * Turn 'hlsearch' highlighting back on. | |
| 1276 */ | |
| 1277 if (no_hlsearch && !(options & SEARCH_KEEP)) | |
| 1278 { | |
| 745 | 1279 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
|
1280 set_no_hlsearch(FALSE); |
| 7 | 1281 } |
| 1282 #endif | |
| 1283 | |
| 1284 /* | |
| 1285 * Repeat the search when pattern followed by ';', e.g. "/foo/;?bar". | |
| 1286 */ | |
| 1287 for (;;) | |
| 1288 { | |
|
18358
34d5cd432cac
patch 8.1.2173: searchit() has too many arguments
Bram Moolenaar <Bram@vim.org>
parents:
18263
diff
changeset
|
1289 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
|
1290 |
| 7 | 1291 searchstr = pat; |
| 1292 dircp = NULL; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1293 // use previous pattern |
| 7 | 1294 if (pat == NULL || *pat == NUL || *pat == dirc) |
| 1295 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1296 if (spats[RE_SEARCH].pat == NULL) // no previous pattern |
| 7 | 1297 { |
|
10172
ab45de65977b
commit https://github.com/vim/vim/commit/ea683da58cf9ecf3afab9d650d3d2da76e5298d3
Christian Brabandt <cb@256bit.org>
parents:
10064
diff
changeset
|
1298 searchstr = spats[RE_SUBST].pat; |
|
ab45de65977b
commit https://github.com/vim/vim/commit/ea683da58cf9ecf3afab9d650d3d2da76e5298d3
Christian Brabandt <cb@256bit.org>
parents:
10064
diff
changeset
|
1299 if (searchstr == NULL) |
| 2719 | 1300 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1301 emsg(_(e_noprevre)); |
| 2719 | 1302 retval = 0; |
| 1303 goto end_do_search; | |
| 1304 } | |
| 7 | 1305 } |
| 2719 | 1306 else |
| 1307 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1308 // make search_regcomp() use spats[RE_SEARCH].pat |
| 2719 | 1309 searchstr = (char_u *)""; |
| 1310 } | |
| 7 | 1311 } |
| 1312 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1313 if (pat != NULL && *pat != NUL) // look for (new) offset |
| 7 | 1314 { |
| 1315 /* | |
| 1316 * Find end of regular expression. | |
| 1317 * If there is a matching '/' or '?', toss it. | |
| 1318 */ | |
| 1319 ps = strcopy; | |
| 1320 p = skip_regexp(pat, dirc, (int)p_magic, &strcopy); | |
| 1321 if (strcopy != ps) | |
| 1322 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1323 // made a copy of "pat" to change "\?" to "?" |
| 835 | 1324 searchcmdlen += (int)(STRLEN(pat) - STRLEN(strcopy)); |
| 7 | 1325 pat = strcopy; |
| 1326 searchstr = strcopy; | |
| 1327 } | |
| 1328 if (*p == dirc) | |
| 1329 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1330 dircp = p; // remember where we put the NUL |
| 7 | 1331 *p++ = NUL; |
| 1332 } | |
| 1333 spats[0].off.line = FALSE; | |
| 1334 spats[0].off.end = FALSE; | |
| 1335 spats[0].off.off = 0; | |
| 1336 /* | |
| 1337 * Check for a line offset or a character offset. | |
| 1338 * For get_address (echo off) we don't check for a character | |
| 1339 * offset, because it is meaningless and the 's' could be a | |
| 1340 * substitute command. | |
| 1341 */ | |
| 1342 if (*p == '+' || *p == '-' || VIM_ISDIGIT(*p)) | |
| 1343 spats[0].off.line = TRUE; | |
| 1344 else if ((options & SEARCH_OPT) && | |
| 1345 (*p == 'e' || *p == 's' || *p == 'b')) | |
| 1346 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1347 if (*p == 'e') // end |
| 7 | 1348 spats[0].off.end = SEARCH_END; |
| 1349 ++p; | |
| 1350 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1351 if (VIM_ISDIGIT(*p) || *p == '+' || *p == '-') // got an offset |
| 7 | 1352 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1353 // 'nr' or '+nr' or '-nr' |
| 7 | 1354 if (VIM_ISDIGIT(*p) || VIM_ISDIGIT(*(p + 1))) |
| 1355 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
|
1356 else if (*p == '-') // single '-' |
| 7 | 1357 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
|
1358 else // single '+' |
| 7 | 1359 spats[0].off.off = 1; |
| 1360 ++p; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1361 while (VIM_ISDIGIT(*p)) // skip number |
| 7 | 1362 ++p; |
| 1363 } | |
| 1364 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1365 // compute length of search command for get_address() |
| 7 | 1366 searchcmdlen += (int)(p - pat); |
| 1367 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1368 pat = p; // put pat after search command |
| 7 | 1369 } |
| 1370 | |
|
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
|
1371 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
|
1372 !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
|
1373 (!cmd_silent || !shortmess(SHM_SEARCHCOUNT))) |
| 7 | 1374 { |
| 1375 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
|
1376 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
|
1377 size_t off_len = 0; |
| 7 | 1378 |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1379 // Compute msg_row early. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1380 msg_start(); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1381 |
|
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
|
1382 // 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
|
1383 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
|
1384 (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
|
1385 { |
|
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 = 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
|
1387 *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
|
1388 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
|
1389 *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
|
1390 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
|
1391 *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
|
1392 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
|
1393 *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
|
1394 *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
|
1395 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
|
1396 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
|
1397 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
|
1398 } |
|
73ff6357da5b
patch 8.1.1375: without "TS" in 'shortmess' get a hit-enter prompt often
Bram Moolenaar <Bram@vim.org>
parents:
16738
diff
changeset
|
1399 |
| 7 | 1400 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
|
1401 p = spats[0].pat; |
| 7 | 1402 else |
| 1403 p = searchstr; | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1404 |
|
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
|
1405 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
|
1406 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1407 // 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
|
1408 // 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
|
1409 // 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
|
1410 // 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
|
1411 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
|
1412 // Use all the columns. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1413 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
|
1414 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1415 // Use up to 'showcmd' column. |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1416 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
|
1417 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
|
1418 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
|
1419 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1420 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1421 // 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
|
1422 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
|
1423 |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16776
diff
changeset
|
1424 msgbuf = alloc(len); |
| 7 | 1425 if (msgbuf != NULL) |
| 1426 { | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1427 vim_memset(msgbuf, ' ', len); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1428 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
|
1429 // 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
|
1430 // 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
|
1431 if (!cmd_silent) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1432 { |
|
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
|
1433 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
|
1434 |
|
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 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
|
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 // 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
|
1438 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
|
1439 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
|
1440 } |
|
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 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
|
1442 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
|
1443 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
|
1444 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
|
1445 |
|
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 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
|
1447 if (trunc != NULL) |
| 7 | 1448 { |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1449 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
|
1450 msgbuf = trunc; |
| 7 | 1451 } |
|
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
|
1452 |
|
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 #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
|
1454 // 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
|
1455 // 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
|
1456 // 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
|
1457 // 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
|
1458 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
|
1459 { |
|
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 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
|
1461 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
|
1462 |
|
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 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
|
1464 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
|
1465 { |
|
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 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
|
1467 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 // 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
|
1469 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
|
1470 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
|
1471 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
|
1472 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
|
1473 // 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
|
1474 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
|
1475 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
|
1476 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
|
1477 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
|
1478 } |
|
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 } |
|
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 #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
|
1481 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
|
1482 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
|
1483 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
|
1484 |
|
1e86f8b18a5d
patch 8.1.1965: search count message is not displayed when using a mapping
Bram Moolenaar <Bram@vim.org>
parents:
17809
diff
changeset
|
1485 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
|
1486 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
|
1487 msg_nowait = TRUE; // don't wait for this message |
| 7 | 1488 } |
| 1489 } | |
| 1490 } | |
| 1491 | |
| 1492 /* | |
| 1493 * If there is a character offset, subtract it from the current | |
| 1494 * position, so we don't get stuck at "?pat?e+2" or "/pat/s-2". | |
| 8 | 1495 * Skip this if pos.col is near MAXCOL (closed fold). |
| 7 | 1496 * This is not done for a line offset, because then we would not be vi |
| 1497 * compatible. | |
| 1498 */ | |
| 8 | 1499 if (!spats[0].off.line && spats[0].off.off && pos.col < MAXCOL - 2) |
| 7 | 1500 { |
| 1501 if (spats[0].off.off > 0) | |
| 1502 { | |
| 1503 for (c = spats[0].off.off; c; --c) | |
| 1504 if (decl(&pos) == -1) | |
| 1505 break; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1506 if (c) // at start of buffer |
| 7 | 1507 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1508 pos.lnum = 0; // allow lnum == 0 here |
| 7 | 1509 pos.col = MAXCOL; |
| 1510 } | |
| 1511 } | |
| 1512 else | |
| 1513 { | |
| 1514 for (c = spats[0].off.off; c; ++c) | |
| 1515 if (incl(&pos) == -1) | |
| 1516 break; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1517 if (c) // at end of buffer |
| 7 | 1518 { |
| 1519 pos.lnum = curbuf->b_ml.ml_line_count + 1; | |
| 1520 pos.col = 0; | |
| 1521 } | |
| 1522 } | |
| 1523 } | |
| 1524 | |
|
15850
a6ca8cf07a98
patch 8.1.0932: Farsi support is outdated and unused
Bram Moolenaar <Bram@vim.org>
parents:
15758
diff
changeset
|
1525 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
|
1526 dirc == '/' ? FORWARD : BACKWARD, |
| 7 | 1527 searchstr, count, spats[0].off.end + (options & |
| 1528 (SEARCH_KEEP + SEARCH_PEEK + SEARCH_HIS | |
| 1529 + SEARCH_MSG + SEARCH_START | |
| 1530 + ((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
|
1531 RE_LAST, sia); |
| 7 | 1532 |
| 1533 if (dircp != NULL) | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1534 *dircp = dirc; // restore second '/' or '?' for normal_cmd() |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1535 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1536 if (!shortmess(SHM_SEARCH) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1537 && ((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
|
1538 || (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
|
1539 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
|
1540 |
| 7 | 1541 if (c == FAIL) |
| 1542 { | |
| 1543 retval = 0; | |
| 1544 goto end_do_search; | |
| 1545 } | |
| 1546 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
|
1547 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
|
1548 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1549 retval = 1; // pattern found |
| 7 | 1550 |
| 1551 /* | |
| 1552 * Add character and/or line offset | |
| 1553 */ | |
| 945 | 1554 if (!(options & SEARCH_NOOF) || (pat != NULL && *pat == ';')) |
| 7 | 1555 { |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1556 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
|
1557 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1558 if (spats[0].off.line) // Add the offset to the line number. |
| 7 | 1559 { |
| 1560 c = pos.lnum + spats[0].off.off; | |
| 1561 if (c < 1) | |
| 1562 pos.lnum = 1; | |
| 1563 else if (c > curbuf->b_ml.ml_line_count) | |
| 1564 pos.lnum = curbuf->b_ml.ml_line_count; | |
| 1565 else | |
| 1566 pos.lnum = c; | |
| 1567 pos.col = 0; | |
| 1568 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1569 retval = 2; // pattern found, line offset added |
| 7 | 1570 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1571 else if (pos.col < MAXCOL - 2) // just in case |
| 7 | 1572 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1573 // to the right, check for end of file |
| 1624 | 1574 c = spats[0].off.off; |
| 1575 if (c > 0) | |
| 7 | 1576 { |
| 1624 | 1577 while (c-- > 0) |
| 7 | 1578 if (incl(&pos) == -1) |
| 1579 break; | |
| 1580 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1581 // to the left, check for start of file |
| 7 | 1582 else |
| 1583 { | |
| 1624 | 1584 while (c++ < 0) |
| 1585 if (decl(&pos) == -1) | |
| 1586 break; | |
| 7 | 1587 } |
| 1588 } | |
|
16776
7d4c814a8554
patch 8.1.1390: search stats are off when using count or offset
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1589 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
|
1590 has_offset = TRUE; |
| 7 | 1591 } |
| 1592 | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1593 // 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
|
1594 if ((options & SEARCH_ECHO) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1595 && 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
|
1596 && !msg_silent |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1597 && c != FAIL |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1598 && !shortmess(SHM_SEARCHCOUNT) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1599 && 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
|
1600 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
|
1601 (count != 1 || has_offset)); |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1602 |
| 7 | 1603 /* |
| 1604 * The search command can be followed by a ';' to do another search. | |
| 1605 * For example: "/pat/;/foo/+3;?bar" | |
| 1606 * This is like doing another search command, except: | |
| 1607 * - The remembered direction '/' or '?' is from the first search. | |
| 1608 * - When an error happens the cursor isn't moved at all. | |
| 1609 * Don't do this when called by get_address() (it handles ';' itself). | |
| 1610 */ | |
| 1611 if (!(options & SEARCH_OPT) || pat == NULL || *pat != ';') | |
| 1612 break; | |
| 1613 | |
| 1614 dirc = *++pat; | |
| 1615 if (dirc != '?' && dirc != '/') | |
| 1616 { | |
| 1617 retval = 0; | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
1618 emsg(_("E386: Expected '?' or '/' after ';'")); |
| 7 | 1619 goto end_do_search; |
| 1620 } | |
| 1621 ++pat; | |
| 1622 } | |
| 1623 | |
| 1624 if (options & SEARCH_MARK) | |
| 1625 setpcmark(); | |
| 1626 curwin->w_cursor = pos; | |
| 1627 curwin->w_set_curswant = TRUE; | |
| 1628 | |
| 1629 end_do_search: | |
| 5616 | 1630 if ((options & SEARCH_KEEP) || cmdmod.keeppatterns) |
| 7 | 1631 spats[0].off = old_off; |
| 1632 vim_free(strcopy); | |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
1633 vim_free(msgbuf); |
| 7 | 1634 |
| 1635 return retval; | |
| 1636 } | |
| 1637 | |
| 1638 /* | |
| 1639 * search_for_exact_line(buf, pos, dir, pat) | |
| 1640 * | |
| 1641 * 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
|
1642 * white-space), starting from pos and going in direction "dir". "pos" will |
| 7 | 1643 * 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
|
1644 * ADDING is set. If p_ic is set then the pattern must be in lowercase. |
| 7 | 1645 * Return OK for success, or FAIL if no line found. |
| 1646 */ | |
| 1647 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1648 search_for_exact_line( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1649 buf_T *buf, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1650 pos_T *pos, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1651 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1652 char_u *pat) |
| 7 | 1653 { |
| 1654 linenr_T start = 0; | |
| 1655 char_u *ptr; | |
| 1656 char_u *p; | |
| 1657 | |
| 1658 if (buf->b_ml.ml_line_count == 0) | |
| 1659 return FAIL; | |
| 1660 for (;;) | |
| 1661 { | |
| 1662 pos->lnum += dir; | |
| 1663 if (pos->lnum < 1) | |
| 1664 { | |
| 1665 if (p_ws) | |
| 1666 { | |
| 1667 pos->lnum = buf->b_ml.ml_line_count; | |
| 1668 if (!shortmess(SHM_SEARCH)) | |
| 1669 give_warning((char_u *)_(top_bot_msg), TRUE); | |
| 1670 } | |
| 1671 else | |
| 1672 { | |
| 1673 pos->lnum = 1; | |
| 1674 break; | |
| 1675 } | |
| 1676 } | |
| 1677 else if (pos->lnum > buf->b_ml.ml_line_count) | |
| 1678 { | |
| 1679 if (p_ws) | |
| 1680 { | |
| 1681 pos->lnum = 1; | |
| 1682 if (!shortmess(SHM_SEARCH)) | |
| 1683 give_warning((char_u *)_(bot_top_msg), TRUE); | |
| 1684 } | |
| 1685 else | |
| 1686 { | |
| 1687 pos->lnum = 1; | |
| 1688 break; | |
| 1689 } | |
| 1690 } | |
| 1691 if (pos->lnum == start) | |
| 1692 break; | |
| 1693 if (start == 0) | |
| 1694 start = pos->lnum; | |
| 1695 ptr = ml_get_buf(buf, pos->lnum, FALSE); | |
| 1696 p = skipwhite(ptr); | |
| 1697 pos->col = (colnr_T) (p - ptr); | |
| 1698 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1699 // 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
|
1700 // ignored because we are interested in the next line -- Acevedo |
| 449 | 1701 if ((compl_cont_status & CONT_ADDING) |
| 1702 && !(compl_cont_status & CONT_SOL)) | |
| 7 | 1703 { |
| 1704 if ((p_ic ? MB_STRICMP(p, pat) : STRCMP(p, pat)) == 0) | |
| 1705 return OK; | |
| 1706 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1707 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
|
1708 { // expanding lines or words |
| 449 | 1709 if ((p_ic ? MB_STRNICMP(p, pat, compl_length) |
| 1710 : STRNCMP(p, pat, compl_length)) == 0) | |
| 7 | 1711 return OK; |
| 1712 } | |
| 1713 } | |
| 1714 return FAIL; | |
| 1715 } | |
| 1716 | |
| 1717 /* | |
| 1718 * Character Searches | |
| 1719 */ | |
| 1720 | |
| 1721 /* | |
| 1722 * Search for a character in a line. If "t_cmd" is FALSE, move to the | |
| 1723 * position of the character, otherwise move to just before the char. | |
| 1724 * Do this "cap->count1" times. | |
| 1725 * Return FAIL or OK. | |
| 1726 */ | |
| 1727 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1728 searchc(cmdarg_T *cap, int t_cmd) |
| 7 | 1729 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1730 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
|
1731 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
|
1732 long count = cap->count1; // repeat count |
| 7 | 1733 int col; |
| 1734 char_u *p; | |
| 1735 int len; | |
| 2925 | 1736 int stop = TRUE; |
| 7 | 1737 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1738 if (c != NUL) // normal search: remember args for repeat |
| 7 | 1739 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1740 if (!KeyStuffed) // don't remember when redoing |
| 7 | 1741 { |
| 6991 | 1742 *lastc = c; |
| 1743 set_csearch_direction(dir); | |
| 1744 set_csearch_until(t_cmd); | |
| 1745 lastc_bytelen = (*mb_char2bytes)(c, lastc_bytes); | |
| 7 | 1746 if (cap->ncharC1 != 0) |
| 1747 { | |
| 6991 | 1748 lastc_bytelen += (*mb_char2bytes)(cap->ncharC1, |
| 1749 lastc_bytes + lastc_bytelen); | |
| 7 | 1750 if (cap->ncharC2 != 0) |
| 6991 | 1751 lastc_bytelen += (*mb_char2bytes)(cap->ncharC2, |
| 1752 lastc_bytes + lastc_bytelen); | |
| 7 | 1753 } |
| 1754 } | |
| 1755 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1756 else // repeat previous search |
| 7 | 1757 { |
|
15605
62b3805506b3
patch 8.1.0810: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
1758 if (*lastc == NUL && lastc_bytelen == 1) |
| 7 | 1759 return FAIL; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1760 if (dir) // repeat in opposite direction |
| 7 | 1761 dir = -lastcdir; |
| 1762 else | |
| 1763 dir = lastcdir; | |
| 1764 t_cmd = last_t_cmd; | |
| 6991 | 1765 c = *lastc; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1766 // 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
|
1767 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1768 // 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
|
1769 // 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
|
1770 // at. |
| 2947 | 1771 if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1 && t_cmd) |
| 2925 | 1772 stop = FALSE; |
| 7 | 1773 } |
| 1774 | |
| 530 | 1775 if (dir == BACKWARD) |
| 1776 cap->oap->inclusive = FALSE; | |
| 1777 else | |
| 1778 cap->oap->inclusive = TRUE; | |
| 1779 | |
| 7 | 1780 p = ml_get_curline(); |
| 1781 col = curwin->w_cursor.col; | |
| 1782 len = (int)STRLEN(p); | |
| 1783 | |
| 1784 while (count--) | |
| 1785 { | |
| 1786 if (has_mbyte) | |
| 1787 { | |
| 1788 for (;;) | |
| 1789 { | |
| 1790 if (dir > 0) | |
| 1791 { | |
| 474 | 1792 col += (*mb_ptr2len)(p + col); |
| 7 | 1793 if (col >= len) |
| 1794 return FAIL; | |
| 1795 } | |
| 1796 else | |
| 1797 { | |
| 1798 if (col == 0) | |
| 1799 return FAIL; | |
| 1800 col -= (*mb_head_off)(p, p + col - 1) + 1; | |
| 1801 } | |
| 6991 | 1802 if (lastc_bytelen == 1) |
| 7 | 1803 { |
| 2925 | 1804 if (p[col] == c && stop) |
| 7 | 1805 break; |
| 1806 } | |
|
11018
654fc5636b37
patch 8.0.0398: illegal memory access with "t"
Christian Brabandt <cb@256bit.org>
parents:
10900
diff
changeset
|
1807 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
|
1808 && stop) |
|
11018
654fc5636b37
patch 8.0.0398: illegal memory access with "t"
Christian Brabandt <cb@256bit.org>
parents:
10900
diff
changeset
|
1809 break; |
| 2925 | 1810 stop = TRUE; |
| 7 | 1811 } |
| 1812 } | |
| 1813 else | |
| 1814 { | |
| 1815 for (;;) | |
| 1816 { | |
| 1817 if ((col += dir) < 0 || col >= len) | |
| 1818 return FAIL; | |
| 2925 | 1819 if (p[col] == c && stop) |
| 7 | 1820 break; |
| 2925 | 1821 stop = TRUE; |
| 7 | 1822 } |
| 1823 } | |
| 1824 } | |
| 1825 | |
| 1826 if (t_cmd) | |
| 1827 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1828 // backup to before the character (possibly double-byte) |
| 7 | 1829 col -= dir; |
| 1830 if (has_mbyte) | |
| 1831 { | |
| 1832 if (dir < 0) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1833 // Landed on the search char which is lastc_bytelen long |
| 6991 | 1834 col += lastc_bytelen - 1; |
| 7 | 1835 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
1836 // To previous char, which may be multi-byte. |
| 7 | 1837 col -= (*mb_head_off)(p, p + col); |
| 1838 } | |
| 1839 } | |
| 1840 curwin->w_cursor.col = col; | |
| 1841 | |
| 1842 return OK; | |
| 1843 } | |
| 1844 | |
| 1845 /* | |
| 1846 * "Other" Searches | |
| 1847 */ | |
| 1848 | |
| 1849 /* | |
| 1850 * findmatch - find the matching paren or brace | |
| 1851 * | |
| 1852 * Improvement over vi: Braces inside quotes are ignored. | |
| 1853 */ | |
| 1854 pos_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1855 findmatch(oparg_T *oap, int initc) |
| 7 | 1856 { |
| 1857 return findmatchlimit(oap, initc, 0, 0); | |
| 1858 } | |
| 1859 | |
| 1860 /* | |
| 1861 * Return TRUE if the character before "linep[col]" equals "ch". | |
| 1862 * Return FALSE if "col" is zero. | |
| 1863 * Update "*prevcol" to the column of the previous character, unless "prevcol" | |
| 1864 * is NULL. | |
| 1865 * Handles multibyte string correctly. | |
| 1866 */ | |
| 1867 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1868 check_prevcol( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1869 char_u *linep, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1870 int col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1871 int ch, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1872 int *prevcol) |
| 7 | 1873 { |
| 1874 --col; | |
| 1875 if (col > 0 && has_mbyte) | |
| 1876 col -= (*mb_head_off)(linep, linep + col); | |
| 1877 if (prevcol) | |
| 1878 *prevcol = col; | |
| 1879 return (col >= 0 && linep[col] == ch) ? TRUE : FALSE; | |
| 1880 } | |
| 1881 | |
| 6971 | 1882 /* |
| 1883 * Raw string start is found at linep[startpos.col - 1]. | |
| 1884 * Return TRUE if the matching end can be found between startpos and endpos. | |
| 1885 */ | |
| 1886 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1887 find_rawstring_end(char_u *linep, pos_T *startpos, pos_T *endpos) |
| 6971 | 1888 { |
| 1889 char_u *p; | |
| 1890 char_u *delim_copy; | |
| 1891 size_t delim_len; | |
| 1892 linenr_T lnum; | |
| 1893 int found = FALSE; | |
| 1894 | |
| 1895 for (p = linep + startpos->col + 1; *p && *p != '('; ++p) | |
| 1896 ; | |
| 1897 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
|
1898 delim_copy = vim_strnsave(linep + startpos->col + 1, (int)delim_len); |
| 6971 | 1899 if (delim_copy == NULL) |
| 1900 return FALSE; | |
| 1901 for (lnum = startpos->lnum; lnum <= endpos->lnum; ++lnum) | |
| 1902 { | |
| 1903 char_u *line = ml_get(lnum); | |
| 1904 | |
| 1905 for (p = line + (lnum == startpos->lnum | |
| 1906 ? startpos->col + 1 : 0); *p; ++p) | |
| 1907 { | |
| 1908 if (lnum == endpos->lnum && (colnr_T)(p - line) >= endpos->col) | |
| 1909 break; | |
| 1910 if (*p == ')' && p[delim_len + 1] == '"' | |
| 1911 && STRNCMP(delim_copy, p + 1, delim_len) == 0) | |
| 1912 { | |
| 1913 found = TRUE; | |
| 1914 break; | |
| 1915 } | |
| 1916 } | |
| 1917 if (found) | |
| 1918 break; | |
| 1919 } | |
| 1920 vim_free(delim_copy); | |
| 1921 return found; | |
| 1922 } | |
| 1923 | |
| 7 | 1924 /* |
|
18681
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1925 * Check matchpairs option for "*initc". |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1926 * 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
|
1927 * 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
|
1928 * 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
|
1929 */ |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1930 static void |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1931 find_mps_values( |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1932 int *initc, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1933 int *findc, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1934 int *backwards, |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1935 int switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1936 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1937 char_u *ptr; |
|
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 ptr = curbuf->b_p_mps; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1940 while (*ptr != NUL) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1941 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1942 if (has_mbyte) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1943 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1944 char_u *prev; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1945 |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1946 if (mb_ptr2char(ptr) == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1947 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1948 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1949 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1950 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1951 *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
|
1952 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1953 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1954 else |
|
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 *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
|
1957 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1958 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1959 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1960 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1961 prev = ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1962 ptr += mb_ptr2len(ptr) + 1; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1963 if (mb_ptr2char(ptr) == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1964 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1965 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1966 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1967 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1968 *initc = mb_ptr2char(prev); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1969 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1970 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1971 else |
|
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 *findc = mb_ptr2char(prev); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1974 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1975 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1976 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1977 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1978 ptr += mb_ptr2len(ptr); |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1979 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1980 else |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1981 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1982 if (*ptr == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1983 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1984 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1985 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1986 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1987 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1988 *initc = ptr[2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1989 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1990 else |
|
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 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1993 *findc = ptr[2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1994 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1995 return; |
|
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 ptr += 2; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1998 if (*ptr == *initc) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
1999 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2000 if (switchit) |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2001 { |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2002 *backwards = FALSE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2003 *findc = *initc; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2004 *initc = ptr[-2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2005 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2006 else |
|
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 *backwards = TRUE; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2009 *findc = ptr[-2]; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2010 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2011 return; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2012 } |
|
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 if (*ptr == ',') |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2016 ++ptr; |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2017 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2018 } |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2019 |
|
a13370d92f9d
patch 8.1.2332: missing file in refactoring
Bram Moolenaar <Bram@vim.org>
parents:
18677
diff
changeset
|
2020 /* |
| 7 | 2021 * findmatchlimit -- find the matching paren or brace, if it exists within |
| 6971 | 2022 * maxtravel lines of the cursor. A maxtravel of 0 means search until falling |
| 2023 * off the edge of the file. | |
| 7 | 2024 * |
| 2025 * "initc" is the character to find a match for. NUL means to find the | |
| 6971 | 2026 * character at or after the cursor. Special values: |
| 2027 * '*' look for C-style comment / * | |
| 2028 * '/' look for C-style comment / *, ignoring comment-end | |
| 2029 * '#' look for preprocessor directives | |
| 2030 * 'R' look for raw string start: R"delim(text)delim" (only backwards) | |
| 7 | 2031 * |
| 2032 * flags: FM_BACKWARD search backwards (when initc is '/', '*' or '#') | |
| 2033 * FM_FORWARD search forwards (when initc is '/', '*' or '#') | |
| 2034 * FM_BLOCKSTOP stop at start/end of block ({ or } in column 0) | |
| 2035 * FM_SKIPCOMM skip comments (not implemented yet!) | |
| 523 | 2036 * |
| 6971 | 2037 * "oap" is only used to set oap->motion_type for a linewise motion, it can be |
| 523 | 2038 * NULL |
| 7 | 2039 */ |
| 2040 | |
| 2041 pos_T * | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2042 findmatchlimit( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2043 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2044 int initc, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2045 int flags, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2046 int maxtravel) |
| 7 | 2047 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2048 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
|
2049 int findc = 0; // matching brace |
| 7 | 2050 int c; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2051 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
|
2052 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
|
2053 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
|
2054 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
|
2055 char_u *linep; // pointer to current line |
| 7 | 2056 char_u *ptr; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2057 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
|
2058 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
|
2059 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
|
2060 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
|
2061 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
|
2062 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
|
2063 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
|
2064 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
|
2065 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
|
2066 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
|
2067 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
|
2068 int dir; // Direction to search |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2069 int comment_col = MAXCOL; // start of / / comment |
| 14 | 2070 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2071 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
|
2072 int lisp = curbuf->b_p_lisp; // engage Lisp-specific hacks ;) |
| 14 | 2073 #endif |
| 7 | 2074 |
| 2075 pos = curwin->w_cursor; | |
| 5304 | 2076 pos.coladd = 0; |
| 7 | 2077 linep = ml_get(pos.lnum); |
| 2078 | |
| 2079 cpo_match = (vim_strchr(p_cpo, CPO_MATCH) != NULL); | |
| 2080 cpo_bsl = (vim_strchr(p_cpo, CPO_MATCHBSL) != NULL); | |
| 2081 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2082 // Direction to search when initc is '/', '*' or '#' |
| 7 | 2083 if (flags & FM_BACKWARD) |
| 2084 dir = BACKWARD; | |
| 2085 else if (flags & FM_FORWARD) | |
| 2086 dir = FORWARD; | |
| 2087 else | |
| 2088 dir = 0; | |
| 2089 | |
| 2090 /* | |
| 2091 * if initc given, look in the table for the matching character | |
| 2092 * '/' and '*' are special cases: look for start or end of comment. | |
| 2093 * When '/' is used, we ignore running backwards into an star-slash, for | |
| 2094 * "[*" command, we just want to find any comment. | |
| 2095 */ | |
| 6971 | 2096 if (initc == '/' || initc == '*' || initc == 'R') |
| 7 | 2097 { |
| 2098 comment_dir = dir; | |
| 2099 if (initc == '/') | |
| 2100 ignore_cend = TRUE; | |
| 2101 backwards = (dir == FORWARD) ? FALSE : TRUE; | |
| 6971 | 2102 raw_string = (initc == 'R'); |
| 7 | 2103 initc = NUL; |
| 2104 } | |
| 2105 else if (initc != '#' && initc != NUL) | |
| 2106 { | |
| 4029 | 2107 find_mps_values(&initc, &findc, &backwards, TRUE); |
| 2108 if (findc == NUL) | |
| 7 | 2109 return NULL; |
| 2110 } | |
| 2111 else | |
| 2112 { | |
| 6971 | 2113 /* |
| 2114 * Either initc is '#', or no initc was given and we need to look | |
| 2115 * under the cursor. | |
| 2116 */ | |
| 7 | 2117 if (initc == '#') |
| 2118 { | |
| 2119 hash_dir = dir; | |
| 2120 } | |
| 2121 else | |
| 2122 { | |
| 2123 /* | |
| 2124 * initc was not given, must look for something to match under | |
| 2125 * or near the cursor. | |
| 2126 * Only check for special things when 'cpo' doesn't have '%'. | |
| 2127 */ | |
| 2128 if (!cpo_match) | |
| 2129 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2130 // Are we before or at #if, #else etc.? |
| 7 | 2131 ptr = skipwhite(linep); |
| 2132 if (*ptr == '#' && pos.col <= (colnr_T)(ptr - linep)) | |
| 2133 { | |
| 2134 ptr = skipwhite(ptr + 1); | |
| 2135 if ( STRNCMP(ptr, "if", 2) == 0 | |
| 2136 || STRNCMP(ptr, "endif", 5) == 0 | |
| 2137 || STRNCMP(ptr, "el", 2) == 0) | |
| 2138 hash_dir = 1; | |
| 2139 } | |
| 2140 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2141 // Are we on a comment? |
| 7 | 2142 else if (linep[pos.col] == '/') |
| 2143 { | |
| 2144 if (linep[pos.col + 1] == '*') | |
| 2145 { | |
| 2146 comment_dir = FORWARD; | |
| 2147 backwards = FALSE; | |
| 2148 pos.col++; | |
| 2149 } | |
| 2150 else if (pos.col > 0 && linep[pos.col - 1] == '*') | |
| 2151 { | |
| 2152 comment_dir = BACKWARD; | |
| 2153 backwards = TRUE; | |
| 2154 pos.col--; | |
| 2155 } | |
| 2156 } | |
| 2157 else if (linep[pos.col] == '*') | |
| 2158 { | |
| 2159 if (linep[pos.col + 1] == '/') | |
| 2160 { | |
| 2161 comment_dir = BACKWARD; | |
| 2162 backwards = TRUE; | |
| 2163 } | |
| 2164 else if (pos.col > 0 && linep[pos.col - 1] == '/') | |
| 2165 { | |
| 2166 comment_dir = FORWARD; | |
| 2167 backwards = FALSE; | |
| 2168 } | |
| 2169 } | |
| 2170 } | |
| 2171 | |
| 2172 /* | |
| 2173 * If we are not on a comment or the # at the start of a line, then | |
| 2174 * look for brace anywhere on this line after the cursor. | |
| 2175 */ | |
| 2176 if (!hash_dir && !comment_dir) | |
| 2177 { | |
| 2178 /* | |
| 2179 * Find the brace under or after the cursor. | |
| 2180 * If beyond the end of the line, use the last character in | |
| 2181 * the line. | |
| 2182 */ | |
| 2183 if (linep[pos.col] == NUL && pos.col) | |
| 2184 --pos.col; | |
| 2185 for (;;) | |
| 2186 { | |
| 4029 | 2187 initc = PTR2CHAR(linep + pos.col); |
| 7 | 2188 if (initc == NUL) |
| 2189 break; | |
| 2190 | |
| 4029 | 2191 find_mps_values(&initc, &findc, &backwards, FALSE); |
| 7 | 2192 if (findc) |
| 2193 break; | |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2194 pos.col += mb_ptr2len(linep + pos.col); |
| 7 | 2195 } |
| 2196 if (!findc) | |
| 2197 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2198 // no brace in the line, maybe use " #if" then |
| 7 | 2199 if (!cpo_match && *skipwhite(linep) == '#') |
| 2200 hash_dir = 1; | |
| 2201 else | |
| 2202 return NULL; | |
| 2203 } | |
| 2204 else if (!cpo_bsl) | |
| 2205 { | |
| 2206 int col, bslcnt = 0; | |
| 2207 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2208 // 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
|
2209 // backslashes. |
| 7 | 2210 for (col = pos.col; check_prevcol(linep, col, '\\', &col);) |
| 2211 bslcnt++; | |
| 2212 match_escaped = (bslcnt & 1); | |
| 2213 } | |
| 2214 } | |
| 2215 } | |
| 2216 if (hash_dir) | |
| 2217 { | |
| 2218 /* | |
| 2219 * Look for matching #if, #else, #elif, or #endif | |
| 2220 */ | |
| 2221 if (oap != NULL) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2222 oap->motion_type = MLINE; // Linewise for this case only |
| 7 | 2223 if (initc != '#') |
| 2224 { | |
| 2225 ptr = skipwhite(skipwhite(linep) + 1); | |
| 2226 if (STRNCMP(ptr, "if", 2) == 0 || STRNCMP(ptr, "el", 2) == 0) | |
| 2227 hash_dir = 1; | |
| 2228 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2229 hash_dir = -1; | |
| 2230 else | |
| 2231 return NULL; | |
| 2232 } | |
| 2233 pos.col = 0; | |
| 2234 while (!got_int) | |
| 2235 { | |
| 2236 if (hash_dir > 0) | |
| 2237 { | |
| 2238 if (pos.lnum == curbuf->b_ml.ml_line_count) | |
| 2239 break; | |
| 2240 } | |
| 2241 else if (pos.lnum == 1) | |
| 2242 break; | |
| 2243 pos.lnum += hash_dir; | |
| 2244 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
|
2245 line_breakcheck(); // check for CTRL-C typed |
| 7 | 2246 ptr = skipwhite(linep); |
| 2247 if (*ptr != '#') | |
| 2248 continue; | |
| 2249 pos.col = (colnr_T) (ptr - linep); | |
| 2250 ptr = skipwhite(ptr + 1); | |
| 2251 if (hash_dir > 0) | |
| 2252 { | |
| 2253 if (STRNCMP(ptr, "if", 2) == 0) | |
| 2254 count++; | |
| 2255 else if (STRNCMP(ptr, "el", 2) == 0) | |
| 2256 { | |
| 2257 if (count == 0) | |
| 2258 return &pos; | |
| 2259 } | |
| 2260 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2261 { | |
| 2262 if (count == 0) | |
| 2263 return &pos; | |
| 2264 count--; | |
| 2265 } | |
| 2266 } | |
| 2267 else | |
| 2268 { | |
| 2269 if (STRNCMP(ptr, "if", 2) == 0) | |
| 2270 { | |
| 2271 if (count == 0) | |
| 2272 return &pos; | |
| 2273 count--; | |
| 2274 } | |
| 2275 else if (initc == '#' && STRNCMP(ptr, "el", 2) == 0) | |
| 2276 { | |
| 2277 if (count == 0) | |
| 2278 return &pos; | |
| 2279 } | |
| 2280 else if (STRNCMP(ptr, "endif", 5) == 0) | |
| 2281 count++; | |
| 2282 } | |
| 2283 } | |
| 2284 return NULL; | |
| 2285 } | |
| 2286 } | |
| 2287 | |
| 2288 #ifdef FEAT_RIGHTLEFT | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2289 // 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
|
2290 // paren/brace in the other direction. |
| 7 | 2291 if (curwin->w_p_rl && vim_strchr((char_u *)"()[]{}<>", initc) != NULL) |
| 2292 backwards = !backwards; | |
| 2293 #endif | |
| 2294 | |
| 2295 do_quotes = -1; | |
| 2296 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
|
2297 CLEAR_POS(&match_pos); |
| 699 | 2298 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2299 // backward search: Check if this line contains a single-line comment |
| 14 | 2300 if ((backwards && comment_dir) |
| 2301 #ifdef FEAT_LISP | |
| 2302 || lisp | |
| 2303 #endif | |
| 2304 ) | |
| 7 | 2305 comment_col = check_linecomment(linep); |
| 14 | 2306 #ifdef FEAT_LISP |
| 2307 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
|
2308 lispcomm = TRUE; // find match inside this comment |
| 14 | 2309 #endif |
| 7 | 2310 while (!got_int) |
| 2311 { | |
| 2312 /* | |
| 2313 * Go to the next position, forward or backward. We could use | |
| 2314 * inc() and dec() here, but that is much slower | |
| 2315 */ | |
| 2316 if (backwards) | |
| 2317 { | |
| 14 | 2318 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2319 // char to match is inside of comment, don't search outside |
| 14 | 2320 if (lispcomm && pos.col < (colnr_T)comment_col) |
| 2321 break; | |
| 2322 #endif | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2323 if (pos.col == 0) // at start of line, go to prev. one |
| 7 | 2324 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2325 if (pos.lnum == 1) // start of file |
| 7 | 2326 break; |
| 2327 --pos.lnum; | |
| 2328 | |
| 829 | 2329 if (maxtravel > 0 && ++traveled > maxtravel) |
| 7 | 2330 break; |
| 2331 | |
| 2332 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
|
2333 pos.col = (colnr_T)STRLEN(linep); // pos.col on trailing NUL |
| 7 | 2334 do_quotes = -1; |
| 2335 line_breakcheck(); | |
| 2336 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2337 // Check if this line contains a single-line comment |
| 14 | 2338 if (comment_dir |
| 2339 #ifdef FEAT_LISP | |
| 2340 || lisp | |
| 2341 #endif | |
| 2342 ) | |
| 7 | 2343 comment_col = check_linecomment(linep); |
| 14 | 2344 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2345 // skip comment |
| 14 | 2346 if (lisp && comment_col != MAXCOL) |
| 2347 pos.col = comment_col; | |
| 2348 #endif | |
| 7 | 2349 } |
| 2350 else | |
| 2351 { | |
| 2352 --pos.col; | |
| 2353 if (has_mbyte) | |
| 2354 pos.col -= (*mb_head_off)(linep, linep + pos.col); | |
| 2355 } | |
| 2356 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2357 else // forward search |
| 7 | 2358 { |
| 14 | 2359 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
|
2360 // at end of line, go to next one |
| 14 | 2361 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2362 // don't search for match in comment |
| 14 | 2363 || (lisp && comment_col != MAXCOL |
| 2364 && pos.col == (colnr_T)comment_col) | |
| 2365 #endif | |
| 2366 ) | |
| 7 | 2367 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2368 if (pos.lnum == curbuf->b_ml.ml_line_count // end of file |
| 14 | 2369 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2370 // 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
|
2371 // don't search for match in code |
| 14 | 2372 || lispcomm |
| 2373 #endif | |
| 2374 ) | |
| 7 | 2375 break; |
| 2376 ++pos.lnum; | |
| 2377 | |
| 2378 if (maxtravel && traveled++ > maxtravel) | |
| 2379 break; | |
| 2380 | |
| 2381 linep = ml_get(pos.lnum); | |
| 2382 pos.col = 0; | |
| 2383 do_quotes = -1; | |
| 2384 line_breakcheck(); | |
| 14 | 2385 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2386 if (lisp) // find comment pos in new line |
| 14 | 2387 comment_col = check_linecomment(linep); |
| 2388 #endif | |
| 7 | 2389 } |
| 2390 else | |
| 2391 { | |
| 2392 if (has_mbyte) | |
| 474 | 2393 pos.col += (*mb_ptr2len)(linep + pos.col); |
| 7 | 2394 else |
| 2395 ++pos.col; | |
| 2396 } | |
| 2397 } | |
| 2398 | |
| 2399 /* | |
| 2400 * If FM_BLOCKSTOP given, stop at a '{' or '}' in column 0. | |
| 2401 */ | |
| 2402 if (pos.col == 0 && (flags & FM_BLOCKSTOP) && | |
| 2403 (linep[0] == '{' || linep[0] == '}')) | |
| 2404 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2405 if (linep[0] == findc && count == 0) // match! |
| 7 | 2406 return &pos; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2407 break; // out of scope |
| 7 | 2408 } |
| 2409 | |
| 2410 if (comment_dir) | |
| 2411 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2412 // 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
|
2413 // TODO: ignore comment brackets inside strings |
| 7 | 2414 if (comment_dir == FORWARD) |
| 2415 { | |
| 2416 if (linep[pos.col] == '*' && linep[pos.col + 1] == '/') | |
| 2417 { | |
| 2418 pos.col++; | |
| 2419 return &pos; | |
| 2420 } | |
| 2421 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2422 else // Searching backwards |
| 7 | 2423 { |
| 2424 /* | |
| 2425 * 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
|
2426 * with / * /. Ignore a / * after / / and after *. |
| 7 | 2427 */ |
| 2428 if (pos.col == 0) | |
| 2429 continue; | |
| 6971 | 2430 else if (raw_string) |
| 2431 { | |
| 2432 if (linep[pos.col - 1] == 'R' | |
| 2433 && linep[pos.col] == '"' | |
| 2434 && vim_strchr(linep + pos.col + 1, '(') != NULL) | |
| 2435 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2436 // 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
|
2437 // 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
|
2438 // 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
|
2439 // raw string start. |
| 6971 | 2440 if (!find_rawstring_end(linep, &pos, |
| 2441 count > 0 ? &match_pos : &curwin->w_cursor)) | |
| 2442 { | |
| 2443 count++; | |
| 2444 match_pos = pos; | |
| 2445 match_pos.col--; | |
| 2446 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2447 linep = ml_get(pos.lnum); // may have been released |
| 6971 | 2448 } |
| 2449 } | |
| 7 | 2450 else if ( linep[pos.col - 1] == '/' |
| 2451 && 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
|
2452 && (pos.col == 1 || linep[pos.col - 2] != '*') |
| 7 | 2453 && (int)pos.col < comment_col) |
| 2454 { | |
| 2455 count++; | |
| 2456 match_pos = pos; | |
| 2457 match_pos.col--; | |
| 2458 } | |
| 2459 else if (linep[pos.col - 1] == '*' && linep[pos.col] == '/') | |
| 2460 { | |
| 2461 if (count > 0) | |
| 2462 pos = match_pos; | |
| 2463 else if (pos.col > 1 && linep[pos.col - 2] == '/' | |
| 2464 && (int)pos.col <= comment_col) | |
| 2465 pos.col -= 2; | |
| 2466 else if (ignore_cend) | |
| 2467 continue; | |
| 2468 else | |
| 2469 return NULL; | |
| 2470 return &pos; | |
| 2471 } | |
| 2472 } | |
| 2473 continue; | |
| 2474 } | |
| 2475 | |
| 2476 /* | |
| 2477 * If smart matching ('cpoptions' does not contain '%'), braces inside | |
| 2478 * of quotes are ignored, but only if there is an even number of | |
| 2479 * quotes in the line. | |
| 2480 */ | |
| 2481 if (cpo_match) | |
| 2482 do_quotes = 0; | |
| 2483 else if (do_quotes == -1) | |
| 2484 { | |
| 2485 /* | |
| 2486 * Count the number of quotes in the line, skipping \" and '"'. | |
| 2487 * Watch out for "\\". | |
| 2488 */ | |
| 2489 at_start = do_quotes; | |
| 2490 for (ptr = linep; *ptr; ++ptr) | |
| 2491 { | |
| 2492 if (ptr == linep + pos.col + backwards) | |
| 2493 at_start = (do_quotes & 1); | |
| 2494 if (*ptr == '"' | |
| 2495 && (ptr == linep || ptr[-1] != '\'' || ptr[1] != '\'')) | |
| 2496 ++do_quotes; | |
| 2497 if (*ptr == '\\' && ptr[1] != NUL) | |
| 2498 ++ptr; | |
| 2499 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2500 do_quotes &= 1; // result is 1 with even number of quotes |
| 7 | 2501 |
| 2502 /* | |
| 2503 * If we find an uneven count, check current line and previous | |
| 2504 * one for a '\' at the end. | |
| 2505 */ | |
| 2506 if (!do_quotes) | |
| 2507 { | |
| 2508 inquote = FALSE; | |
| 2509 if (ptr[-1] == '\\') | |
| 2510 { | |
| 2511 do_quotes = 1; | |
| 2512 if (start_in_quotes == MAYBE) | |
| 2513 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2514 // Do we need to use at_start here? |
| 7 | 2515 inquote = TRUE; |
| 2516 start_in_quotes = TRUE; | |
| 2517 } | |
| 2518 else if (backwards) | |
| 2519 inquote = TRUE; | |
| 2520 } | |
| 2521 if (pos.lnum > 1) | |
| 2522 { | |
| 2523 ptr = ml_get(pos.lnum - 1); | |
| 2524 if (*ptr && *(ptr + STRLEN(ptr) - 1) == '\\') | |
| 2525 { | |
| 2526 do_quotes = 1; | |
| 2527 if (start_in_quotes == MAYBE) | |
| 2528 { | |
| 2529 inquote = at_start; | |
| 2530 if (inquote) | |
| 2531 start_in_quotes = TRUE; | |
| 2532 } | |
| 2533 else if (!backwards) | |
| 2534 inquote = TRUE; | |
| 2535 } | |
| 1310 | 2536 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2537 // ml_get() only keeps one line, need to get linep again |
| 1310 | 2538 linep = ml_get(pos.lnum); |
| 7 | 2539 } |
| 2540 } | |
| 2541 } | |
| 2542 if (start_in_quotes == MAYBE) | |
| 2543 start_in_quotes = FALSE; | |
| 2544 | |
| 2545 /* | |
| 2546 * If 'smartmatch' is set: | |
| 2547 * Things inside quotes are ignored by setting 'inquote'. If we | |
| 2548 * find a quote without a preceding '\' invert 'inquote'. At the | |
| 2549 * end of a line not ending in '\' we reset 'inquote'. | |
| 2550 * | |
| 2551 * In lines with an uneven number of quotes (without preceding '\') | |
| 2552 * we do not know which part to ignore. Therefore we only set | |
| 2553 * inquote if the number of quotes in a line is even, unless this | |
| 2554 * line or the previous one ends in a '\'. Complicated, isn't it? | |
| 2555 */ | |
| 4029 | 2556 c = PTR2CHAR(linep + pos.col); |
| 2557 switch (c) | |
| 7 | 2558 { |
| 2559 case NUL: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2560 // at end of line without trailing backslash, reset inquote |
| 7 | 2561 if (pos.col == 0 || linep[pos.col - 1] != '\\') |
| 2562 { | |
| 2563 inquote = FALSE; | |
| 2564 start_in_quotes = FALSE; | |
| 2565 } | |
| 2566 break; | |
| 2567 | |
| 2568 case '"': | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2569 // 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
|
2570 // ignored |
| 7 | 2571 if (do_quotes) |
| 2572 { | |
| 2573 int col; | |
| 2574 | |
| 2575 for (col = pos.col - 1; col >= 0; --col) | |
| 2576 if (linep[col] != '\\') | |
| 2577 break; | |
| 2578 if ((((int)pos.col - 1 - col) & 1) == 0) | |
| 2579 { | |
| 2580 inquote = !inquote; | |
| 2581 start_in_quotes = FALSE; | |
| 2582 } | |
| 2583 } | |
| 2584 break; | |
| 2585 | |
| 2586 /* | |
| 2587 * If smart matching ('cpoptions' does not contain '%'): | |
| 2588 * Skip things in single quotes: 'x' or '\x'. Be careful for single | |
| 2589 * single quotes, eg jon's. Things like '\233' or '\x3f' are not | |
| 2590 * skipped, there is never a brace in them. | |
| 2591 * Ignore this when finding matches for `'. | |
| 2592 */ | |
| 2593 case '\'': | |
| 2594 if (!cpo_match && initc != '\'' && findc != '\'') | |
| 2595 { | |
| 2596 if (backwards) | |
| 2597 { | |
| 2598 if (pos.col > 1) | |
| 2599 { | |
| 2600 if (linep[pos.col - 2] == '\'') | |
| 2601 { | |
| 2602 pos.col -= 2; | |
| 2603 break; | |
| 2604 } | |
| 2605 else if (linep[pos.col - 2] == '\\' && | |
| 2606 pos.col > 2 && linep[pos.col - 3] == '\'') | |
| 2607 { | |
| 2608 pos.col -= 3; | |
| 2609 break; | |
| 2610 } | |
| 2611 } | |
| 2612 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2613 else if (linep[pos.col + 1]) // forward search |
| 7 | 2614 { |
| 2615 if (linep[pos.col + 1] == '\\' && | |
| 2616 linep[pos.col + 2] && linep[pos.col + 3] == '\'') | |
| 2617 { | |
| 2618 pos.col += 3; | |
| 2619 break; | |
| 2620 } | |
| 2621 else if (linep[pos.col + 2] == '\'') | |
| 2622 { | |
| 2623 pos.col += 2; | |
| 2624 break; | |
| 2625 } | |
| 2626 } | |
| 2627 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2628 // FALLTHROUGH |
| 7 | 2629 |
| 2630 default: | |
| 2631 #ifdef FEAT_LISP | |
| 14 | 2632 /* |
| 2633 * For Lisp skip over backslashed (), {} and []. | |
| 2634 * (actually, we skip #\( et al) | |
| 2635 */ | |
| 7 | 2636 if (curbuf->b_p_lisp |
| 2637 && vim_strchr((char_u *)"(){}[]", c) != NULL | |
| 14 | 2638 && pos.col > 1 |
| 2639 && check_prevcol(linep, pos.col, '\\', NULL) | |
| 2640 && check_prevcol(linep, pos.col - 1, '#', NULL)) | |
| 7 | 2641 break; |
| 2642 #endif | |
| 2643 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2644 // 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
|
2645 // quotes when the start is also inside of quotes. |
| 7 | 2646 if ((!inquote || start_in_quotes == TRUE) |
| 2647 && (c == initc || c == findc)) | |
| 2648 { | |
| 2649 int col, bslcnt = 0; | |
| 2650 | |
| 2651 if (!cpo_bsl) | |
| 2652 { | |
| 2653 for (col = pos.col; check_prevcol(linep, col, '\\', &col);) | |
| 2654 bslcnt++; | |
| 2655 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2656 // 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
|
2657 // is what we expect. |
| 7 | 2658 if (cpo_bsl || (bslcnt & 1) == match_escaped) |
| 2659 { | |
| 2660 if (c == initc) | |
| 2661 count++; | |
| 2662 else | |
| 2663 { | |
| 2664 if (count == 0) | |
| 2665 return &pos; | |
| 2666 count--; | |
| 2667 } | |
| 2668 } | |
| 2669 } | |
| 2670 } | |
| 2671 } | |
| 2672 | |
| 2673 if (comment_dir == BACKWARD && count > 0) | |
| 2674 { | |
| 2675 pos = match_pos; | |
| 2676 return &pos; | |
| 2677 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2678 return (pos_T *)NULL; // never found it |
| 7 | 2679 } |
| 2680 | |
| 2681 /* | |
| 2682 * Check if line[] contains a / / comment. | |
| 2683 * Return MAXCOL if not, otherwise return the column. | |
| 2684 * TODO: skip strings. | |
| 2685 */ | |
| 2686 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2687 check_linecomment(char_u *line) |
| 7 | 2688 { |
| 2689 char_u *p; | |
| 2690 | |
| 2691 p = line; | |
| 14 | 2692 #ifdef FEAT_LISP |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2693 // skip Lispish one-line comments |
| 14 | 2694 if (curbuf->b_p_lisp) |
| 2695 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2696 if (vim_strchr(p, ';') != NULL) // there may be comments |
| 14 | 2697 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2698 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
|
2699 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2700 p = line; // scan from start |
| 333 | 2701 while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL) |
| 14 | 2702 { |
| 2703 if (*p == '"') | |
| 2704 { | |
| 3263 | 2705 if (in_str) |
| 14 | 2706 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2707 if (*(p - 1) != '\\') // skip escaped quote |
| 3263 | 2708 in_str = FALSE; |
| 14 | 2709 } |
| 2710 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
|
2711 // skip #\" form |
| 14 | 2712 && *(p - 1) != '\\' && *(p - 2) != '#')) |
| 3263 | 2713 in_str = TRUE; |
| 14 | 2714 } |
| 3263 | 2715 else if (!in_str && ((p - line) < 2 |
| 14 | 2716 || (*(p - 1) != '\\' && *(p - 2) != '#'))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2717 break; // found! |
| 14 | 2718 ++p; |
| 2719 } | |
| 2720 } | |
| 2721 else | |
| 2722 p = NULL; | |
| 2723 } | |
| 2724 else | |
| 2725 #endif | |
| 7 | 2726 while ((p = vim_strchr(p, '/')) != NULL) |
| 2727 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2728 // 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
|
2729 // because * / / * is an end and start of a C comment |
| 1463 | 2730 if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*')) |
| 7 | 2731 break; |
| 2732 ++p; | |
| 2733 } | |
| 2734 | |
| 2735 if (p == NULL) | |
| 2736 return MAXCOL; | |
| 2737 return (int)(p - line); | |
| 2738 } | |
| 2739 | |
| 2740 /* | |
| 2741 * Move cursor briefly to character matching the one under the cursor. | |
| 2742 * Used for Insert mode and "r" command. | |
| 2743 * Show the match only if it is visible on the screen. | |
| 2744 * If there isn't a match, then beep. | |
| 2745 */ | |
| 2746 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2747 showmatch( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2748 int c) // char to show match for |
| 7 | 2749 { |
| 2750 pos_T *lpos, save_cursor; | |
| 2751 pos_T mpos; | |
| 2752 colnr_T vcol; | |
| 2753 long save_so; | |
| 2754 long save_siso; | |
| 2755 #ifdef CURSOR_SHAPE | |
| 2756 int save_state; | |
| 2757 #endif | |
| 2758 colnr_T save_dollar_vcol; | |
| 2759 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
|
2760 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
|
2761 long *siso = curwin->w_p_siso >= 0 ? &curwin->w_p_siso : &p_siso; |
| 7 | 2762 |
| 2763 /* | |
| 2764 * Only show match for chars in the 'matchpairs' option. | |
| 2765 */ | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2766 // 'matchpairs' is "x:y,x:y" |
| 4029 | 2767 for (p = curbuf->b_p_mps; *p != NUL; ++p) |
| 7 | 2768 { |
| 2769 #ifdef FEAT_RIGHTLEFT | |
| 4153 | 2770 if (PTR2CHAR(p) == c && (curwin->w_p_rl ^ p_ri)) |
| 2771 break; | |
| 7 | 2772 #endif |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2773 p += mb_ptr2len(p) + 1; |
| 4029 | 2774 if (PTR2CHAR(p) == c |
| 7 | 2775 #ifdef FEAT_RIGHTLEFT |
| 2776 && !(curwin->w_p_rl ^ p_ri) | |
| 2777 #endif | |
| 2778 ) | |
| 2779 break; | |
|
18251
c8a53c0daeed
patch 8.1.2120: some MB_ macros are more complicated than necessary
Bram Moolenaar <Bram@vim.org>
parents:
18203
diff
changeset
|
2780 p += mb_ptr2len(p); |
| 4029 | 2781 if (*p == NUL) |
| 7 | 2782 return; |
| 2783 } | |
| 2784 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2785 if ((lpos = findmatch(NULL, NUL)) == NULL) // no match, so beep |
| 6949 | 2786 vim_beep(BO_MATCH); |
| 4153 | 2787 else if (lpos->lnum >= curwin->w_topline && lpos->lnum < curwin->w_botline) |
| 7 | 2788 { |
| 2789 if (!curwin->w_p_wrap) | |
| 2790 getvcol(curwin, lpos, NULL, &vcol, NULL); | |
| 2791 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
|
2792 && vcol < curwin->w_leftcol + curwin->w_width)) |
| 7 | 2793 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2794 mpos = *lpos; // save the pos, update_screen() may change it |
| 7 | 2795 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
|
2796 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
|
2797 save_siso = *siso; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2798 // 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
|
2799 // stop displaying the "$". |
| 3318 | 2800 if (dollar_vcol >= 0 && dollar_vcol == curwin->w_virtcol) |
| 2801 dollar_vcol = -1; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2802 ++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
|
2803 update_screen(VALID); // show the new char first |
| 7 | 2804 |
| 2805 save_dollar_vcol = dollar_vcol; | |
| 2806 #ifdef CURSOR_SHAPE | |
| 2807 save_state = State; | |
| 2808 State = SHOWMATCH; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2809 ui_cursor_shape(); // may show different cursor shape |
| 7 | 2810 #endif |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2811 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
|
2812 *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
|
2813 *siso = 0; // don't use 'sidescrolloff' here |
| 7 | 2814 showruler(FALSE); |
| 2815 setcursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2816 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
|
2817 out_flush_cursor(TRUE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
12855
diff
changeset
|
2818 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2819 // 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
|
2820 // 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
|
2821 // and has a higher column number. |
| 7 | 2822 dollar_vcol = save_dollar_vcol; |
| 2823 | |
| 2824 /* | |
| 2825 * brief pause, unless 'm' is present in 'cpo' and a character is | |
| 2826 * available. | |
| 2827 */ | |
| 2828 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
|
2829 ui_delay(p_mat * 100L + 8, TRUE); |
| 7 | 2830 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
|
2831 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
|
2832 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
|
2833 *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
|
2834 *siso = save_siso; |
| 7 | 2835 #ifdef CURSOR_SHAPE |
| 2836 State = save_state; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2837 ui_cursor_shape(); // may show different cursor shape |
| 7 | 2838 #endif |
| 2839 } | |
| 2840 } | |
| 2841 } | |
| 2842 | |
| 2843 /* | |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2844 * 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
|
2845 * 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
|
2846 * 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
|
2847 * 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
|
2848 * text object. |
| 7 | 2849 */ |
| 2850 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2851 findsent(int dir, long count) |
| 7 | 2852 { |
| 2853 pos_T pos, tpos; | |
| 2854 int c; | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7358
diff
changeset
|
2855 int (*func)(pos_T *); |
| 7 | 2856 int startlnum; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2857 int noskip = FALSE; // do not skip blanks |
| 7 | 2858 int cpo_J; |
| 45 | 2859 int found_dot; |
| 7 | 2860 |
| 2861 pos = curwin->w_cursor; | |
| 2862 if (dir == FORWARD) | |
| 2863 func = incl; | |
| 2864 else | |
| 2865 func = decl; | |
| 2866 | |
| 2867 while (count--) | |
| 2868 { | |
| 2869 /* | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18681
diff
changeset
|
2870 * if on an empty line, skip up to a non-empty line |
| 7 | 2871 */ |
| 2872 if (gchar_pos(&pos) == NUL) | |
| 2873 { | |
| 2874 do | |
| 2875 if ((*func)(&pos) == -1) | |
| 2876 break; | |
| 2877 while (gchar_pos(&pos) == NUL); | |
| 2878 if (dir == FORWARD) | |
| 2879 goto found; | |
| 2880 } | |
| 2881 /* | |
| 2882 * if on the start of a paragraph or a section and searching forward, | |
| 2883 * go to the next line | |
| 2884 */ | |
| 2885 else if (dir == FORWARD && pos.col == 0 && | |
| 2886 startPS(pos.lnum, NUL, FALSE)) | |
| 2887 { | |
| 2888 if (pos.lnum == curbuf->b_ml.ml_line_count) | |
| 2889 return FAIL; | |
| 2890 ++pos.lnum; | |
| 2891 goto found; | |
| 2892 } | |
| 2893 else if (dir == BACKWARD) | |
| 2894 decl(&pos); | |
| 2895 | |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2896 // go back to the previous non-white non-punctuation character |
| 45 | 2897 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
|
2898 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
|
2899 || vim_strchr((char_u *)".!?)]\"'", c) != NULL) |
| 7 | 2900 { |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2901 tpos = pos; |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2902 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
|
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 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2905 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
|
2906 break; |
|
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) |
| 45 | 2908 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
|
2909 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2910 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
|
2911 && vim_strchr((char_u *) ".!?)]\"'", gchar_pos(&tpos)) == NULL) |
| 7 | 2912 break; |
|
14131
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2913 |
|
ec85acd49b8e
patch 8.1.0083: "is" and "as" have trouble with quoted punctuation
Christian Brabandt <cb@256bit.org>
parents:
14000
diff
changeset
|
2914 decl(&pos); |
| 7 | 2915 } |
| 2916 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2917 // remember the line where the search started |
| 7 | 2918 startlnum = pos.lnum; |
| 2919 cpo_J = vim_strchr(p_cpo, CPO_ENDOFSENT) != NULL; | |
| 2920 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2921 for (;;) // find end of sentence |
| 7 | 2922 { |
| 2923 c = gchar_pos(&pos); | |
| 2924 if (c == NUL || (pos.col == 0 && startPS(pos.lnum, NUL, FALSE))) | |
| 2925 { | |
| 2926 if (dir == BACKWARD && pos.lnum != startlnum) | |
| 2927 ++pos.lnum; | |
| 2928 break; | |
| 2929 } | |
| 2930 if (c == '.' || c == '!' || c == '?') | |
| 2931 { | |
| 2932 tpos = pos; | |
| 2933 do | |
| 2934 if ((c = inc(&tpos)) == -1) | |
| 2935 break; | |
| 2936 while (vim_strchr((char_u *)")]\"'", c = gchar_pos(&tpos)) | |
| 2937 != NULL); | |
| 2938 if (c == -1 || (!cpo_J && (c == ' ' || c == '\t')) || c == NUL | |
| 2939 || (cpo_J && (c == ' ' && inc(&tpos) >= 0 | |
| 2940 && gchar_pos(&tpos) == ' '))) | |
| 2941 { | |
| 2942 pos = tpos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2943 if (gchar_pos(&pos) == NUL) // skip NUL at EOL |
| 7 | 2944 inc(&pos); |
| 2945 break; | |
| 2946 } | |
| 2947 } | |
| 2948 if ((*func)(&pos) == -1) | |
| 2949 { | |
| 2950 if (count) | |
| 2951 return FAIL; | |
| 2952 noskip = TRUE; | |
| 2953 break; | |
| 2954 } | |
| 2955 } | |
| 2956 found: | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2957 // skip white space |
| 7 | 2958 while (!noskip && ((c = gchar_pos(&pos)) == ' ' || c == '\t')) |
| 2959 if (incl(&pos) == -1) | |
| 2960 break; | |
| 2961 } | |
| 2962 | |
| 2963 setpcmark(); | |
| 2964 curwin->w_cursor = pos; | |
| 2965 return OK; | |
| 2966 } | |
| 2967 | |
| 2968 /* | |
| 164 | 2969 * Find the next paragraph or section in direction 'dir'. |
| 7 | 2970 * Paragraphs are currently supposed to be separated by empty lines. |
| 164 | 2971 * If 'what' is NUL we go to the next paragraph. |
| 7 | 2972 * If 'what' is '{' or '}' we go to the next section. |
| 2973 * If 'both' is TRUE also stop at '}'. | |
| 164 | 2974 * Return TRUE if the next paragraph or section was found. |
| 7 | 2975 */ |
| 2976 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2977 findpar( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2978 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
|
2979 int dir, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2980 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 int what, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2982 int both) |
| 7 | 2983 { |
| 2984 linenr_T curr; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2985 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
|
2986 int first; // TRUE on first line |
| 164 | 2987 int posix = (vim_strchr(p_cpo, CPO_PARA) != NULL); |
| 7 | 2988 #ifdef FEAT_FOLDING |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
2989 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
|
2990 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
|
2991 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
|
2992 // iteration |
| 7 | 2993 #endif |
| 2994 | |
| 2995 curr = curwin->w_cursor.lnum; | |
| 2996 | |
| 2997 while (count--) | |
| 2998 { | |
| 2999 did_skip = FALSE; | |
| 3000 for (first = TRUE; ; first = FALSE) | |
| 3001 { | |
| 3002 if (*ml_get(curr) != NUL) | |
| 3003 did_skip = TRUE; | |
| 3004 | |
| 3005 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3006 // skip folded lines |
| 7 | 3007 fold_skipped = FALSE; |
| 3008 if (first && hasFolding(curr, &fold_first, &fold_last)) | |
| 3009 { | |
| 3010 curr = ((dir > 0) ? fold_last : fold_first) + dir; | |
| 3011 fold_skipped = TRUE; | |
| 3012 } | |
| 3013 #endif | |
| 3014 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3015 // 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
|
3016 // 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
|
3017 // first column and at an empty line. |
| 164 | 3018 if (!first && did_skip && (startPS(curr, what, both) |
| 3019 || (posix && what == NUL && *ml_get(curr) == '{'))) | |
| 7 | 3020 break; |
| 3021 | |
| 3022 #ifdef FEAT_FOLDING | |
| 3023 if (fold_skipped) | |
| 3024 curr -= dir; | |
| 3025 #endif | |
| 3026 if ((curr += dir) < 1 || curr > curbuf->b_ml.ml_line_count) | |
| 3027 { | |
| 3028 if (count) | |
| 3029 return FALSE; | |
| 3030 curr -= dir; | |
| 3031 break; | |
| 3032 } | |
| 3033 } | |
| 3034 } | |
| 3035 setpcmark(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3036 if (both && *ml_get(curr) == '}') // include line with '}' |
| 7 | 3037 ++curr; |
| 3038 curwin->w_cursor.lnum = curr; | |
| 3039 if (curr == curbuf->b_ml.ml_line_count && what != '}') | |
| 3040 { | |
|
11275
5c77ca0cf6a5
patch 8.0.0523: dv} deletes part of a multi-byte character.
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
3041 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
|
3042 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3043 // 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
|
3044 // 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
|
3045 if ((curwin->w_cursor.col = (colnr_T)STRLEN(line)) != 0) |
| 7 | 3046 { |
| 3047 --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
|
3048 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
|
3049 (*mb_head_off)(line, line + curwin->w_cursor.col); |
| 504 | 3050 *pincl = TRUE; |
| 7 | 3051 } |
| 3052 } | |
| 3053 else | |
| 3054 curwin->w_cursor.col = 0; | |
| 3055 return TRUE; | |
| 3056 } | |
| 3057 | |
| 3058 /* | |
| 3059 * check if the string 's' is a nroff macro that is in option 'opt' | |
| 3060 */ | |
| 3061 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3062 inmacro(char_u *opt, char_u *s) |
| 7 | 3063 { |
| 3064 char_u *macro; | |
| 3065 | |
| 3066 for (macro = opt; macro[0]; ++macro) | |
| 3067 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3068 // 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
|
3069 // 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
|
3070 // line or the line having ended. |
| 7 | 3071 if ( (macro[0] == s[0] |
| 3072 || (macro[0] == ' ' | |
| 3073 && (s[0] == NUL || s[0] == ' '))) | |
| 3074 && (macro[1] == s[1] | |
| 3075 || ((macro[1] == NUL || macro[1] == ' ') | |
| 3076 && (s[0] == NUL || s[1] == NUL || s[1] == ' ')))) | |
| 3077 break; | |
| 3078 ++macro; | |
| 3079 if (macro[0] == NUL) | |
| 3080 break; | |
| 3081 } | |
| 3082 return (macro[0] != NUL); | |
| 3083 } | |
| 3084 | |
| 3085 /* | |
| 3086 * startPS: return TRUE if line 'lnum' is the start of a section or paragraph. | |
| 3087 * If 'para' is '{' or '}' only check for sections. | |
| 3088 * If 'both' is TRUE also stop at '}' | |
| 3089 */ | |
| 3090 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3091 startPS(linenr_T lnum, int para, int both) |
| 7 | 3092 { |
| 3093 char_u *s; | |
| 3094 | |
| 3095 s = ml_get(lnum); | |
| 3096 if (*s == para || *s == '\f' || (both && *s == '}')) | |
| 3097 return TRUE; | |
| 3098 if (*s == '.' && (inmacro(p_sections, s + 1) || | |
| 3099 (!para && inmacro(p_para, s + 1)))) | |
| 3100 return TRUE; | |
| 3101 return FALSE; | |
| 3102 } | |
| 3103 | |
| 3104 /* | |
| 3105 * The following routines do the word searches performed by the 'w', 'W', | |
| 3106 * 'b', 'B', 'e', and 'E' commands. | |
| 3107 */ | |
| 3108 | |
| 3109 /* | |
| 3110 * To perform these searches, characters are placed into one of three | |
| 3111 * classes, and transitions between classes determine word boundaries. | |
| 3112 * | |
| 3113 * The classes are: | |
| 3114 * | |
| 3115 * 0 - white space | |
| 3116 * 1 - punctuation | |
| 3117 * 2 or higher - keyword characters (letters, digits and underscore) | |
| 3118 */ | |
| 3119 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3120 static int cls_bigword; // TRUE for "W", "B" or "E" |
| 7 | 3121 |
| 3122 /* | |
| 3123 * cls() - returns the class of character at curwin->w_cursor | |
| 3124 * | |
| 3125 * If a 'W', 'B', or 'E' motion is being done (cls_bigword == TRUE), chars | |
| 3126 * from class 2 and higher are reported as class 1 since only white space | |
| 3127 * boundaries are of interest. | |
| 3128 */ | |
| 3129 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3130 cls(void) |
| 7 | 3131 { |
| 3132 int c; | |
| 3133 | |
| 3134 c = gchar_cursor(); | |
| 3135 if (c == ' ' || c == '\t' || c == NUL) | |
| 3136 return 0; | |
| 3137 if (enc_dbcs != 0 && c > 0xFF) | |
| 3138 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3139 // If cls_bigword, report multi-byte chars as class 1. |
| 7 | 3140 if (enc_dbcs == DBCS_KOR && cls_bigword) |
| 3141 return 1; | |
| 3142 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3143 // process code leading/trailing bytes |
| 7 | 3144 return dbcs_class(((unsigned)c >> 8), (c & 0xFF)); |
| 3145 } | |
| 3146 if (enc_utf8) | |
| 3147 { | |
| 3148 c = utf_class(c); | |
| 3149 if (c != 0 && cls_bigword) | |
| 3150 return 1; | |
| 3151 return c; | |
| 3152 } | |
| 3153 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3154 // If cls_bigword is TRUE, report all non-blanks as class 1. |
| 7 | 3155 if (cls_bigword) |
| 3156 return 1; | |
| 3157 | |
| 3158 if (vim_iswordc(c)) | |
| 3159 return 2; | |
| 3160 return 1; | |
| 3161 } | |
| 3162 | |
| 3163 | |
| 3164 /* | |
| 3165 * fwd_word(count, type, eol) - move forward one word | |
| 3166 * | |
| 3167 * Returns FAIL if the cursor was already at the end of the file. | |
| 3168 * If eol is TRUE, last word stops at end of line (for operators). | |
| 3169 */ | |
| 3170 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3171 fwd_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3172 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3173 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
|
3174 int eol) |
| 7 | 3175 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3176 int sclass; // starting class |
| 7 | 3177 int i; |
| 3178 int last_line; | |
| 3179 | |
| 3180 curwin->w_cursor.coladd = 0; | |
| 3181 cls_bigword = bigword; | |
| 3182 while (--count >= 0) | |
| 3183 { | |
| 3184 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3185 // 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
|
3186 // last line. |
| 7 | 3187 if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) |
| 3188 coladvance((colnr_T)MAXCOL); | |
| 3189 #endif | |
| 3190 sclass = cls(); | |
| 3191 | |
| 3192 /* | |
| 3193 * We always move at least one character, unless on the last | |
| 3194 * character in the buffer. | |
| 3195 */ | |
| 3196 last_line = (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count); | |
| 3197 i = inc_cursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3198 if (i == -1 || (i >= 1 && last_line)) // started at last char in file |
| 7 | 3199 return FAIL; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3200 if (i >= 1 && eol && count == 0) // started at last char in line |
| 7 | 3201 return OK; |
| 3202 | |
| 3203 /* | |
| 3204 * Go one char past end of current word (if any) | |
| 3205 */ | |
| 3206 if (sclass != 0) | |
| 3207 while (cls() == sclass) | |
| 3208 { | |
| 3209 i = inc_cursor(); | |
| 3210 if (i == -1 || (i >= 1 && eol && count == 0)) | |
| 3211 return OK; | |
| 3212 } | |
| 3213 | |
| 3214 /* | |
| 3215 * go to next non-white | |
| 3216 */ | |
| 3217 while (cls() == 0) | |
| 3218 { | |
| 3219 /* | |
| 3220 * We'll stop if we land on a blank line | |
| 3221 */ | |
| 3222 if (curwin->w_cursor.col == 0 && *ml_get_curline() == NUL) | |
| 3223 break; | |
| 3224 | |
| 3225 i = inc_cursor(); | |
| 3226 if (i == -1 || (i >= 1 && eol && count == 0)) | |
| 3227 return OK; | |
| 3228 } | |
| 3229 } | |
| 3230 return OK; | |
| 3231 } | |
| 3232 | |
| 3233 /* | |
| 3234 * bck_word() - move backward 'count' words | |
| 3235 * | |
| 3236 * If stop is TRUE and we are already on the start of a word, move one less. | |
| 3237 * | |
| 3238 * Returns FAIL if top of the file was reached. | |
| 3239 */ | |
| 3240 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3241 bck_word(long count, int bigword, int stop) |
| 7 | 3242 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3243 int sclass; // starting class |
| 7 | 3244 |
| 3245 curwin->w_cursor.coladd = 0; | |
| 3246 cls_bigword = bigword; | |
| 3247 while (--count >= 0) | |
| 3248 { | |
| 3249 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3250 // 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
|
3251 // first line. |
| 7 | 3252 if (hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL)) |
| 3253 curwin->w_cursor.col = 0; | |
| 3254 #endif | |
| 3255 sclass = cls(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3256 if (dec_cursor() == -1) // started at start of file |
| 7 | 3257 return FAIL; |
| 3258 | |
| 3259 if (!stop || sclass == cls() || sclass == 0) | |
| 3260 { | |
| 3261 /* | |
| 3262 * Skip white space before the word. | |
| 3263 * Stop on an empty line. | |
| 3264 */ | |
| 3265 while (cls() == 0) | |
| 3266 { | |
| 3267 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
|
3268 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3269 goto finished; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3270 if (dec_cursor() == -1) // hit start of file, stop here |
| 7 | 3271 return OK; |
| 3272 } | |
| 3273 | |
| 3274 /* | |
| 3275 * Move backward to start of this word. | |
| 3276 */ | |
| 3277 if (skip_chars(cls(), BACKWARD)) | |
| 3278 return OK; | |
| 3279 } | |
| 3280 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3281 inc_cursor(); // overshot - forward one |
| 7 | 3282 finished: |
| 3283 stop = FALSE; | |
| 3284 } | |
| 3285 return OK; | |
| 3286 } | |
| 3287 | |
| 3288 /* | |
| 3289 * end_word() - move to the end of the word | |
| 3290 * | |
| 3291 * There is an apparent bug in the 'e' motion of the real vi. At least on the | |
| 3292 * System V Release 3 version for the 80386. Unlike 'b' and 'w', the 'e' | |
| 3293 * motion crosses blank lines. When the real vi crosses a blank line in an | |
| 3294 * 'e' motion, the cursor is placed on the FIRST character of the next | |
| 3295 * non-blank line. The 'E' command, however, works correctly. Since this | |
| 3296 * appears to be a bug, I have not duplicated it here. | |
| 3297 * | |
| 3298 * Returns FAIL if end of the file was reached. | |
| 3299 * | |
| 3300 * If stop is TRUE and we are already on the end of a word, move one less. | |
| 3301 * If empty is TRUE stop on an empty line. | |
| 3302 */ | |
| 3303 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3304 end_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3305 long count, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3306 int bigword, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3307 int stop, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3308 int empty) |
| 7 | 3309 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3310 int sclass; // starting class |
| 7 | 3311 |
| 3312 curwin->w_cursor.coladd = 0; | |
| 3313 cls_bigword = bigword; | |
| 3314 while (--count >= 0) | |
| 3315 { | |
| 3316 #ifdef FEAT_FOLDING | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3317 // 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
|
3318 // last line. |
| 7 | 3319 if (hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum)) |
| 3320 coladvance((colnr_T)MAXCOL); | |
| 3321 #endif | |
| 3322 sclass = cls(); | |
| 3323 if (inc_cursor() == -1) | |
| 3324 return FAIL; | |
| 3325 | |
| 3326 /* | |
| 3327 * If we're in the middle of a word, we just have to move to the end | |
| 3328 * of it. | |
| 3329 */ | |
| 3330 if (cls() == sclass && sclass != 0) | |
| 3331 { | |
| 3332 /* | |
| 3333 * Move forward to end of the current word | |
| 3334 */ | |
| 3335 if (skip_chars(sclass, FORWARD)) | |
| 3336 return FAIL; | |
| 3337 } | |
| 3338 else if (!stop || sclass == 0) | |
| 3339 { | |
| 3340 /* | |
| 3341 * We were at the end of a word. Go to the end of the next word. | |
| 3342 * First skip white space, if 'empty' is TRUE, stop at empty line. | |
| 3343 */ | |
| 3344 while (cls() == 0) | |
| 3345 { | |
| 3346 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
|
3347 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3348 goto finished; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3349 if (inc_cursor() == -1) // hit end of file, stop here |
| 7 | 3350 return FAIL; |
| 3351 } | |
| 3352 | |
| 3353 /* | |
| 3354 * Move forward to the end of this word. | |
| 3355 */ | |
| 3356 if (skip_chars(cls(), FORWARD)) | |
| 3357 return FAIL; | |
| 3358 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3359 dec_cursor(); // overshot - one char backward |
| 7 | 3360 finished: |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3361 stop = FALSE; // we move only one word less |
| 7 | 3362 } |
| 3363 return OK; | |
| 3364 } | |
| 3365 | |
| 3366 /* | |
| 3367 * Move back to the end of the word. | |
| 3368 * | |
| 3369 * Returns FAIL if start of the file was reached. | |
| 3370 */ | |
| 3371 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3372 bckend_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3373 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3374 int bigword, // TRUE for "B" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3375 int eol) // TRUE: stop at end of line. |
| 7 | 3376 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3377 int sclass; // starting class |
| 7 | 3378 int i; |
| 3379 | |
| 3380 curwin->w_cursor.coladd = 0; | |
| 3381 cls_bigword = bigword; | |
| 3382 while (--count >= 0) | |
| 3383 { | |
| 3384 sclass = cls(); | |
| 3385 if ((i = dec_cursor()) == -1) | |
| 3386 return FAIL; | |
| 3387 if (eol && i == 1) | |
| 3388 return OK; | |
| 3389 | |
| 3390 /* | |
| 3391 * Move backward to before the start of this word. | |
| 3392 */ | |
| 3393 if (sclass != 0) | |
| 3394 { | |
| 3395 while (cls() == sclass) | |
| 3396 if ((i = dec_cursor()) == -1 || (eol && i == 1)) | |
| 3397 return OK; | |
| 3398 } | |
| 3399 | |
| 3400 /* | |
| 3401 * Move backward to end of the previous word | |
| 3402 */ | |
| 3403 while (cls() == 0) | |
| 3404 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3405 if (curwin->w_cursor.col == 0 && LINEEMPTY(curwin->w_cursor.lnum)) |
| 7 | 3406 break; |
| 3407 if ((i = dec_cursor()) == -1 || (eol && i == 1)) | |
| 3408 return OK; | |
| 3409 } | |
| 3410 } | |
| 3411 return OK; | |
| 3412 } | |
| 3413 | |
| 3414 /* | |
| 3415 * Skip a row of characters of the same class. | |
| 3416 * Return TRUE when end-of-file reached, FALSE otherwise. | |
| 3417 */ | |
| 3418 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3419 skip_chars(int cclass, int dir) |
| 7 | 3420 { |
| 3421 while (cls() == cclass) | |
| 3422 if ((dir == FORWARD ? inc_cursor() : dec_cursor()) == -1) | |
| 3423 return TRUE; | |
| 3424 return FALSE; | |
| 3425 } | |
| 3426 | |
| 3427 #ifdef FEAT_TEXTOBJ | |
| 3428 /* | |
| 3429 * Go back to the start of the word or the start of white space | |
| 3430 */ | |
| 3431 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3432 back_in_line(void) |
| 7 | 3433 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3434 int sclass; // starting class |
| 7 | 3435 |
| 3436 sclass = cls(); | |
| 3437 for (;;) | |
| 3438 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3439 if (curwin->w_cursor.col == 0) // stop at start of line |
| 7 | 3440 break; |
| 3441 dec_cursor(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3442 if (cls() != sclass) // stop at start of word |
| 7 | 3443 { |
| 3444 inc_cursor(); | |
| 3445 break; | |
| 3446 } | |
| 3447 } | |
| 3448 } | |
| 3449 | |
| 3450 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3451 find_first_blank(pos_T *posp) |
| 7 | 3452 { |
| 3453 int c; | |
| 3454 | |
| 3455 while (decl(posp) != -1) | |
| 3456 { | |
| 3457 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
|
3458 if (!VIM_ISWHITE(c)) |
| 7 | 3459 { |
| 3460 incl(posp); | |
| 3461 break; | |
| 3462 } | |
| 3463 } | |
| 3464 } | |
| 3465 | |
| 3466 /* | |
| 3467 * Skip count/2 sentences and count/2 separating white spaces. | |
| 3468 */ | |
| 3469 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3470 findsent_forward( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3471 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3472 int at_start_sent) // cursor is at start of sentence |
| 7 | 3473 { |
| 3474 while (count--) | |
| 3475 { | |
| 3476 findsent(FORWARD, 1L); | |
| 3477 if (at_start_sent) | |
| 3478 find_first_blank(&curwin->w_cursor); | |
| 3479 if (count == 0 || at_start_sent) | |
| 3480 decl(&curwin->w_cursor); | |
| 3481 at_start_sent = !at_start_sent; | |
| 3482 } | |
| 3483 } | |
| 3484 | |
| 3485 /* | |
| 3486 * Find word under cursor, cursor at end. | |
| 3487 * Used while an operator is pending, and in Visual mode. | |
| 3488 */ | |
| 3489 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3490 current_word( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3491 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3492 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3493 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
|
3494 int bigword) // FALSE == word, TRUE == WORD |
| 7 | 3495 { |
| 3496 pos_T start_pos; | |
| 3497 pos_T pos; | |
| 3498 int inclusive = TRUE; | |
| 3499 int include_white = FALSE; | |
| 3500 | |
| 3501 cls_bigword = bigword; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3502 CLEAR_POS(&start_pos); |
| 7 | 3503 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3504 // 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
|
3505 if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 3506 dec_cursor(); |
| 3507 | |
| 3508 /* | |
| 3509 * When Visual mode is not active, or when the VIsual area is only one | |
| 3510 * character, select the word and/or white space under the cursor. | |
| 3511 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3512 if (!VIsual_active || EQUAL_POS(curwin->w_cursor, VIsual)) |
| 7 | 3513 { |
| 3514 /* | |
| 3515 * Go to start of current word or white space. | |
| 3516 */ | |
| 3517 back_in_line(); | |
| 3518 start_pos = curwin->w_cursor; | |
| 3519 | |
| 3520 /* | |
| 3521 * If the start is on white space, and white space should be included | |
| 3522 * (" word"), or start is not on white space, and white space should | |
| 3523 * not be included ("word"), find end of word. | |
| 3524 */ | |
| 3525 if ((cls() == 0) == include) | |
| 3526 { | |
| 3527 if (end_word(1L, bigword, TRUE, TRUE) == FAIL) | |
| 3528 return FAIL; | |
| 3529 } | |
| 3530 else | |
| 3531 { | |
| 3532 /* | |
| 3533 * If the start is not on white space, and white space should be | |
| 3534 * included ("word "), or start is on white space and white | |
| 3535 * space should not be included (" "), find start of word. | |
| 3536 * If we end up in the first column of the next line (single char | |
| 3537 * word) back up to end of the line. | |
| 3538 */ | |
| 3539 fwd_word(1L, bigword, TRUE); | |
| 3540 if (curwin->w_cursor.col == 0) | |
| 3541 decl(&curwin->w_cursor); | |
| 3542 else | |
| 3543 oneleft(); | |
| 3544 | |
| 3545 if (include) | |
| 3546 include_white = TRUE; | |
| 3547 } | |
| 3548 | |
| 3549 if (VIsual_active) | |
| 3550 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3551 // should do something when inclusive == FALSE ! |
| 7 | 3552 VIsual = start_pos; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3553 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3554 } |
| 3555 else | |
| 3556 { | |
| 3557 oap->start = start_pos; | |
| 3558 oap->motion_type = MCHAR; | |
| 3559 } | |
| 3560 --count; | |
| 3561 } | |
| 3562 | |
| 3563 /* | |
| 3564 * When count is still > 0, extend with more objects. | |
| 3565 */ | |
| 3566 while (count > 0) | |
| 3567 { | |
| 3568 inclusive = TRUE; | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3569 if (VIsual_active && LT_POS(curwin->w_cursor, VIsual)) |
| 7 | 3570 { |
| 3571 /* | |
| 3572 * In Visual mode, with cursor at start: move cursor back. | |
| 3573 */ | |
| 3574 if (decl(&curwin->w_cursor) == -1) | |
| 3575 return FAIL; | |
| 3576 if (include != (cls() != 0)) | |
| 3577 { | |
| 3578 if (bck_word(1L, bigword, TRUE) == FAIL) | |
| 3579 return FAIL; | |
| 3580 } | |
| 3581 else | |
| 3582 { | |
| 3583 if (bckend_word(1L, bigword, TRUE) == FAIL) | |
| 3584 return FAIL; | |
| 3585 (void)incl(&curwin->w_cursor); | |
| 3586 } | |
| 3587 } | |
| 3588 else | |
| 3589 { | |
| 3590 /* | |
| 3591 * Move cursor forward one word and/or white area. | |
| 3592 */ | |
| 3593 if (incl(&curwin->w_cursor) == -1) | |
| 3594 return FAIL; | |
| 3595 if (include != (cls() == 0)) | |
| 3596 { | |
| 96 | 3597 if (fwd_word(1L, bigword, TRUE) == FAIL && count > 1) |
| 7 | 3598 return FAIL; |
| 3599 /* | |
| 3600 * If end is just past a new-line, we don't want to include | |
| 96 | 3601 * the first character on the line. |
| 3602 * Put cursor on last char of white. | |
| 7 | 3603 */ |
| 96 | 3604 if (oneleft() == FAIL) |
| 7 | 3605 inclusive = FALSE; |
| 3606 } | |
| 3607 else | |
| 3608 { | |
| 3609 if (end_word(1L, bigword, TRUE, TRUE) == FAIL) | |
| 3610 return FAIL; | |
| 3611 } | |
| 3612 } | |
| 3613 --count; | |
| 3614 } | |
| 3615 | |
| 9 | 3616 if (include_white && (cls() != 0 |
| 3617 || (curwin->w_cursor.col == 0 && !inclusive))) | |
| 7 | 3618 { |
| 3619 /* | |
| 3620 * If we don't include white space at the end, move the start | |
| 3621 * to include some white space there. This makes "daw" work | |
| 3622 * better on the last word in a sentence (and "2daw" on last-but-one | |
| 9 | 3623 * word). Also when "2daw" deletes "word." at the end of the line |
| 3624 * (cursor is at start of next line). | |
| 3625 * But don't delete white space at start of line (indent). | |
| 7 | 3626 */ |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3627 pos = curwin->w_cursor; // save cursor position |
| 7 | 3628 curwin->w_cursor = start_pos; |
| 3629 if (oneleft() == OK) | |
| 3630 { | |
| 3631 back_in_line(); | |
| 3632 if (cls() == 0 && curwin->w_cursor.col > 0) | |
| 3633 { | |
| 3634 if (VIsual_active) | |
| 3635 VIsual = curwin->w_cursor; | |
| 3636 else | |
| 3637 oap->start = curwin->w_cursor; | |
| 3638 } | |
| 3639 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3640 curwin->w_cursor = pos; // put cursor back at end |
| 7 | 3641 } |
| 3642 | |
| 3643 if (VIsual_active) | |
| 3644 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3645 if (*p_sel == 'e' && inclusive && LTOREQ_POS(VIsual, curwin->w_cursor)) |
| 7 | 3646 inc_cursor(); |
| 3647 if (VIsual_mode == 'V') | |
| 3648 { | |
| 3649 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3650 redraw_cmdline = TRUE; // show mode later |
| 7 | 3651 } |
| 3652 } | |
| 3653 else | |
| 3654 oap->inclusive = inclusive; | |
| 3655 | |
| 3656 return OK; | |
| 3657 } | |
| 3658 | |
| 3659 /* | |
| 3660 * Find sentence(s) under the cursor, cursor at end. | |
| 3661 * When Visual active, extend it by one or more sentences. | |
| 3662 */ | |
| 3663 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3664 current_sent(oparg_T *oap, long count, int include) |
| 7 | 3665 { |
| 3666 pos_T start_pos; | |
| 3667 pos_T pos; | |
| 3668 int start_blank; | |
| 3669 int c; | |
| 3670 int at_start_sent; | |
| 3671 long ncount; | |
| 3672 | |
| 3673 start_pos = curwin->w_cursor; | |
| 3674 pos = start_pos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3675 findsent(FORWARD, 1L); // Find start of next sentence. |
| 7 | 3676 |
| 3677 /* | |
| 3701 | 3678 * When the Visual area is bigger than one character: Extend it. |
| 7 | 3679 */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3680 if (VIsual_active && !EQUAL_POS(start_pos, VIsual)) |
| 7 | 3681 { |
| 3682 extend: | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3683 if (LT_POS(start_pos, VIsual)) |
| 7 | 3684 { |
| 3685 /* | |
| 3686 * Cursor at start of Visual area. | |
| 3687 * Find out where we are: | |
| 3688 * - in the white space before a sentence | |
| 3689 * - in a sentence or just after it | |
| 3690 * - at the start of a sentence | |
| 3691 */ | |
| 3692 at_start_sent = TRUE; | |
| 3693 decl(&pos); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3694 while (LT_POS(pos, curwin->w_cursor)) |
| 7 | 3695 { |
| 3696 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
|
3697 if (!VIM_ISWHITE(c)) |
| 7 | 3698 { |
| 3699 at_start_sent = FALSE; | |
| 3700 break; | |
| 3701 } | |
| 3702 incl(&pos); | |
| 3703 } | |
| 3704 if (!at_start_sent) | |
| 3705 { | |
| 3706 findsent(BACKWARD, 1L); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3707 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
|
3708 at_start_sent = TRUE; // exactly at start of sentence |
| 7 | 3709 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3710 // inside a sentence, go to its end (start of next) |
| 7 | 3711 findsent(FORWARD, 1L); |
| 3712 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3713 if (include) // "as" gets twice as much as "is" |
| 7 | 3714 count *= 2; |
| 3715 while (count--) | |
| 3716 { | |
| 3717 if (at_start_sent) | |
| 3718 find_first_blank(&curwin->w_cursor); | |
| 3719 c = gchar_cursor(); | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3720 if (!at_start_sent || (!include && !VIM_ISWHITE(c))) |
| 7 | 3721 findsent(BACKWARD, 1L); |
| 3722 at_start_sent = !at_start_sent; | |
| 3723 } | |
| 3724 } | |
| 3725 else | |
| 3726 { | |
| 3727 /* | |
| 3728 * Cursor at end of Visual area. | |
| 3729 * Find out where we are: | |
| 3730 * - just before a sentence | |
| 3731 * - just before or in the white space before a sentence | |
| 3732 * - in a sentence | |
| 3733 */ | |
| 3734 incl(&pos); | |
| 3735 at_start_sent = TRUE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3736 // 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
|
3737 if (!EQUAL_POS(pos, curwin->w_cursor)) |
| 7 | 3738 { |
| 3739 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
|
3740 while (LT_POS(pos, curwin->w_cursor)) |
| 7 | 3741 { |
| 3742 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
|
3743 if (!VIM_ISWHITE(c)) |
| 7 | 3744 { |
| 3745 at_start_sent = TRUE; | |
| 3746 break; | |
| 3747 } | |
| 3748 incl(&pos); | |
| 3749 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3750 if (at_start_sent) // in the sentence |
| 7 | 3751 findsent(BACKWARD, 1L); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3752 else // in/before white before a sentence |
| 7 | 3753 curwin->w_cursor = start_pos; |
| 3754 } | |
| 3755 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3756 if (include) // "as" gets twice as much as "is" |
| 7 | 3757 count *= 2; |
| 3758 findsent_forward(count, at_start_sent); | |
| 3759 if (*p_sel == 'e') | |
| 3760 ++curwin->w_cursor.col; | |
| 3761 } | |
| 3762 return OK; | |
| 3763 } | |
| 3764 | |
| 3765 /* | |
| 3701 | 3766 * If the cursor started on a blank, check if it is just before the start |
| 3767 * of the next sentence. | |
| 7 | 3768 */ |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3769 while (c = gchar_pos(&pos), VIM_ISWHITE(c)) // VIM_ISWHITE() is a macro |
| 7 | 3770 incl(&pos); |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3771 if (EQUAL_POS(pos, curwin->w_cursor)) |
| 7 | 3772 { |
| 3773 start_blank = TRUE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3774 find_first_blank(&start_pos); // go back to first blank |
| 7 | 3775 } |
| 3776 else | |
| 3777 { | |
| 3778 start_blank = FALSE; | |
| 3779 findsent(BACKWARD, 1L); | |
| 3780 start_pos = curwin->w_cursor; | |
| 3781 } | |
| 3782 if (include) | |
| 3783 ncount = count * 2; | |
| 3784 else | |
| 3785 { | |
| 3786 ncount = count; | |
| 3787 if (start_blank) | |
| 3788 --ncount; | |
| 3789 } | |
| 45 | 3790 if (ncount > 0) |
| 7 | 3791 findsent_forward(ncount, TRUE); |
| 3792 else | |
| 3793 decl(&curwin->w_cursor); | |
| 3794 | |
| 3795 if (include) | |
| 3796 { | |
| 3797 /* | |
| 3798 * If the blank in front of the sentence is included, exclude the | |
| 3799 * blanks at the end of the sentence, go back to the first blank. | |
| 3800 * If there are no trailing blanks, try to include leading blanks. | |
| 3801 */ | |
| 3802 if (start_blank) | |
| 3803 { | |
| 3804 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
|
3805 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
|
3806 if (VIM_ISWHITE(c)) |
| 7 | 3807 decl(&curwin->w_cursor); |
| 3808 } | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3809 else if (c = gchar_cursor(), !VIM_ISWHITE(c)) |
| 7 | 3810 find_first_blank(&start_pos); |
| 3811 } | |
| 3812 | |
| 3813 if (VIsual_active) | |
| 3814 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3815 // 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
|
3816 if (EQUAL_POS(start_pos, curwin->w_cursor)) |
| 7 | 3817 goto extend; |
| 3818 if (*p_sel == 'e') | |
| 3819 ++curwin->w_cursor.col; | |
| 3820 VIsual = start_pos; | |
| 3821 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3822 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
|
3823 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3824 } |
| 3825 else | |
| 3826 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3827 // include a newline after the sentence, if there is one |
| 7 | 3828 if (incl(&curwin->w_cursor) == -1) |
| 3829 oap->inclusive = TRUE; | |
| 3830 else | |
| 3831 oap->inclusive = FALSE; | |
| 3832 oap->start = start_pos; | |
| 3833 oap->motion_type = MCHAR; | |
| 3834 } | |
| 3835 return OK; | |
| 3836 } | |
| 3837 | |
| 423 | 3838 /* |
| 3839 * Find block under the cursor, cursor at end. | |
| 4352 | 3840 * "what" and "other" are two matching parenthesis/brace/etc. |
| 423 | 3841 */ |
| 7 | 3842 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3843 current_block( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3844 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3845 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3846 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
|
3847 int what, // '(', '{', etc. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3848 int other) // ')', '}', etc. |
| 7 | 3849 { |
| 3850 pos_T old_pos; | |
| 3851 pos_T *pos = NULL; | |
| 3852 pos_T start_pos; | |
| 3853 pos_T *end_pos; | |
| 3854 pos_T old_start, old_end; | |
| 3855 char_u *save_cpo; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3856 int sol = FALSE; // '{' at start of line |
| 7 | 3857 |
| 3858 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
|
3859 old_end = curwin->w_cursor; // remember where we started |
| 7 | 3860 old_start = old_end; |
| 3861 | |
| 3862 /* | |
| 3863 * If we start on '(', '{', ')', '}', etc., use the whole block inclusive. | |
| 3864 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3865 if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor)) |
| 7 | 3866 { |
| 3867 setpcmark(); | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3868 if (what == '{') // ignore indent |
| 7 | 3869 while (inindent(1)) |
| 3870 if (inc_cursor() != 0) | |
| 3871 break; | |
| 423 | 3872 if (gchar_cursor() == what) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3873 // cursor on '(' or '{', move cursor just after it |
| 7 | 3874 ++curwin->w_cursor.col; |
| 3875 } | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3876 else if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 3877 { |
| 3878 old_start = VIsual; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3879 curwin->w_cursor = VIsual; // cursor at low end of Visual |
| 7 | 3880 } |
| 3881 else | |
| 3882 old_end = VIsual; | |
| 3883 | |
| 3884 /* | |
| 3885 * Search backwards for unclosed '(', '{', etc.. | |
| 3886 * Put this position in start_pos. | |
| 6675 | 3887 * Ignore quotes here. Keep the "M" flag in 'cpo', as that is what the |
| 3888 * user wants. | |
| 7 | 3889 */ |
| 3890 save_cpo = p_cpo; | |
| 6675 | 3891 p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%"); |
| 7 | 3892 while (count-- > 0) |
| 3893 { | |
| 3894 if ((pos = findmatch(NULL, what)) == NULL) | |
| 3895 break; | |
| 3896 curwin->w_cursor = *pos; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3897 start_pos = *pos; // the findmatch for end_pos will overwrite *pos |
| 7 | 3898 } |
| 3899 p_cpo = save_cpo; | |
| 3900 | |
| 3901 /* | |
| 3902 * Search for matching ')', '}', etc. | |
| 3903 * Put this position in curwin->w_cursor. | |
| 3904 */ | |
| 3905 if (pos == NULL || (end_pos = findmatch(NULL, other)) == NULL) | |
| 3906 { | |
| 3907 curwin->w_cursor = old_pos; | |
| 3908 return FAIL; | |
| 3909 } | |
| 3910 curwin->w_cursor = *end_pos; | |
| 3911 | |
| 3912 /* | |
| 3913 * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE. | |
| 5975 | 3914 * If the ending '}', ')' or ']' is only preceded by indent, skip that |
| 3915 * indent. But only if the resulting area is not smaller than what we | |
| 3916 * started with. | |
| 7 | 3917 */ |
| 3918 while (!include) | |
| 3919 { | |
| 3920 incl(&start_pos); | |
| 3921 sol = (curwin->w_cursor.col == 0); | |
| 3922 decl(&curwin->w_cursor); | |
| 5975 | 3923 while (inindent(1)) |
| 3924 { | |
| 3925 sol = TRUE; | |
| 3926 if (decl(&curwin->w_cursor) != 0) | |
| 3927 break; | |
| 3928 } | |
| 3929 | |
| 7 | 3930 /* |
| 3931 * In Visual mode, when the resulting area is not bigger than what we | |
| 3932 * started with, extend it to the next block, and then exclude again. | |
| 3933 */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
3934 if (!LT_POS(start_pos, old_start) && !LT_POS(old_end, curwin->w_cursor) |
| 7 | 3935 && VIsual_active) |
| 3936 { | |
| 3937 curwin->w_cursor = old_start; | |
| 3938 decl(&curwin->w_cursor); | |
| 3939 if ((pos = findmatch(NULL, what)) == NULL) | |
| 3940 { | |
| 3941 curwin->w_cursor = old_pos; | |
| 3942 return FAIL; | |
| 3943 } | |
| 3944 start_pos = *pos; | |
| 3945 curwin->w_cursor = *pos; | |
| 3946 if ((end_pos = findmatch(NULL, other)) == NULL) | |
| 3947 { | |
| 3948 curwin->w_cursor = old_pos; | |
| 3949 return FAIL; | |
| 3950 } | |
| 3951 curwin->w_cursor = *end_pos; | |
| 3952 } | |
| 3953 else | |
| 3954 break; | |
| 3955 } | |
| 3956 | |
| 3957 if (VIsual_active) | |
| 3958 { | |
| 3959 if (*p_sel == 'e') | |
|
7070
d92910c0c415
commit https://github.com/vim/vim/commit/8667d66ca923d361e00e6369cbff37283db5a432
Christian Brabandt <cb@256bit.org>
parents:
7054
diff
changeset
|
3960 inc(&curwin->w_cursor); |
| 557 | 3961 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
|
3962 inc(&curwin->w_cursor); // include the line break |
| 7 | 3963 VIsual = start_pos; |
| 3964 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3965 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 3966 showmode(); |
| 3967 } | |
| 3968 else | |
| 3969 { | |
| 3970 oap->start = start_pos; | |
| 3971 oap->motion_type = MCHAR; | |
| 1290 | 3972 oap->inclusive = FALSE; |
| 7 | 3973 if (sol) |
| 3974 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
|
3975 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
|
3976 // Include the character under the cursor. |
| 1290 | 3977 oap->inclusive = TRUE; |
| 7 | 3978 else |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
3979 // 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
|
3980 // operate on any text. |
| 1290 | 3981 curwin->w_cursor = start_pos; |
| 7 | 3982 } |
| 3983 | |
| 3984 return OK; | |
| 3985 } | |
| 3986 | |
| 423 | 3987 /* |
| 3988 * Return TRUE if the cursor is on a "<aaa>" tag. Ignore "<aaa/>". | |
| 3989 * When "end_tag" is TRUE return TRUE if the cursor is on "</aaa>". | |
| 3990 */ | |
| 3991 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3992 in_html_tag( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3993 int end_tag) |
| 423 | 3994 { |
| 3995 char_u *line = ml_get_curline(); | |
| 3996 char_u *p; | |
| 3997 int c; | |
| 3998 int lc = NUL; | |
| 3999 pos_T pos; | |
| 4000 | |
| 4001 if (enc_dbcs) | |
| 4002 { | |
| 4003 char_u *lp = NULL; | |
| 4004 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4005 // 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
|
4006 // 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
|
4007 for (p = line; p < line + curwin->w_cursor.col; MB_PTR_ADV(p)) |
| 423 | 4008 if (*p == '>' || *p == '<') |
| 4009 { | |
| 4010 lc = *p; | |
| 4011 lp = p; | |
| 4012 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4013 if (*p != '<') // check for '<' under cursor |
| 423 | 4014 { |
| 4015 if (lc != '<') | |
| 4016 return FALSE; | |
| 4017 p = lp; | |
| 4018 } | |
| 4019 } | |
| 4020 else | |
| 4021 { | |
| 4022 for (p = line + curwin->w_cursor.col; p > line; ) | |
| 4023 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4024 if (*p == '<') // find '<' under/before cursor |
| 423 | 4025 break; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4026 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
|
4027 if (*p == '>') // find '>' before cursor |
| 423 | 4028 break; |
| 4029 } | |
| 4030 if (*p != '<') | |
| 4031 return FALSE; | |
| 4032 } | |
| 4033 | |
| 4034 pos.lnum = curwin->w_cursor.lnum; | |
| 835 | 4035 pos.col = (colnr_T)(p - line); |
| 423 | 4036 |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4037 MB_PTR_ADV(p); |
| 423 | 4038 if (end_tag) |
|
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 a '/' after the '<' |
| 423 | 4040 return *p == '/'; |
| 4041 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4042 // check that there is no '/' after the '<' |
| 423 | 4043 if (*p == '/') |
| 4044 return FALSE; | |
| 4045 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4046 // check that the matching '>' is not preceded by '/' |
| 423 | 4047 for (;;) |
| 4048 { | |
| 4049 if (inc(&pos) < 0) | |
| 4050 return FALSE; | |
| 4051 c = *ml_get_pos(&pos); | |
| 4052 if (c == '>') | |
| 4053 break; | |
| 4054 lc = c; | |
| 4055 } | |
| 4056 return lc != '/'; | |
| 4057 } | |
| 4058 | |
| 4059 /* | |
| 4060 * Find tag block under the cursor, cursor at end. | |
| 4061 */ | |
| 4062 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4063 current_tagblock( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4064 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4065 long count_arg, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4066 int include) // TRUE == include white space |
| 423 | 4067 { |
| 4068 long count = count_arg; | |
| 4069 long n; | |
| 4070 pos_T old_pos; | |
| 4071 pos_T start_pos; | |
| 4072 pos_T end_pos; | |
| 4073 pos_T old_start, old_end; | |
| 4074 char_u *spat, *epat; | |
| 4075 char_u *p; | |
| 4076 char_u *cp; | |
| 4077 int len; | |
| 4078 int r; | |
| 4079 int do_include = include; | |
| 4080 int save_p_ws = p_ws; | |
| 4081 int retval = FAIL; | |
| 6661 | 4082 int is_inclusive = TRUE; |
| 423 | 4083 |
| 4084 p_ws = FALSE; | |
| 4085 | |
| 4086 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
|
4087 old_end = curwin->w_cursor; // remember where we started |
| 423 | 4088 old_start = old_end; |
| 1527 | 4089 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
|
4090 decl(&old_end); // old_end is inclusive |
| 423 | 4091 |
| 4092 /* | |
| 435 | 4093 * If we start on "<aaa>" select that block. |
| 423 | 4094 */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4095 if (!VIsual_active || EQUAL_POS(VIsual, curwin->w_cursor)) |
| 423 | 4096 { |
| 4097 setpcmark(); | |
| 4098 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4099 // ignore indent |
| 423 | 4100 while (inindent(1)) |
| 4101 if (inc_cursor() != 0) | |
| 4102 break; | |
| 4103 | |
| 4104 if (in_html_tag(FALSE)) | |
| 4105 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4106 // cursor on start tag, move to its '>' |
| 423 | 4107 while (*ml_get_cursor() != '>') |
| 4108 if (inc_cursor() < 0) | |
| 4109 break; | |
| 4110 } | |
| 4111 else if (in_html_tag(TRUE)) | |
| 4112 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4113 // cursor on end tag, move to just before it |
| 423 | 4114 while (*ml_get_cursor() != '<') |
| 4115 if (dec_cursor() < 0) | |
| 4116 break; | |
| 4117 dec_cursor(); | |
| 4118 old_end = curwin->w_cursor; | |
| 4119 } | |
| 4120 } | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4121 else if (LT_POS(VIsual, curwin->w_cursor)) |
| 423 | 4122 { |
| 4123 old_start = VIsual; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4124 curwin->w_cursor = VIsual; // cursor at low end of Visual |
| 423 | 4125 } |
| 4126 else | |
| 4127 old_end = VIsual; | |
| 4128 | |
| 4129 again: | |
| 4130 /* | |
| 4131 * Search backwards for unclosed "<aaa>". | |
| 4132 * Put this position in start_pos. | |
| 4133 */ | |
| 4134 for (n = 0; n < count; ++n) | |
| 4135 { | |
| 435 | 4136 if (do_searchpair((char_u *)"<[^ \t>/!]\\+\\%(\\_s\\_[^>]\\{-}[^/]>\\|$\\|\\_s\\=>\\)", |
| 423 | 4137 (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
|
4138 (char_u *)"</[^>]*>", BACKWARD, NULL, 0, |
| 1496 | 4139 NULL, (linenr_T)0, 0L) <= 0) |
| 423 | 4140 { |
| 4141 curwin->w_cursor = old_pos; | |
| 4142 goto theend; | |
| 4143 } | |
| 4144 } | |
| 4145 start_pos = curwin->w_cursor; | |
| 4146 | |
| 4147 /* | |
| 4148 * Search for matching "</aaa>". First isolate the "aaa". | |
| 4149 */ | |
| 4150 inc_cursor(); | |
| 4151 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
|
4152 for (cp = p; *cp != NUL && *cp != '>' && !VIM_ISWHITE(*cp); MB_PTR_ADV(cp)) |
| 423 | 4153 ; |
| 835 | 4154 len = (int)(cp - p); |
| 423 | 4155 if (len == 0) |
| 4156 { | |
| 4157 curwin->w_cursor = old_pos; | |
| 4158 goto theend; | |
| 4159 } | |
| 3306 | 4160 spat = alloc(len + 31); |
| 423 | 4161 epat = alloc(len + 9); |
| 4162 if (spat == NULL || epat == NULL) | |
| 4163 { | |
| 4164 vim_free(spat); | |
| 4165 vim_free(epat); | |
| 4166 curwin->w_cursor = old_pos; | |
| 4167 goto theend; | |
| 4168 } | |
| 3306 | 4169 sprintf((char *)spat, "<%.*s\\>\\%%(\\s\\_[^>]\\{-}[^/]>\\|>\\)\\c", len, p); |
| 423 | 4170 sprintf((char *)epat, "</%.*s>\\c", len, p); |
| 4171 | |
|
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
|
4172 r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL, |
| 1496 | 4173 0, NULL, (linenr_T)0, 0L); |
| 423 | 4174 |
| 4175 vim_free(spat); | |
| 4176 vim_free(epat); | |
| 4177 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4178 if (r < 1 || LT_POS(curwin->w_cursor, old_end)) |
| 423 | 4179 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4180 // 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
|
4181 // 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
|
4182 // another starting tag. |
| 423 | 4183 count = 1; |
| 4184 curwin->w_cursor = start_pos; | |
| 4185 goto again; | |
| 4186 } | |
| 4187 | |
|
13762
9de2b25932eb
patch 8.0.1753: various warnings from a static analyser
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
4188 if (do_include) |
| 423 | 4189 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4190 // Include up to the '>'. |
| 423 | 4191 while (*ml_get_cursor() != '>') |
| 4192 if (inc_cursor() < 0) | |
| 4193 break; | |
| 4194 } | |
| 4195 else | |
| 4196 { | |
| 6661 | 4197 char_u *c = ml_get_cursor(); |
| 4198 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4199 // 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
|
4200 // 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
|
4201 // make operation exclusive, so that the linefeed will be selected |
| 6661 | 4202 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
|
4203 // do not decrement cursor |
| 6661 | 4204 is_inclusive = FALSE; |
| 4205 else if (*c == '<') | |
| 423 | 4206 dec_cursor(); |
| 4207 } | |
| 4208 end_pos = curwin->w_cursor; | |
| 4209 | |
| 4210 if (!do_include) | |
| 4211 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4212 // Exclude the start tag. |
| 423 | 4213 curwin->w_cursor = start_pos; |
| 4214 while (inc_cursor() >= 0) | |
| 1290 | 4215 if (*ml_get_cursor() == '>') |
| 423 | 4216 { |
| 4217 inc_cursor(); | |
| 4218 start_pos = curwin->w_cursor; | |
| 4219 break; | |
| 4220 } | |
| 4221 curwin->w_cursor = end_pos; | |
| 4222 | |
|
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
|
4223 // 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
|
4224 // "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
|
4225 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
|
4226 && EQUAL_POS(end_pos, old_end)) |
| 423 | 4227 { |
| 4228 do_include = TRUE; | |
| 4229 curwin->w_cursor = old_start; | |
| 4230 count = count_arg; | |
| 4231 goto again; | |
| 4232 } | |
| 4233 } | |
| 4234 | |
| 4235 if (VIsual_active) | |
| 4236 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4237 // 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
|
4238 // 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
|
4239 if (LT_POS(end_pos, start_pos)) |
| 1290 | 4240 curwin->w_cursor = start_pos; |
| 4241 else if (*p_sel == 'e') | |
| 6434 | 4242 inc_cursor(); |
| 423 | 4243 VIsual = start_pos; |
| 4244 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4245 redraw_curbuf_later(INVERTED); // update the inversion |
| 423 | 4246 showmode(); |
| 4247 } | |
| 4248 else | |
| 4249 { | |
| 4250 oap->start = start_pos; | |
| 4251 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
|
4252 if (LT_POS(end_pos, start_pos)) |
| 1290 | 4253 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4254 // 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
|
4255 // on an empty area. |
| 1290 | 4256 curwin->w_cursor = start_pos; |
| 4257 oap->inclusive = FALSE; | |
| 4258 } | |
| 4259 else | |
| 6661 | 4260 oap->inclusive = is_inclusive; |
| 423 | 4261 } |
| 4262 retval = OK; | |
| 4263 | |
| 4264 theend: | |
| 4265 p_ws = save_p_ws; | |
| 4266 return retval; | |
| 4267 } | |
| 4268 | |
| 7 | 4269 int |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4270 current_par( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4271 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4272 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4273 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
|
4274 int type) // 'p' for paragraph, 'S' for section |
| 7 | 4275 { |
| 4276 linenr_T start_lnum; | |
| 4277 linenr_T end_lnum; | |
| 4278 int white_in_front; | |
| 4279 int dir; | |
| 4280 int start_is_white; | |
| 4281 int prev_start_is_white; | |
| 4282 int retval = OK; | |
| 4283 int do_white = FALSE; | |
| 4284 int t; | |
| 4285 int i; | |
| 4286 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4287 if (type == 'S') // not implemented yet |
| 7 | 4288 return FAIL; |
| 4289 | |
| 4290 start_lnum = curwin->w_cursor.lnum; | |
| 4291 | |
| 4292 /* | |
| 4293 * When visual area is more than one line: extend it. | |
| 4294 */ | |
| 4295 if (VIsual_active && start_lnum != VIsual.lnum) | |
| 4296 { | |
| 4297 extend: | |
| 4298 if (start_lnum < VIsual.lnum) | |
| 4299 dir = BACKWARD; | |
| 4300 else | |
| 4301 dir = FORWARD; | |
| 4302 for (i = count; --i >= 0; ) | |
| 4303 { | |
| 4304 if (start_lnum == | |
| 4305 (dir == BACKWARD ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4306 { | |
| 4307 retval = FAIL; | |
| 4308 break; | |
| 4309 } | |
| 4310 | |
| 4311 prev_start_is_white = -1; | |
| 4312 for (t = 0; t < 2; ++t) | |
| 4313 { | |
| 4314 start_lnum += dir; | |
| 4315 start_is_white = linewhite(start_lnum); | |
| 4316 if (prev_start_is_white == start_is_white) | |
| 4317 { | |
| 4318 start_lnum -= dir; | |
| 4319 break; | |
| 4320 } | |
| 4321 for (;;) | |
| 4322 { | |
| 4323 if (start_lnum == (dir == BACKWARD | |
| 4324 ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4325 break; | |
| 4326 if (start_is_white != linewhite(start_lnum + dir) | |
| 4327 || (!start_is_white | |
| 4328 && startPS(start_lnum + (dir > 0 | |
| 4329 ? 1 : 0), 0, 0))) | |
| 4330 break; | |
| 4331 start_lnum += dir; | |
| 4332 } | |
| 4333 if (!include) | |
| 4334 break; | |
| 4335 if (start_lnum == (dir == BACKWARD | |
| 4336 ? 1 : curbuf->b_ml.ml_line_count)) | |
| 4337 break; | |
| 4338 prev_start_is_white = start_is_white; | |
| 4339 } | |
| 4340 } | |
| 4341 curwin->w_cursor.lnum = start_lnum; | |
| 4342 curwin->w_cursor.col = 0; | |
| 4343 return retval; | |
| 4344 } | |
| 4345 | |
| 4346 /* | |
| 4347 * First move back to the start_lnum of the paragraph or white lines | |
| 4348 */ | |
| 4349 white_in_front = linewhite(start_lnum); | |
| 4350 while (start_lnum > 1) | |
| 4351 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4352 if (white_in_front) // stop at first white line |
| 7 | 4353 { |
| 4354 if (!linewhite(start_lnum - 1)) | |
| 4355 break; | |
| 4356 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4357 else // stop at first non-white line of start of paragraph |
| 7 | 4358 { |
| 4359 if (linewhite(start_lnum - 1) || startPS(start_lnum, 0, 0)) | |
| 4360 break; | |
| 4361 } | |
| 4362 --start_lnum; | |
| 4363 } | |
| 4364 | |
| 4365 /* | |
| 4366 * Move past the end of any white lines. | |
| 4367 */ | |
| 4368 end_lnum = start_lnum; | |
| 692 | 4369 while (end_lnum <= curbuf->b_ml.ml_line_count && linewhite(end_lnum)) |
| 4370 ++end_lnum; | |
| 7 | 4371 |
| 4372 --end_lnum; | |
| 4373 i = count; | |
| 4374 if (!include && white_in_front) | |
| 4375 --i; | |
| 4376 while (i--) | |
| 4377 { | |
| 4378 if (end_lnum == curbuf->b_ml.ml_line_count) | |
| 4379 return FAIL; | |
| 4380 | |
| 4381 if (!include) | |
| 4382 do_white = linewhite(end_lnum + 1); | |
| 4383 | |
| 4384 if (include || !do_white) | |
| 4385 { | |
| 4386 ++end_lnum; | |
| 4387 /* | |
| 4388 * skip to end of paragraph | |
| 4389 */ | |
| 4390 while (end_lnum < curbuf->b_ml.ml_line_count | |
| 4391 && !linewhite(end_lnum + 1) | |
| 4392 && !startPS(end_lnum + 1, 0, 0)) | |
| 4393 ++end_lnum; | |
| 4394 } | |
| 4395 | |
| 4396 if (i == 0 && white_in_front && include) | |
| 4397 break; | |
| 4398 | |
| 4399 /* | |
| 4400 * skip to end of white lines after paragraph | |
| 4401 */ | |
| 4402 if (include || do_white) | |
| 4403 while (end_lnum < curbuf->b_ml.ml_line_count | |
| 4404 && linewhite(end_lnum + 1)) | |
| 4405 ++end_lnum; | |
| 4406 } | |
| 4407 | |
| 4408 /* | |
| 4409 * If there are no empty lines at the end, try to find some empty lines at | |
| 4410 * the start (unless that has been done already). | |
| 4411 */ | |
| 4412 if (!white_in_front && !linewhite(end_lnum) && include) | |
| 4413 while (start_lnum > 1 && linewhite(start_lnum - 1)) | |
| 4414 --start_lnum; | |
| 4415 | |
| 4416 if (VIsual_active) | |
| 4417 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4418 // 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
|
4419 // line, we get stuck there. Trap this here. |
| 7 | 4420 if (VIsual_mode == 'V' && start_lnum == curwin->w_cursor.lnum) |
| 4421 goto extend; | |
|
10881
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4422 if (VIsual.lnum != start_lnum) |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4423 { |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4424 VIsual.lnum = start_lnum; |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4425 VIsual.col = 0; |
|
8f6df2f6d2fc
patch 8.0.0330: illegal memory access after "vapo"
Christian Brabandt <cb@256bit.org>
parents:
10430
diff
changeset
|
4426 } |
| 7 | 4427 VIsual_mode = 'V'; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4428 redraw_curbuf_later(INVERTED); // update the inversion |
| 7 | 4429 showmode(); |
| 4430 } | |
| 4431 else | |
| 4432 { | |
| 4433 oap->start.lnum = start_lnum; | |
| 4434 oap->start.col = 0; | |
| 4435 oap->motion_type = MLINE; | |
| 4436 } | |
| 4437 curwin->w_cursor.lnum = end_lnum; | |
| 4438 curwin->w_cursor.col = 0; | |
| 4439 | |
| 4440 return OK; | |
| 4441 } | |
| 12 | 4442 |
| 4443 /* | |
| 4444 * Search quote char from string line[col]. | |
| 4445 * Quote character escaped by one of the characters in "escape" is not counted | |
| 4446 * as a quote. | |
| 4447 * Returns column number of "quotechar" or -1 when not found. | |
| 4448 */ | |
| 4449 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4450 find_next_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4451 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4452 int col, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4453 int quotechar, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4454 char_u *escape) // escape characters, can be NULL |
| 12 | 4455 { |
| 4456 int c; | |
| 4457 | |
| 408 | 4458 for (;;) |
| 12 | 4459 { |
| 4460 c = line[col]; | |
| 4461 if (c == NUL) | |
| 4462 return -1; | |
| 4463 else if (escape != NULL && vim_strchr(escape, c)) | |
| 4464 ++col; | |
| 4465 else if (c == quotechar) | |
| 4466 break; | |
| 4467 if (has_mbyte) | |
| 474 | 4468 col += (*mb_ptr2len)(line + col); |
| 12 | 4469 else |
| 4470 ++col; | |
| 4471 } | |
| 4472 return col; | |
| 4473 } | |
| 4474 | |
| 4475 /* | |
| 4476 * Search backwards in "line" from column "col_start" to find "quotechar". | |
| 4477 * Quote character escaped by one of the characters in "escape" is not counted | |
| 4478 * as a quote. | |
| 4479 * Return the found column or zero. | |
| 4480 */ | |
| 4481 static int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4482 find_prev_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4483 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4484 int col_start, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4485 int quotechar, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4486 char_u *escape) // escape characters, can be NULL |
| 12 | 4487 { |
| 4488 int n; | |
| 4489 | |
| 4490 while (col_start > 0) | |
| 4491 { | |
| 4492 --col_start; | |
| 4493 col_start -= (*mb_head_off)(line, line + col_start); | |
| 4494 n = 0; | |
| 4495 if (escape != NULL) | |
| 4496 while (col_start - n > 0 && vim_strchr(escape, | |
| 4497 line[col_start - n - 1]) != NULL) | |
| 4498 ++n; | |
| 4499 if (n & 1) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4500 col_start -= n; // uneven number of escape chars, skip it |
| 12 | 4501 else if (line[col_start] == quotechar) |
| 4502 break; | |
| 4503 } | |
| 4504 return col_start; | |
| 4505 } | |
| 4506 | |
| 4507 /* | |
| 4508 * Find quote under the cursor, cursor at end. | |
| 4509 * Returns TRUE if found, else FALSE. | |
| 4510 */ | |
| 4511 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4512 current_quote( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4513 oparg_T *oap, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4514 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
|
4515 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
|
4516 int quotechar) // Quote character |
| 12 | 4517 { |
| 4518 char_u *line = ml_get_curline(); | |
| 4519 int col_end; | |
| 4520 int col_start = curwin->w_cursor.col; | |
| 4521 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
|
4522 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
|
4523 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
|
4524 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
|
4525 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
|
4526 int selected_quote = FALSE; // Has quote inside selection |
| 527 | 4527 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
|
4528 int restore_vis_bef = FALSE; // restore VIsual on abort |
| 12 | 4529 |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4530 // 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
|
4531 // 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
|
4532 // The cursor then is moved forward after adjusting the area. |
| 12 | 4533 if (VIsual_active) |
| 4534 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4535 // 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
|
4536 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
|
4537 return FALSE; |
|
9b4574d95571
patch 8.0.0339: illegal memory access with vi'
Christian Brabandt <cb@256bit.org>
parents:
10881
diff
changeset
|
4538 |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4539 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
|
4540 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
|
4541 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
|
4542 { |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4543 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
|
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 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
|
4546 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
|
4547 } |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4548 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
|
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 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
|
4551 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
|
4552 } |
|
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4553 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
|
4554 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
|
4555 { |
|
15930
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4556 // 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
|
4557 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
|
4558 |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4559 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
|
4560 VIsual = t; |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4561 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
|
4562 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
|
4563 } |
|
29a781fd3f27
patch 8.0.0622: selecting quoted text fails with 'selection' "exclusive"
Christian Brabandt <cb@256bit.org>
parents:
11476
diff
changeset
|
4564 } |
| 12 | 4565 } |
| 527 | 4566 |
| 4567 if (!vis_empty) | |
| 4568 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4569 // 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
|
4570 // quotes. |
| 527 | 4571 if (vis_bef_curs) |
| 4572 { | |
| 4573 inside_quotes = VIsual.col > 0 | |
| 4574 && line[VIsual.col - 1] == quotechar | |
| 4575 && line[curwin->w_cursor.col] != NUL | |
| 4576 && line[curwin->w_cursor.col + 1] == quotechar; | |
| 4577 i = VIsual.col; | |
| 4578 col_end = curwin->w_cursor.col; | |
| 4579 } | |
| 4580 else | |
| 4581 { | |
| 4582 inside_quotes = curwin->w_cursor.col > 0 | |
| 4583 && line[curwin->w_cursor.col - 1] == quotechar | |
| 4584 && line[VIsual.col] != NUL | |
| 4585 && line[VIsual.col + 1] == quotechar; | |
| 4586 i = curwin->w_cursor.col; | |
| 4587 col_end = VIsual.col; | |
| 4588 } | |
| 4589 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4590 // Find out if we have a quote in the selection. |
| 527 | 4591 while (i <= col_end) |
| 4592 if (line[i++] == quotechar) | |
| 4593 { | |
| 4594 selected_quote = TRUE; | |
| 4595 break; | |
| 4596 } | |
| 4597 } | |
| 4598 | |
| 12 | 4599 if (!vis_empty && line[col_start] == quotechar) |
| 4600 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4601 // 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
|
4602 // next quoted string. |
| 12 | 4603 if (vis_bef_curs) |
| 4604 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4605 // 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
|
4606 // opening quote. |
| 12 | 4607 col_start = find_next_quote(line, col_start + 1, quotechar, NULL); |
| 4608 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
|
4609 goto abort_search; |
| 12 | 4610 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4611 curbuf->b_p_qe); | |
| 4612 if (col_end < 0) | |
| 4613 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4614 // We were on a starting quote perhaps? |
| 12 | 4615 col_end = col_start; |
| 4616 col_start = curwin->w_cursor.col; | |
| 4617 } | |
| 4618 } | |
| 4619 else | |
| 4620 { | |
| 4621 col_end = find_prev_quote(line, col_start, quotechar, NULL); | |
| 4622 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
|
4623 goto abort_search; |
| 12 | 4624 col_start = find_prev_quote(line, col_end, quotechar, |
| 4625 curbuf->b_p_qe); | |
| 4626 if (line[col_start] != quotechar) | |
| 4627 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4628 // We were on an ending quote perhaps? |
| 12 | 4629 col_start = col_end; |
| 4630 col_end = curwin->w_cursor.col; | |
| 4631 } | |
| 4632 } | |
| 4633 } | |
| 4634 else | |
| 5735 | 4635 |
| 4636 if (line[col_start] == quotechar || !vis_empty) | |
| 12 | 4637 { |
| 4638 int first_col = col_start; | |
| 4639 | |
| 4640 if (!vis_empty) | |
| 4641 { | |
| 4642 if (vis_bef_curs) | |
| 4643 first_col = find_next_quote(line, col_start, quotechar, NULL); | |
| 4644 else | |
| 4645 first_col = find_prev_quote(line, col_start, quotechar, NULL); | |
| 4646 } | |
| 5735 | 4647 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4648 // 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
|
4649 // 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
|
4650 // 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
|
4651 // in between two strings. |
| 12 | 4652 col_start = 0; |
| 408 | 4653 for (;;) |
| 12 | 4654 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4655 // Find open quote character. |
| 12 | 4656 col_start = find_next_quote(line, col_start, quotechar, NULL); |
| 4657 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
|
4658 goto abort_search; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4659 // Find close quote character. |
| 12 | 4660 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4661 curbuf->b_p_qe); | |
| 4662 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
|
4663 goto abort_search; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4664 // 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
|
4665 // target text object. |
| 12 | 4666 if (col_start <= first_col && first_col <= col_end) |
| 4667 break; | |
| 4668 col_start = col_end + 1; | |
| 4669 } | |
| 4670 } | |
| 4671 else | |
| 4672 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4673 // Search backward for a starting quote. |
| 12 | 4674 col_start = find_prev_quote(line, col_start, quotechar, curbuf->b_p_qe); |
| 4675 if (line[col_start] != quotechar) | |
| 4676 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4677 // No quote before the cursor, look after the cursor. |
| 12 | 4678 col_start = find_next_quote(line, col_start, quotechar, NULL); |
| 4679 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
|
4680 goto abort_search; |
| 12 | 4681 } |
| 4682 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4683 // Find close quote character. |
| 12 | 4684 col_end = find_next_quote(line, col_start + 1, quotechar, |
| 4685 curbuf->b_p_qe); | |
| 4686 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
|
4687 goto abort_search; |
| 12 | 4688 } |
| 4689 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4690 // 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
|
4691 // the starting quote. |
| 12 | 4692 if (include) |
| 4693 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4694 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
|
4695 while (VIM_ISWHITE(line[col_end + 1])) |
| 12 | 4696 ++col_end; |
| 4697 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4698 while (col_start > 0 && VIM_ISWHITE(line[col_start - 1])) |
| 12 | 4699 --col_start; |
| 4700 } | |
| 4701 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4702 // 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
|
4703 // For v2i" include the quotes. |
| 5735 | 4704 if (!include && count < 2 && (vis_empty || !inside_quotes)) |
| 12 | 4705 ++col_start; |
| 4706 curwin->w_cursor.col = col_start; | |
| 4707 if (VIsual_active) | |
| 4708 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4709 // 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
|
4710 // 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
|
4711 // and didn't include a quote. |
| 527 | 4712 if (vis_empty |
| 4713 || (vis_bef_curs | |
| 4714 && !selected_quote | |
| 4715 && (inside_quotes | |
| 4716 || (line[VIsual.col] != quotechar | |
| 4717 && (VIsual.col == 0 | |
| 4718 || line[VIsual.col - 1] != quotechar))))) | |
| 12 | 4719 { |
| 4720 VIsual = curwin->w_cursor; | |
| 4721 redraw_curbuf_later(INVERTED); | |
| 4722 } | |
| 4723 } | |
| 4724 else | |
| 4725 { | |
| 4726 oap->start = curwin->w_cursor; | |
| 4727 oap->motion_type = MCHAR; | |
| 4728 } | |
| 4729 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4730 // Set end position. |
| 12 | 4731 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
|
4732 if ((include || count > 1 // After vi" another i" must include the ". |
| 527 | 4733 || (!vis_empty && inside_quotes) |
| 4734 ) && inc_cursor() == 2) | |
| 12 | 4735 inclusive = TRUE; |
| 4736 if (VIsual_active) | |
| 4737 { | |
| 4738 if (vis_empty || vis_bef_curs) | |
| 4739 { | |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4740 // decrement cursor when 'selection' is not exclusive |
| 12 | 4741 if (*p_sel != 'e') |
| 4742 dec_cursor(); | |
| 4743 } | |
| 4744 else | |
| 4745 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4746 // 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
|
4747 // 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
|
4748 // quote. |
| 527 | 4749 if (inside_quotes |
| 4750 || (!selected_quote | |
| 4751 && line[VIsual.col] != quotechar | |
| 4752 && (line[VIsual.col] == NUL | |
| 4753 || line[VIsual.col + 1] != quotechar))) | |
| 4754 { | |
| 4755 dec_cursor(); | |
| 4756 VIsual = curwin->w_cursor; | |
| 4757 } | |
| 12 | 4758 curwin->w_cursor.col = col_start; |
| 4759 } | |
| 4760 if (VIsual_mode == 'V') | |
| 4761 { | |
| 4762 VIsual_mode = 'v'; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4763 redraw_cmdline = TRUE; // show mode later |
| 12 | 4764 } |
| 4765 } | |
| 4766 else | |
| 4767 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4768 // Set inclusive and other oap's flags. |
| 12 | 4769 oap->inclusive = inclusive; |
| 4770 } | |
| 4771 | |
| 4772 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
|
4773 |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4774 abort_search: |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4775 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
|
4776 { |
|
18677
953e83e09e78
patch 8.1.2330: vi' does not always work when 'selection' is exclusive
Bram Moolenaar <Bram@vim.org>
parents:
18644
diff
changeset
|
4777 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
|
4778 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
|
4779 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
|
4780 { |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4781 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
|
4782 |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4783 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
|
4784 VIsual = t; |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4785 } |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4786 } |
|
e580c9d75443
patch 8.1.0971: failure for selecting quoted text object moves cursor
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
4787 return FALSE; |
| 12 | 4788 } |
| 4789 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4790 #endif // FEAT_TEXTOBJ |
| 7 | 4791 |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4792 /* |
|
18448
35e0ab1f2975
patch 8.1.2218: "gN" is off by one in Visual mode
Bram Moolenaar <Bram@vim.org>
parents:
18426
diff
changeset
|
4793 * 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
|
4794 * 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
|
4795 * "cur". |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4796 * "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
|
4797 * 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
|
4798 */ |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4799 static int |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4800 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
|
4801 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4802 regmmatch_T regmatch; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4803 int nmatched = 0; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4804 int result = -1; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4805 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
|
4806 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
|
4807 int flag = 0; |
|
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 (pattern == NULL) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4810 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
|
4811 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4812 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
|
4813 SEARCH_KEEP, ®match) == FAIL) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4814 return -1; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4815 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4816 // init startcol correctly |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4817 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
|
4818 // move to match |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4819 if (move) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4820 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4821 CLEAR_POS(&pos); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4822 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4823 else |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4824 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4825 pos = *cur; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4826 // 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
|
4827 flag = SEARCH_START; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4828 } |
|
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 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
|
4831 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
|
4832 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4833 // 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
|
4834 // 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
|
4835 do |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4836 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4837 regmatch.startpos[0].col++; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4838 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
|
4839 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
|
4840 if (nmatched != 0) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4841 break; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4842 } 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
|
4843 : 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
|
4844 |
|
18949
5c405689da3e
patch 8.2.0035: saving and restoring called_emsg is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
18812
diff
changeset
|
4845 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
|
4846 { |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4847 result = (nmatched != 0 |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4848 && 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
|
4849 && 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
|
4850 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4851 } |
|
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 vim_regfree(regmatch.regprog); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4854 return result; |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4855 } |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4856 |
| 3755 | 4857 |
| 3718 | 4858 /* |
| 4859 * Find next search match under cursor, cursor at end. | |
| 4860 * Used while an operator is pending, and in Visual mode. | |
| 4861 */ | |
| 4862 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4863 current_search( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4864 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
|
4865 int forward) // TRUE for forward, FALSE for backward |
| 3718 | 4866 { |
|
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
|
4867 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
|
4868 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
|
4869 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
|
4870 pos_T pos; // position after the pattern |
| 3718 | 4871 int i; |
| 4872 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
|
4873 int result; // result of various function calls |
| 3718 | 4874 char_u old_p_ws = p_ws; |
| 4875 int flags = 0; | |
|
5210
839ebe7c1b2f
updated for version 7.4a.031
Bram Moolenaar <bram@vim.org>
parents:
5118
diff
changeset
|
4876 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
|
4877 int zero_width; |
| 3718 | 4878 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4879 // 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
|
4880 if (VIsual_active && *p_sel == 'e' && LT_POS(VIsual, curwin->w_cursor)) |
| 3718 | 4881 dec_cursor(); |
| 4882 | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4883 orig_pos = pos = curwin->w_cursor; |
| 3718 | 4884 if (VIsual_active) |
| 4885 { | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4886 if (forward) |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4887 incl(&pos); |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4888 else |
|
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4889 decl(&pos); |
| 3718 | 4890 } |
| 4891 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4892 // 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
|
4893 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
|
4894 FORWARD); |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4895 if (zero_width == -1) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4896 return FAIL; // pattern not found |
| 3732 | 4897 |
| 4898 /* | |
| 3718 | 4899 * The trick is to first search backwards and then search forward again, |
| 4900 * so that a match at the current cursor position will be correctly | |
| 4901 * captured. | |
| 4902 */ | |
| 4903 for (i = 0; i < 2; i++) | |
| 4904 { | |
| 4905 if (forward) | |
| 4906 dir = i; | |
| 4907 else | |
| 4908 dir = !i; | |
| 3732 | 4909 |
| 4910 flags = 0; | |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4911 if (!dir && !zero_width) |
| 3732 | 4912 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
|
4913 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
|
4914 |
|
18500
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4915 // 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
|
4916 if (i == 0) |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4917 p_ws = FALSE; |
|
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4918 |
|
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
|
4919 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
|
4920 (dir ? FORWARD : BACKWARD), |
| 3718 | 4921 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
|
4922 SEARCH_KEEP | flags, RE_SEARCH, NULL); |
| 3718 | 4923 |
|
18500
c0445cb7cfe0
patch 8.1.2244: 'wrapscan' is not used for "gn"
Bram Moolenaar <Bram@vim.org>
parents:
18448
diff
changeset
|
4924 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
|
4925 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4926 // 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
|
4927 // 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
|
4928 // 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
|
4929 // selection works. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4930 if (i == 1 && !result) // not found, abort |
| 3718 | 4931 { |
| 4932 curwin->w_cursor = orig_pos; | |
| 4933 if (VIsual_active) | |
| 4934 VIsual = save_VIsual; | |
| 4935 return FAIL; | |
| 4936 } | |
|
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
|
4937 else if (i == 0 && !result) |
| 3718 | 4938 { |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4939 if (forward) |
| 3718 | 4940 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4941 // 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
|
4942 CLEAR_POS(&pos); |
| 3718 | 4943 } |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11117
diff
changeset
|
4944 else |
| 3718 | 4945 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4946 // 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
|
4947 // searching backwards, so set pos to last line and col |
| 3718 | 4948 pos.lnum = curwin->w_buffer->b_ml.ml_line_count; |
| 3724 | 4949 pos.col = (colnr_T)STRLEN( |
| 4950 ml_get(curwin->w_buffer->b_ml.ml_line_count)); | |
| 3718 | 4951 } |
| 4952 } | |
| 4953 } | |
| 4954 | |
| 4955 start_pos = pos; | |
| 4956 | |
| 4957 if (!VIsual_active) | |
| 4958 VIsual = start_pos; | |
| 4959 | |
|
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 // 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
|
4961 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
|
4962 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
|
4963 dec_cursor(); |
|
18426
3b80bdbdc832
patch 8.1.2207: "gn" doesn't work quite right
Bram Moolenaar <Bram@vim.org>
parents:
18368
diff
changeset
|
4964 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
|
4965 curwin->w_cursor = pos; // put the cursor on the start of the match |
| 3718 | 4966 VIsual_active = TRUE; |
| 4967 VIsual_mode = 'v'; | |
| 4968 | |
|
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 (*p_sel == 'e') |
| 3718 | 4970 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4971 // 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
|
4972 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
|
4973 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
|
4974 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
|
4975 inc(&VIsual); |
| 3718 | 4976 } |
| 4977 | |
| 4978 #ifdef FEAT_FOLDING | |
| 4979 if (fdo_flags & FDO_SEARCH && KeyTyped) | |
| 4980 foldOpenCursor(); | |
| 4981 #endif | |
| 4982 | |
| 4983 may_start_select('c'); | |
| 4984 setmouse(); | |
| 4985 #ifdef FEAT_CLIPBOARD | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
4986 // 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
|
4987 // end are still the same, and the selection needs to be owned |
| 3718 | 4988 clip_star.vmode = NUL; |
| 4989 #endif | |
| 4990 redraw_curbuf_later(INVERTED); | |
| 4991 showmode(); | |
| 4992 | |
| 4993 return OK; | |
| 4994 } | |
| 3755 | 4995 |
| 7 | 4996 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \ |
| 4997 || defined(PROTO) | |
| 4998 /* | |
| 4999 * return TRUE if line 'lnum' is empty or has white chars only. | |
| 5000 */ | |
| 5001 int | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5002 linewhite(linenr_T lnum) |
| 7 | 5003 { |
| 5004 char_u *p; | |
| 5005 | |
| 5006 p = skipwhite(ml_get(lnum)); | |
| 5007 return (*p == NUL); | |
| 5008 } | |
| 5009 #endif | |
| 5010 | |
|
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 * 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
|
5013 * 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
|
5014 */ |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5015 static void |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5016 search_stat( |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5017 int dirc, |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5018 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
|
5019 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
|
5020 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
|
5021 int recompute) |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5022 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5023 int save_ws = p_ws; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5024 int wraparound = FALSE; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5025 pos_T p = (*pos); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5026 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
|
5027 static int cur = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5028 static int cnt = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5029 static int chgtick = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5030 static char_u *lastpat = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5031 static buf_T *lbuf = NULL; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5032 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5033 proftime_T start; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5034 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5035 #define OUT_OF_TIME 999 |
|
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 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
|
5038 || (dirc == '/' && LT_POS(p, lastpos))); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5039 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5040 // 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
|
5041 // 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
|
5042 // 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
|
5043 if (!(chgtick == CHANGEDTICK(curbuf) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5044 && 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
|
5045 && 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
|
5046 && 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
|
5047 && 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
|
5048 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5049 cur = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5050 cnt = 0; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5051 CLEAR_POS(&lastpos); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5052 lbuf = curbuf; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5053 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5054 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5055 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
|
5056 && (dirc == '/' ? cur < cnt : cur > 0)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5057 cur += dirc == '/' ? 1 : -1; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5058 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5059 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5060 p_ws = FALSE; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5061 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5062 profile_setlimit(20L, &start); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5063 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5064 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
|
5065 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
|
5066 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5067 #ifdef FEAT_RELTIME |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5068 // 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
|
5069 if (profile_passed_limit(&start)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5070 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5071 cnt = OUT_OF_TIME; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5072 cur = OUT_OF_TIME; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5073 break; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5074 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5075 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5076 cnt++; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5077 if (LTOREQ_POS(lastpos, p)) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5078 cur++; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5079 fast_breakcheck(); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5080 if (cnt > 99) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5081 break; |
|
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 (got_int) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5084 cur = -1; // abort |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5085 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5086 if (cur > 0) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5087 { |
|
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
|
5088 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
|
5089 size_t len; |
|
16533
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 #ifdef FEAT_RIGHTLEFT |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5092 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
|
5093 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 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
|
5100 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
|
5101 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
|
5102 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5103 else |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5104 #endif |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5105 { |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5106 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
|
5107 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
|
5108 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
|
5109 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
|
5110 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
|
5111 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
|
5112 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
|
5113 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
|
5114 } |
|
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 |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5116 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
|
5117 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
|
5118 { |
|
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
|
5119 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
|
5120 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
|
5121 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
|
5122 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
|
5123 } |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5124 |
|
8d0ea09e2d81
patch 8.1.1283: delaying half a second after the top-bot message
Bram Moolenaar <Bram@vim.org>
parents:
16535
diff
changeset
|
5125 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
|
5126 if (dirc == '?' && cur == 100) |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5127 cur = -1; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5128 |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5129 vim_free(lastpat); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5130 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
|
5131 chgtick = CHANGEDTICK(curbuf); |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5132 lbuf = curbuf; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5133 lastpos = p; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5134 |
|
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 // 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
|
5136 msg_hist_off = TRUE; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5137 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
|
5138 msg_hist_off = FALSE; |
|
16533
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5139 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5140 p_ws = save_ws; |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5141 } |
|
5e25171e0e75
patch 8.1.1270: cannot see current match position
Bram Moolenaar <Bram@vim.org>
parents:
16239
diff
changeset
|
5142 |
| 7 | 5143 #if defined(FEAT_FIND_ID) || defined(PROTO) |
| 5144 /* | |
| 5145 * Find identifiers or defines in included files. | |
| 2719 | 5146 * If p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase. |
| 7 | 5147 */ |
| 5148 void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5149 find_pattern_in_path( |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5150 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
|
5151 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
|
5152 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
|
5153 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
|
5154 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
|
5155 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
|
5156 // a macro? |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5157 long count, |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5158 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
|
5159 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
|
5160 linenr_T end_lnum) // last line for searching |
| 7 | 5161 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5162 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
|
5163 SearchedFile *bigger; // When we need more space |
| 7 | 5164 int max_path_depth = 50; |
| 5165 long match_count = 1; | |
| 5166 | |
| 5167 char_u *pat; | |
| 5168 char_u *new_fname; | |
| 5169 char_u *curr_fname = curbuf->b_fname; | |
| 5170 char_u *prev_fname = NULL; | |
| 5171 linenr_T lnum; | |
| 5172 int depth; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5173 int depth_displayed; // For type==CHECK_PATH |
| 7 | 5174 int old_files; |
| 5175 int already_searched; | |
| 5176 char_u *file_line; | |
| 5177 char_u *line; | |
| 5178 char_u *p; | |
| 5179 char_u save_char; | |
| 5180 int define_matched; | |
| 5181 regmatch_T regmatch; | |
| 5182 regmatch_T incl_regmatch; | |
| 5183 regmatch_T def_regmatch; | |
| 5184 int matched = FALSE; | |
| 5185 int did_show = FALSE; | |
| 5186 int found = FALSE; | |
| 5187 int i; | |
| 5188 char_u *already = NULL; | |
| 5189 char_u *startp = NULL; | |
| 534 | 5190 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
|
5191 #if defined(FEAT_QUICKFIX) |
| 7 | 5192 win_T *curwin_save = NULL; |
| 5193 #endif | |
| 5194 | |
| 5195 regmatch.regprog = NULL; | |
| 5196 incl_regmatch.regprog = NULL; | |
| 5197 def_regmatch.regprog = NULL; | |
| 5198 | |
| 5199 file_line = alloc(LSIZE); | |
| 5200 if (file_line == NULL) | |
| 5201 return; | |
| 5202 | |
| 5203 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
|
5204 // 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
|
5205 // 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
|
5206 && !(compl_cont_status & CONT_SOL)) |
| 7 | 5207 { |
| 5208 pat = alloc(len + 5); | |
| 5209 if (pat == NULL) | |
| 5210 goto fpip_end; | |
| 5211 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
|
5212 // ignore case according to p_ic, p_scs and pat |
| 7 | 5213 regmatch.rm_ic = ignorecase(pat); |
| 5214 regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); | |
| 5215 vim_free(pat); | |
| 5216 if (regmatch.regprog == NULL) | |
| 5217 goto fpip_end; | |
| 5218 } | |
| 534 | 5219 inc_opt = (*curbuf->b_p_inc == NUL) ? p_inc : curbuf->b_p_inc; |
| 5220 if (*inc_opt != NUL) | |
| 7 | 5221 { |
| 534 | 5222 incl_regmatch.regprog = vim_regcomp(inc_opt, p_magic ? RE_MAGIC : 0); |
| 7 | 5223 if (incl_regmatch.regprog == NULL) |
| 5224 goto fpip_end; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5225 incl_regmatch.rm_ic = FALSE; // don't ignore case in incl. pat. |
| 7 | 5226 } |
| 5227 if (type == FIND_DEFINE && (*curbuf->b_p_def != NUL || *p_def != NUL)) | |
| 5228 { | |
| 5229 def_regmatch.regprog = vim_regcomp(*curbuf->b_p_def == NUL | |
| 5230 ? p_def : curbuf->b_p_def, p_magic ? RE_MAGIC : 0); | |
| 5231 if (def_regmatch.regprog == NULL) | |
| 5232 goto fpip_end; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5233 def_regmatch.rm_ic = FALSE; // don't ignore case in define pat. |
| 7 | 5234 } |
|
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
|
5235 files = lalloc_clear(max_path_depth * sizeof(SearchedFile), TRUE); |
| 7 | 5236 if (files == NULL) |
| 5237 goto fpip_end; | |
| 5238 old_files = max_path_depth; | |
| 5239 depth = depth_displayed = -1; | |
| 5240 | |
| 5241 lnum = start_lnum; | |
| 5242 if (end_lnum > curbuf->b_ml.ml_line_count) | |
| 5243 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
|
5244 if (lnum > end_lnum) // do at least one line |
| 7 | 5245 lnum = end_lnum; |
| 5246 line = ml_get(lnum); | |
| 5247 | |
| 5248 for (;;) | |
| 5249 { | |
| 5250 if (incl_regmatch.regprog != NULL | |
| 5251 && vim_regexec(&incl_regmatch, line, (colnr_T)0)) | |
| 5252 { | |
| 534 | 5253 char_u *p_fname = (curr_fname == curbuf->b_fname) |
| 5254 ? curbuf->b_ffname : curr_fname; | |
| 5255 | |
| 5256 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
|
5257 // Use text from '\zs' to '\ze' (or end) of 'include'. |
| 534 | 5258 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
|
5259 (int)(incl_regmatch.endp[0] - incl_regmatch.startp[0]), |
| 534 | 5260 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname); |
| 5261 else | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5262 // Use text after match with 'include'. |
| 534 | 5263 new_fname = file_name_in_line(incl_regmatch.endp[0], 0, |
| 681 | 5264 FNAME_EXP|FNAME_INCL|FNAME_REL, 1L, p_fname, NULL); |
| 7 | 5265 already_searched = FALSE; |
| 5266 if (new_fname != NULL) | |
| 5267 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5268 // Check whether we have already searched in this file |
| 7 | 5269 for (i = 0;; i++) |
| 5270 { | |
| 5271 if (i == depth + 1) | |
| 5272 i = old_files; | |
| 5273 if (i == max_path_depth) | |
| 5274 break; | |
|
16738
b52ea9c5f1db
patch 8.1.1371: cannot recover from a swap file
Bram Moolenaar <Bram@vim.org>
parents:
16696
diff
changeset
|
5275 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
|
5276 & FPC_SAME) |
| 7 | 5277 { |
| 5278 if (type != CHECK_PATH && | |
| 5279 action == ACTION_SHOW_ALL && files[i].matched) | |
| 5280 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5281 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
|
5282 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
|
5283 // typed at "--more--" |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5284 // message |
| 7 | 5285 { |
| 5286 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
|
5287 msg_puts(_(" (includes previously listed match)")); |
| 7 | 5288 prev_fname = NULL; |
| 5289 } | |
| 5290 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13225
diff
changeset
|
5291 VIM_CLEAR(new_fname); |
| 7 | 5292 already_searched = TRUE; |
| 5293 break; | |
| 5294 } | |
| 5295 } | |
| 5296 } | |
| 5297 | |
| 5298 if (type == CHECK_PATH && (action == ACTION_SHOW_ALL | |
| 5299 || (new_fname == NULL && !already_searched))) | |
| 5300 { | |
| 5301 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5302 msg_putchar('\n'); // cursor below last one |
| 7 | 5303 else |
| 5304 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5305 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
|
5306 msg_puts_title(_("--- Included files ")); |
| 7 | 5307 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
|
5308 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
|
5309 msg_puts_title(_("in path ---\n")); |
| 7 | 5310 } |
| 5311 did_show = TRUE; | |
| 5312 while (depth_displayed < depth && !got_int) | |
| 5313 { | |
| 5314 ++depth_displayed; | |
| 5315 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
|
5316 msg_puts(" "); |
| 7 | 5317 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
|
5318 msg_puts(" -->\n"); |
| 7 | 5319 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5320 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
|
5321 // for "--more--" message |
| 7 | 5322 { |
| 5323 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
|
5324 msg_puts(" "); |
| 7 | 5325 if (new_fname != NULL) |
| 5326 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5327 // 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
|
5328 // '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
|
5329 msg_outtrans_attr(new_fname, HL_ATTR(HLF_D)); |
| 7 | 5330 } |
| 5331 else | |
| 5332 { | |
| 5333 /* | |
| 5334 * Isolate the file name. | |
| 5335 * Include the surrounding "" or <> if present. | |
| 5336 */ | |
| 3699 | 5337 if (inc_opt != NULL |
| 5338 && strstr((char *)inc_opt, "\\zs") != NULL) | |
| 5339 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5340 // pattern contains \zs, use the match |
| 3699 | 5341 p = incl_regmatch.startp[0]; |
| 5342 i = (int)(incl_regmatch.endp[0] | |
| 5343 - incl_regmatch.startp[0]); | |
| 5344 } | |
| 5345 else | |
| 5346 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5347 // find the file name after the end of the match |
| 3699 | 5348 for (p = incl_regmatch.endp[0]; |
| 5349 *p && !vim_isfilec(*p); p++) | |
| 5350 ; | |
| 5351 for (i = 0; vim_isfilec(p[i]); i++) | |
| 5352 ; | |
| 5353 } | |
| 5354 | |
| 7 | 5355 if (i == 0) |
| 5356 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5357 // Nothing found, use the rest of the line. |
| 7 | 5358 p = incl_regmatch.endp[0]; |
| 835 | 5359 i = (int)STRLEN(p); |
| 7 | 5360 } |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5361 // 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
|
5362 // happen if \zs appears in the regexp. |
| 3699 | 5363 else if (p > line) |
| 7 | 5364 { |
| 5365 if (p[-1] == '"' || p[-1] == '<') | |
| 5366 { | |
| 5367 --p; | |
| 5368 ++i; | |
| 5369 } | |
| 5370 if (p[i] == '"' || p[i] == '>') | |
| 5371 ++i; | |
| 5372 } | |
| 5373 save_char = p[i]; | |
| 5374 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
|
5375 msg_outtrans_attr(p, HL_ATTR(HLF_D)); |
| 7 | 5376 p[i] = save_char; |
| 5377 } | |
| 5378 | |
| 5379 if (new_fname == NULL && action == ACTION_SHOW_ALL) | |
| 5380 { | |
| 5381 if (already_searched) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5382 msg_puts(_(" (Already listed)")); |
| 7 | 5383 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5384 msg_puts(_(" NOT FOUND")); |
| 7 | 5385 } |
| 5386 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5387 out_flush(); // output each line directly |
| 7 | 5388 } |
| 5389 | |
| 5390 if (new_fname != NULL) | |
| 5391 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5392 // Push the new file onto the file stack |
| 7 | 5393 if (depth + 1 == old_files) |
| 5394 { | |
|
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
|
5395 bigger = ALLOC_MULT(SearchedFile, max_path_depth * 2); |
| 7 | 5396 if (bigger != NULL) |
| 5397 { | |
| 5398 for (i = 0; i <= depth; i++) | |
| 5399 bigger[i] = files[i]; | |
| 5400 for (i = depth + 1; i < old_files + max_path_depth; i++) | |
| 5401 { | |
| 5402 bigger[i].fp = NULL; | |
| 5403 bigger[i].name = NULL; | |
| 5404 bigger[i].lnum = 0; | |
| 5405 bigger[i].matched = FALSE; | |
| 5406 } | |
| 5407 for (i = old_files; i < max_path_depth; i++) | |
| 5408 bigger[i + max_path_depth] = files[i]; | |
| 5409 old_files += max_path_depth; | |
| 5410 max_path_depth *= 2; | |
| 5411 vim_free(files); | |
| 5412 files = bigger; | |
| 5413 } | |
| 5414 } | |
| 5415 if ((files[depth + 1].fp = mch_fopen((char *)new_fname, "r")) | |
| 5416 == NULL) | |
| 5417 vim_free(new_fname); | |
| 5418 else | |
| 5419 { | |
| 5420 if (++depth == old_files) | |
| 5421 { | |
| 5422 /* | |
| 5423 * lalloc() for 'bigger' must have failed above. We | |
| 5424 * will forget one of our already visited files now. | |
| 5425 */ | |
| 5426 vim_free(files[old_files].name); | |
| 5427 ++old_files; | |
| 5428 } | |
| 5429 files[depth].name = curr_fname = new_fname; | |
| 5430 files[depth].lnum = 0; | |
| 5431 files[depth].matched = FALSE; | |
| 5432 if (action == ACTION_EXPAND) | |
| 5433 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5434 msg_hist_off = TRUE; // reset in msg_trunc_attr() |
| 274 | 5435 vim_snprintf((char*)IObuff, IOSIZE, |
| 5436 _("Scanning included file: %s"), | |
| 5437 (char *)new_fname); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5438 msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); |
| 7 | 5439 } |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5440 else if (p_verbose >= 5) |
| 712 | 5441 { |
| 5442 verbose_enter(); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5443 smsg(_("Searching included file %s"), |
| 712 | 5444 (char *)new_fname); |
| 5445 verbose_leave(); | |
| 5446 } | |
| 5447 | |
| 7 | 5448 } |
| 5449 } | |
| 5450 } | |
| 5451 else | |
| 5452 { | |
| 5453 /* | |
| 5454 * Check if the line is a define (type == FIND_DEFINE) | |
| 5455 */ | |
| 5456 p = line; | |
| 5457 search_line: | |
| 5458 define_matched = FALSE; | |
| 5459 if (def_regmatch.regprog != NULL | |
| 5460 && vim_regexec(&def_regmatch, line, (colnr_T)0)) | |
| 5461 { | |
| 5462 /* | |
| 5463 * Pattern must be first identifier after 'define', so skip | |
| 5464 * to that position before checking for match of pattern. Also | |
| 5465 * don't let it match beyond the end of this identifier. | |
| 5466 */ | |
| 5467 p = def_regmatch.endp[0]; | |
| 5468 while (*p && !vim_iswordc(*p)) | |
| 5469 p++; | |
| 5470 define_matched = TRUE; | |
| 5471 } | |
| 5472 | |
| 5473 /* | |
| 5474 * Look for a match. Don't do this if we are looking for a | |
| 5475 * define and this line didn't match define_prog above. | |
| 5476 */ | |
| 5477 if (def_regmatch.regprog == NULL || define_matched) | |
| 5478 { | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5479 if (define_matched || (compl_cont_status & CONT_SOL)) |
| 7 | 5480 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5481 // compare the first "len" chars from "ptr" |
| 7 | 5482 startp = skipwhite(p); |
| 5483 if (p_ic) | |
| 5484 matched = !MB_STRNICMP(startp, ptr, len); | |
| 5485 else | |
| 5486 matched = !STRNCMP(startp, ptr, len); | |
| 5487 if (matched && define_matched && whole | |
| 5488 && vim_iswordc(startp[len])) | |
| 5489 matched = FALSE; | |
| 5490 } | |
| 5491 else if (regmatch.regprog != NULL | |
| 5492 && vim_regexec(®match, line, (colnr_T)(p - line))) | |
| 5493 { | |
| 5494 matched = TRUE; | |
| 5495 startp = regmatch.startp[0]; | |
| 5496 /* | |
| 5497 * Check if the line is not a comment line (unless we are | |
| 5498 * looking for a define). A line starting with "# define" | |
| 5499 * is not considered to be a comment line. | |
| 5500 */ | |
| 5501 if (!define_matched && skip_comments) | |
| 5502 { | |
| 5503 if ((*line != '#' || | |
| 5504 STRNCMP(skipwhite(line + 1), "define", 6) != 0) | |
| 3562 | 5505 && get_leader_len(line, NULL, FALSE, TRUE)) |
| 7 | 5506 matched = FALSE; |
| 5507 | |
| 5508 /* | |
| 5509 * Also check for a "/ *" or "/ /" before the match. | |
| 5510 * Skips lines like "int backwards; / * normal index | |
| 5511 * * /" when looking for "normal". | |
| 5512 * Note: Doesn't skip "/ *" in comments. | |
| 5513 */ | |
| 5514 p = skipwhite(line); | |
| 5515 if (matched | |
| 5516 || (p[0] == '/' && p[1] == '*') || p[0] == '*') | |
| 5517 for (p = line; *p && p < startp; ++p) | |
| 5518 { | |
| 5519 if (matched | |
| 5520 && p[0] == '/' | |
| 5521 && (p[1] == '*' || p[1] == '/')) | |
| 5522 { | |
| 5523 matched = FALSE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5524 // After "//" all text is comment |
| 7 | 5525 if (p[1] == '/') |
| 5526 break; | |
| 5527 ++p; | |
| 5528 } | |
| 5529 else if (!matched && p[0] == '*' && p[1] == '/') | |
| 5530 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5531 // Can find match after "* /". |
| 7 | 5532 matched = TRUE; |
| 5533 ++p; | |
| 5534 } | |
| 5535 } | |
| 5536 } | |
| 5537 } | |
| 5538 } | |
| 5539 } | |
| 5540 if (matched) | |
| 5541 { | |
| 5542 if (action == ACTION_EXPAND) | |
| 5543 { | |
|
16239
5df26b29e809
patch 8.1.1124: insert completion flags are mixed up
Bram Moolenaar <Bram@vim.org>
parents:
16142
diff
changeset
|
5544 int cont_s_ipos = FALSE; |
| 7 | 5545 int add_r; |
| 5546 char_u *aux; | |
| 5547 | |
| 5548 if (depth == -1 && lnum == curwin->w_cursor.lnum) | |
| 5549 break; | |
| 5550 found = TRUE; | |
| 5551 aux = p = startp; | |
| 449 | 5552 if (compl_cont_status & CONT_ADDING) |
| 7 | 5553 { |
| 449 | 5554 p += compl_length; |
| 7 | 5555 if (vim_iswordp(p)) |
| 5556 goto exit_matched; | |
| 5557 p = find_word_start(p); | |
| 5558 } | |
| 5559 p = find_word_end(p); | |
| 5560 i = (int)(p - aux); | |
| 5561 | |
| 449 | 5562 if ((compl_cont_status & CONT_ADDING) && i == compl_length) |
| 7 | 5563 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5564 // IOSIZE > compl_length, so the STRNCPY works |
| 7 | 5565 STRNCPY(IObuff, aux, i); |
| 944 | 5566 |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5567 // 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
|
5568 // 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
|
5569 // exit_matched when past the last line. |
| 944 | 5570 if (depth < 0) |
| 5571 { | |
| 5572 if (lnum >= end_lnum) | |
| 5573 goto exit_matched; | |
| 5574 line = ml_get(++lnum); | |
| 5575 } | |
| 5576 else if (vim_fgets(line = file_line, | |
| 5577 LSIZE, files[depth].fp)) | |
| 7 | 5578 goto exit_matched; |
| 5579 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5580 // 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
|
5581 // 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
|
5582 // bellow -- Acevedo |
| 7 | 5583 already = aux = p = skipwhite(line); |
| 5584 p = find_word_start(p); | |
| 5585 p = find_word_end(p); | |
| 5586 if (p > aux) | |
| 5587 { | |
| 5588 if (*aux != ')' && IObuff[i-1] != TAB) | |
| 5589 { | |
| 5590 if (IObuff[i-1] != ' ') | |
| 5591 IObuff[i++] = ' '; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5592 // IObuf =~ "\(\k\|\i\).* ", thus i >= 2 |
| 7 | 5593 if (p_js |
| 5594 && (IObuff[i-2] == '.' | |
| 5595 || (vim_strchr(p_cpo, CPO_JOINSP) == NULL | |
| 5596 && (IObuff[i-2] == '?' | |
| 5597 || IObuff[i-2] == '!')))) | |
| 5598 IObuff[i++] = ' '; | |
| 5599 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5600 // copy as much as possible of the new word |
| 7 | 5601 if (p - aux >= IOSIZE - i) |
| 5602 p = aux + IOSIZE - i - 1; | |
| 5603 STRNCPY(IObuff + i, aux, p - aux); | |
| 5604 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
|
5605 cont_s_ipos = TRUE; |
| 7 | 5606 } |
| 5607 IObuff[i] = NUL; | |
| 5608 aux = IObuff; | |
| 5609 | |
| 449 | 5610 if (i == compl_length) |
| 7 | 5611 goto exit_matched; |
| 5612 } | |
| 5613 | |
| 942 | 5614 add_r = ins_compl_add_infercase(aux, i, p_ic, |
| 7 | 5615 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
|
5616 dir, cont_s_ipos); |
| 7 | 5617 if (add_r == OK) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5618 // if dir was BACKWARD then honor it just once |
| 7 | 5619 dir = FORWARD; |
| 464 | 5620 else if (add_r == FAIL) |
| 7 | 5621 break; |
| 5622 } | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5623 else if (action == ACTION_SHOW_ALL) |
| 7 | 5624 { |
| 5625 found = TRUE; | |
| 5626 if (!did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5627 gotocmdline(TRUE); // cursor at status line |
| 7 | 5628 if (curr_fname != prev_fname) |
| 5629 { | |
| 5630 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5631 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
|
5632 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
|
5633 // at "--more--" message |
| 7 | 5634 msg_home_replace_hl(curr_fname); |
| 5635 prev_fname = curr_fname; | |
| 5636 } | |
| 5637 did_show = TRUE; | |
| 5638 if (!got_int) | |
| 5639 show_pat_in_path(line, type, TRUE, action, | |
| 5640 (depth == -1) ? NULL : files[depth].fp, | |
| 5641 (depth == -1) ? &lnum : &files[depth].lnum, | |
| 5642 match_count++); | |
| 5643 | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5644 // 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
|
5645 // include it |
| 7 | 5646 for (i = 0; i <= depth; ++i) |
| 5647 files[i].matched = TRUE; | |
| 5648 } | |
| 5649 else if (--count <= 0) | |
| 5650 { | |
| 5651 found = TRUE; | |
| 5652 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
|
5653 #if defined(FEAT_QUICKFIX) |
| 7 | 5654 && g_do_tagpreview == 0 |
| 5655 #endif | |
| 5656 ) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5657 emsg(_("E387: Match is on current line")); |
| 7 | 5658 else if (action == ACTION_SHOW) |
| 5659 { | |
| 5660 show_pat_in_path(line, type, did_show, action, | |
| 5661 (depth == -1) ? NULL : files[depth].fp, | |
| 5662 (depth == -1) ? &lnum : &files[depth].lnum, 1L); | |
| 5663 did_show = TRUE; | |
| 5664 } | |
| 5665 else | |
| 5666 { | |
| 5667 #ifdef FEAT_GUI | |
| 5668 need_mouse_correct = TRUE; | |
| 5669 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5670 #if defined(FEAT_QUICKFIX) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5671 // ":psearch" uses the preview window |
| 7 | 5672 if (g_do_tagpreview != 0) |
| 5673 { | |
| 5674 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
|
5675 prepare_tagpreview(TRUE, TRUE, FALSE); |
| 7 | 5676 } |
| 5677 #endif | |
| 5678 if (action == ACTION_SPLIT) | |
| 5679 { | |
| 5680 if (win_split(0, 0) == FAIL) | |
| 5681 break; | |
| 2583 | 5682 RESET_BINDING(curwin); |
| 7 | 5683 } |
| 5684 if (depth == -1) | |
| 5685 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5686 // 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
|
5687 #if defined(FEAT_QUICKFIX) |
| 7 | 5688 if (g_do_tagpreview != 0) |
| 5689 { | |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5690 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
|
5691 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
|
5692 NULL, TRUE, lnum, FALSE))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5693 break; // failed to jump to file |
| 7 | 5694 } |
| 5695 else | |
| 5696 #endif | |
| 5697 setpcmark(); | |
| 5698 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
|
5699 check_cursor(); |
| 7 | 5700 } |
| 5701 else | |
| 5702 { | |
|
11476
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5703 if (!GETFILE_SUCCESS(getfile( |
|
c45fb081391c
patch 8.0.0621: :stag does not respect 'switchbuf'
Christian Brabandt <cb@256bit.org>
parents:
11275
diff
changeset
|
5704 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
|
5705 files[depth].lnum, FALSE))) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5706 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
|
5707 // 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
|
5708 // want that here |
| 7 | 5709 curwin->w_cursor.lnum = files[depth].lnum; |
| 5710 } | |
| 5711 } | |
| 5712 if (action != ACTION_SHOW) | |
| 5713 { | |
| 1859 | 5714 curwin->w_cursor.col = (colnr_T)(startp - line); |
| 7 | 5715 curwin->w_set_curswant = TRUE; |
| 5716 } | |
| 5717 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
11759
diff
changeset
|
5718 #if defined(FEAT_QUICKFIX) |
| 7 | 5719 if (g_do_tagpreview != 0 |
| 673 | 5720 && curwin != curwin_save && win_valid(curwin_save)) |
| 7 | 5721 { |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5722 // Return cursor to where we were |
| 7 | 5723 validate_cursor(); |
| 5724 redraw_later(VALID); | |
| 5725 win_enter(curwin_save, TRUE); | |
| 5726 } | |
|
18763
49b78d6465e5
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Bram Moolenaar <Bram@vim.org>
parents:
18681
diff
changeset
|
5727 # 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
|
5728 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
|
5729 // 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
|
5730 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
|
5731 # endif |
| 7 | 5732 #endif |
| 5733 break; | |
| 5734 } | |
| 5735 exit_matched: | |
| 5736 matched = FALSE; | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5737 // 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
|
5738 // are not at the end of it already |
| 7 | 5739 if (def_regmatch.regprog == NULL |
| 5740 && action == ACTION_EXPAND | |
| 449 | 5741 && !(compl_cont_status & CONT_SOL) |
| 1859 | 5742 && *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
|
5743 && *(p = startp + mb_ptr2len(startp)) != NUL) |
| 7 | 5744 goto search_line; |
| 5745 } | |
| 5746 line_breakcheck(); | |
| 5747 if (action == ACTION_EXPAND) | |
|
10277
154d5a2e7395
commit https://github.com/vim/vim/commit/472e85970ee3a80abd824bef510df12e9cfe9e96
Christian Brabandt <cb@256bit.org>
parents:
10172
diff
changeset
|
5748 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
|
5749 if (got_int || ins_compl_interrupted()) |
| 7 | 5750 break; |
| 5751 | |
| 5752 /* | |
| 5753 * Read the next line. When reading an included file and encountering | |
| 5754 * end-of-file, close the file and continue in the file that included | |
| 5755 * it. | |
| 5756 */ | |
| 5757 while (depth >= 0 && !already | |
| 5758 && vim_fgets(line = file_line, LSIZE, files[depth].fp)) | |
| 5759 { | |
| 5760 fclose(files[depth].fp); | |
| 5761 --old_files; | |
| 5762 files[old_files].name = files[depth].name; | |
| 5763 files[old_files].matched = files[depth].matched; | |
| 5764 --depth; | |
| 5765 curr_fname = (depth == -1) ? curbuf->b_fname | |
| 5766 : files[depth].name; | |
| 5767 if (depth < depth_displayed) | |
| 5768 depth_displayed = depth; | |
| 5769 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5770 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
|
5771 { |
| 7 | 5772 files[depth].lnum++; |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5773 // 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
|
5774 i = (int)STRLEN(line); |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5775 if (i > 0 && line[i - 1] == '\n') |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5776 line[--i] = NUL; |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5777 if (i > 0 && line[i - 1] == '\r') |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5778 line[--i] = NUL; |
|
5569d11ef585
updated for version 7.3.1302
Bram Moolenaar <bram@vim.org>
parents:
5064
diff
changeset
|
5779 } |
| 7 | 5780 else if (!already) |
| 5781 { | |
| 5782 if (++lnum > end_lnum) | |
| 5783 break; | |
| 5784 line = ml_get(lnum); | |
| 5785 } | |
| 5786 already = NULL; | |
| 5787 } | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5788 // End of big for (;;) loop. |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5789 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5790 // Close any files that are still open. |
| 7 | 5791 for (i = 0; i <= depth; i++) |
| 5792 { | |
| 5793 fclose(files[i].fp); | |
| 5794 vim_free(files[i].name); | |
| 5795 } | |
| 5796 for (i = old_files; i < max_path_depth; i++) | |
| 5797 vim_free(files[i].name); | |
| 5798 vim_free(files); | |
| 5799 | |
| 5800 if (type == CHECK_PATH) | |
| 5801 { | |
| 5802 if (!did_show) | |
| 5803 { | |
| 5804 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
|
5805 msg(_("All included files were found")); |
| 7 | 5806 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5807 msg(_("No included files")); |
| 7 | 5808 } |
| 5809 } | |
|
17809
59f8948b7590
patch 8.1.1901: the +insert_expand feature is not always available
Bram Moolenaar <Bram@vim.org>
parents:
17767
diff
changeset
|
5810 else if (!found && action != ACTION_EXPAND) |
| 7 | 5811 { |
|
16142
570a296aa0b4
patch 8.1.1076: file for Insert mode is much too big
Bram Moolenaar <Bram@vim.org>
parents:
15971
diff
changeset
|
5812 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
|
5813 emsg(_(e_interr)); |
| 7 | 5814 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
|
5815 emsg(_("E388: Couldn't find definition")); |
| 7 | 5816 else |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15239
diff
changeset
|
5817 emsg(_("E389: Couldn't find pattern")); |
| 7 | 5818 } |
| 5819 if (action == ACTION_SHOW || action == ACTION_SHOW_ALL) | |
| 5820 msg_end(); | |
| 5821 | |
| 5822 fpip_end: | |
| 5823 vim_free(file_line); | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5824 vim_regfree(regmatch.regprog); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5825 vim_regfree(incl_regmatch.regprog); |
|
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
5826 vim_regfree(def_regmatch.regprog); |
| 7 | 5827 } |
| 5828 | |
| 5829 static void | |
|
7835
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5830 show_pat_in_path( |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5831 char_u *line, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5832 int type, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5833 int did_show, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5834 int action, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5835 FILE *fp, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5836 linenr_T *lnum, |
|
4d7ce6c03fda
commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5837 long count) |
| 7 | 5838 { |
| 5839 char_u *p; | |
| 5840 | |
| 5841 if (did_show) | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5842 msg_putchar('\n'); // cursor below last one |
| 867 | 5843 else if (!msg_silent) |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5844 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
|
5845 if (got_int) // 'q' typed at "--more--" message |
| 7 | 5846 return; |
| 5847 for (;;) | |
| 5848 { | |
| 5849 p = line + STRLEN(line) - 1; | |
| 5850 if (fp != NULL) | |
| 5851 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5852 // We used fgets(), so get rid of newline at end |
| 7 | 5853 if (p >= line && *p == '\n') |
| 5854 --p; | |
| 5855 if (p >= line && *p == '\r') | |
| 5856 --p; | |
| 5857 *(p + 1) = NUL; | |
| 5858 } | |
| 5859 if (action == ACTION_SHOW_ALL) | |
| 5860 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5861 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
|
5862 msg_puts((char *)IObuff); |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5863 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
|
5864 // Highlight line numbers |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5865 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
|
5866 msg_puts(" "); |
| 7 | 5867 } |
| 168 | 5868 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
|
5869 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
|
5870 |
|
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5871 // Definition continues until line that doesn't end with '\' |
| 7 | 5872 if (got_int || type != FIND_DEFINE || p < line || *p != '\\') |
| 5873 break; | |
| 5874 | |
| 5875 if (fp != NULL) | |
| 5876 { | |
|
18812
d34ec6fe207d
patch 8.1.2394: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18763
diff
changeset
|
5877 if (vim_fgets(line, LSIZE, fp)) // end of file |
| 7 | 5878 break; |
| 5879 ++*lnum; | |
| 5880 } | |
| 5881 else | |
| 5882 { | |
| 5883 if (++*lnum > curbuf->b_ml.ml_line_count) | |
| 5884 break; | |
| 5885 line = ml_get(*lnum); | |
| 5886 } | |
| 5887 msg_putchar('\n'); | |
| 5888 } | |
| 5889 } | |
| 5890 #endif | |
| 5891 | |
| 5892 #ifdef FEAT_VIMINFO | |
|
18263
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5893 /* |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5894 * 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
|
5895 */ |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5896 spat_T * |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5897 get_spat(int idx) |
| 7 | 5898 { |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5899 return &spats[idx]; |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5900 } |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5901 |
|
18263
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5902 /* |
|
a5de1d88590d
patch 8.1.2126: viminfo not sufficiently tested
Bram Moolenaar <Bram@vim.org>
parents:
18251
diff
changeset
|
5903 * 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
|
5904 */ |
|
17476
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5905 int |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5906 get_spat_last_idx(void) |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5907 { |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5908 return last_idx; |
|
d4b2a212fa2f
patch 8.1.1736: viminfo support is spread out
Bram Moolenaar <Bram@vim.org>
parents:
16949
diff
changeset
|
5909 } |
| 7 | 5910 #endif |